From 46c92e19bed2976d40989293505f48133d41e9c2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 23 Oct 2023 17:15:54 +0200 Subject: [PATCH 0001/2308] Init configuration from template --- flake.lock | 118 ++++++++++++++++ flake.nix | 86 ++++++++++++ home-manager/EDI-Lillian.nix | 196 +++++++++++++++++++++++++++ modules/home-manager/default.nix | 6 + modules/nixos/default.nix | 6 + nixos/EDI/configuration.nix | 170 +++++++++++++++++++++++ nixos/EDI/hardware-configuration.nix | 44 ++++++ overlays/default.nix | 23 ++++ pkgs/default.nix | 5 + 9 files changed, 654 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 home-manager/EDI-Lillian.nix create mode 100644 modules/home-manager/default.nix create mode 100644 modules/nixos/default.nix create mode 100644 nixos/EDI/configuration.nix create mode 100644 nixos/EDI/hardware-configuration.nix create mode 100644 overlays/default.nix create mode 100644 pkgs/default.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..ecc1a87 --- /dev/null +++ b/flake.lock @@ -0,0 +1,118 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685599623, + "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.05", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1686431482, + "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1697929210, + "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1686501370, + "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1697886341, + "narHash": "sha256-AdE67xPty9M9wn36nPVp6aDntIdigrs7UbyaGv1VAaM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44881e03af1c730cbb1d72a4d41274a2c957813a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", + "sops-nix": "sops-nix" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1697943852, + "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..bb0154e --- /dev/null +++ b/flake.nix @@ -0,0 +1,86 @@ +{ + description = "NixOS configuration for Lillian Violet's systems"; + + inputs = { + # Nixpkgs + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + sops-nix.url = "github:Mic92/sops-nix"; + # You can access packages and modules from different nixpkgs revs + # at the same time. Here's an working example: + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. + + # Home manager + home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + + # Add any other flake you might need + # hardware.url = "github:nixos/nixos-hardware"; + + # Shameless plug: looking for a way to nixify your themes and make + # everything match nicely? Try nix-colors! + # nix-colors.url = "github:misterio77/nix-colors"; + }; + + outputs = { + self, + nixpkgs, + home-manager, + sops-nix, + ... + } @ inputs: let + inherit (self) outputs; + # Supported systems for your flake packages, shell, etc. + systems = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + # This is a function that generates an attribute by calling a function you + # pass to it, with each system as an argument + forAllSystems = nixpkgs.lib.genAttrs systems; + in { + # Your custom packages + # Acessible through 'nix build', 'nix shell', etc + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # Formatter for your nix files, available through 'nix fmt' + # Other options beside 'alejandra' include 'nixpkgs-fmt' + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + + # Your custom packages and modifications, exported as overlays + overlays = import ./overlays {inherit inputs;}; + # Reusable nixos modules you might want to export + # These are usually stuff you would upstream into nixpkgs + nixosModules = import ./modules/nixos; + # Reusable home-manager modules you might want to export + # These are usually stuff you would upstream into home-manager + homeManagerModules = import ./modules/home-manager; + + # NixOS configuration entrypoint + # Available through 'nixos-rebuild --flake .#your-hostname' + nixosConfigurations = { + EDI = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main nixos configuration file < + ./nixos/EDI/configuration.nix + ]; + }; + }; + + # Standalone home-manager configuration entrypoint + # Available through 'home-manager --flake .#your-username@your-hostname' + homeConfigurations = { + "lillian@EDI" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main home-manager configuration file < + ./home-manager/EDI-Lillian.nix + ]; + }; + }; + }; +} diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix new file mode 100644 index 0000000..9505858 --- /dev/null +++ b/home-manager/EDI-Lillian.nix @@ -0,0 +1,196 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + }; + }; + + home = { + username = "lillian"; + homeDirectory = "/home/lillian"; + }; + + # Add stuff for your user as you see fit: + # programs.neovim.enable = true; + # home.packages = with pkgs; [ steam ]; + + home.packages = with pkgs; [ + # Coding: + git + kate + + # Chat applications: + element-desktop + signal-desktop + webcord-vencord + + # Gaming: + prismlauncher + steam + + # Multimedia: + freetube + obs-studio + vlc + + # Office applications: + onlyoffice-bin + + # System tools: + rage + bitwarden + discover + flameshot + fzf + nextcloud-client + nitrokey-app + protonvpn-gui + virtualbox + watchmate + qbittorrent + zsh + + # Web browsing: + firefox + ungoogled-chromium + ]; + + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + dracula-theme.theme-dracula + arrterian.nix-env-selector + jnoortheen.nix-ide + kamadorueda.alejandra + ms-toolsai.jupyter + ms-python.python + rust-lang.rust-analyzer + yzhang.markdown-all-in-one + ]; + }; + + programs.zsh = { + enable = true; + enableAutosuggestions = true; + enableCompletion = true; + historySubstringSearch.enable = true; + syntaxHighlighting.enable = true; + zsh-abbr.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "adb" + "battery" + "branch" + "coffee" + "colored-man-pages" + "colorize" + "command-not-found" + "common-aliases" + "compleat" + "composer" + "copypath" + "copybuffer" + "copyfile" + "cp" + "dirhistory" + "dirpersist" + "docker" + "docker-compose" + "extract" + "fancy-ctrl-z" + "fastfile" + "frontend-search" + "git-auto-fetch" + "git-escape-magic" + "git-extras" + "git-flow" + "github" + "gitignore" + "gnu-utils" + "gpg-agent" + "history" + "history-substring-search" + "isodate" + "jsontools" + "keychain" + "man" + "nanoc" + "pip" + "pipenv" + "pyenv" + "python" + "rsync" + "rvm" + "screen" + "sdk" + "sfdx" + "shell-proxy" + "sudo" + "systemadmin" + "systemd" + "themes" + "urltools" + "web-search" + "zsh-interactive-cd" + "zsh-navigation-tools" + "zsh-nix-shell" + ]; + theme = "jtriley"; + }; + }; + + # Enable home-manager and git + programs.home-manager.enable = true; + programs.git.enable = true; + + # Nicely reload system units when changing configs + systemd.user.startServices = "sd-switch"; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "23.05"; +} diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix new file mode 100644 index 0000000..45aae31 --- /dev/null +++ b/modules/home-manager/default.nix @@ -0,0 +1,6 @@ +# Add your reusable home-manager modules to this directory, on their own file (https://nixos.wiki/wiki/Module). +# These should be stuff you would like to share with others, not your personal configurations. +{ + # List your module files here + # my-module = import ./my-module.nix; +} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix new file mode 100644 index 0000000..8605069 --- /dev/null +++ b/modules/nixos/default.nix @@ -0,0 +1,6 @@ +# Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module). +# These should be stuff you would like to share with others, not your personal configurations. +{ + # List your module files here + # my-module = import ./my-module.nix; +} diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix new file mode 100644 index 0000000..ea5ac94 --- /dev/null +++ b/nixos/EDI/configuration.nix @@ -0,0 +1,170 @@ +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other NixOS modules here + imports = [ + # If you want to use modules your own flake exports (from modules/nixos): + # outputs.nixosModules.example + + # Or modules from other flakes (such as nixos-hardware): + # inputs.hardware.nixosModules.common-cpu-amd + # inputs.hardware.nixosModules.common-ssd + + # You can also split up your configuration and import pieces of it here: + # ./users.nix + + # Import your generated (nixos-generate-config) hardware configuration + ./hardware-configuration.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + nix = { + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + environment.systemPackages = with pkgs; [ + rage + alejandra + git-filter-repo + home-manager + libsForQt5.discover + libsForQt5.kdepim-addons + libsForQt5.packagekit-qt + libportal-qt5 + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + noisetorch + oh-my-zsh + pciutils + rsync + wget + zsh + ]; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.defaultSession = "plasmawayland"; + + # Enable flatpak support + services.flatpak.enable = true; + services.packagekit.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + # Enable fwupd daemon and user space client + services.fwupd.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + programs.zsh = { + enable = true; + }; + + networking.hostName = "EDI"; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + users.users = { + lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + shell = pkgs.zsh; + }; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "23.05"; +} diff --git a/nixos/EDI/hardware-configuration.nix b/nixos/EDI/hardware-configuration.nix new file mode 100644 index 0000000..2dc46a9 --- /dev/null +++ b/nixos/EDI/hardware-configuration.nix @@ -0,0 +1,44 @@ +# 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.kernel.sysctl."net.ipv4.icmp_echo_ignore_broadcasts" = 1; + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/f930d7c6-2798-4e25-abc1-81d02e9abf35"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/42ED-068B"; + fsType = "vfat"; + }; + + swapDevices = []; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s20f0u9u2c2.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..a13ea3c --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,23 @@ +# This file defines overlays +{inputs, ...}: { + # This one brings our custom packages from the 'pkgs' directory + additions = final: _prev: import ../pkgs {pkgs = final;}; + + # This one contains whatever you want to overlay + # You can change versions, add patches, set compilation flags, anything really. + # https://nixos.wiki/wiki/Overlays + modifications = final: prev: { + # example = prev.example.overrideAttrs (oldAttrs: rec { + # ... + # }); + }; + + # When applied, the unstable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.unstable' + unstable-packages = final: _prev: { + unstable = import inputs.nixpkgs-unstable { + system = final.system; + config.allowUnfree = true; + }; + }; +} diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..3d9e23c --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,5 @@ +# Custom packages, that can be defined similarly to ones from nixpkgs +# You can build them using 'nix build .#example' +pkgs: { + # example = pkgs.callPackage ./example { }; +} From 0b578b716ff36cb4d56c72886b85b1d53ce26ef6 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Mon, 23 Oct 2023 17:15:54 +0200 Subject: [PATCH 0002/2308] Init configuration from template --- flake.lock | 118 ++++++++++++++++ flake.nix | 86 ++++++++++++ home-manager/EDI-Lillian.nix | 196 +++++++++++++++++++++++++++ modules/home-manager/default.nix | 6 + modules/nixos/default.nix | 6 + nixos/EDI/configuration.nix | 170 +++++++++++++++++++++++ nixos/EDI/hardware-configuration.nix | 44 ++++++ overlays/default.nix | 23 ++++ pkgs/default.nix | 5 + 9 files changed, 654 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 home-manager/EDI-Lillian.nix create mode 100644 modules/home-manager/default.nix create mode 100644 modules/nixos/default.nix create mode 100644 nixos/EDI/configuration.nix create mode 100644 nixos/EDI/hardware-configuration.nix create mode 100644 overlays/default.nix create mode 100644 pkgs/default.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..ecc1a87 --- /dev/null +++ b/flake.lock @@ -0,0 +1,118 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685599623, + "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.05", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1686431482, + "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1697929210, + "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1686501370, + "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1697886341, + "narHash": "sha256-AdE67xPty9M9wn36nPVp6aDntIdigrs7UbyaGv1VAaM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44881e03af1c730cbb1d72a4d41274a2c957813a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", + "sops-nix": "sops-nix" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1697943852, + "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..bb0154e --- /dev/null +++ b/flake.nix @@ -0,0 +1,86 @@ +{ + description = "NixOS configuration for Lillian Violet's systems"; + + inputs = { + # Nixpkgs + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + sops-nix.url = "github:Mic92/sops-nix"; + # You can access packages and modules from different nixpkgs revs + # at the same time. Here's an working example: + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. + + # Home manager + home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + + # Add any other flake you might need + # hardware.url = "github:nixos/nixos-hardware"; + + # Shameless plug: looking for a way to nixify your themes and make + # everything match nicely? Try nix-colors! + # nix-colors.url = "github:misterio77/nix-colors"; + }; + + outputs = { + self, + nixpkgs, + home-manager, + sops-nix, + ... + } @ inputs: let + inherit (self) outputs; + # Supported systems for your flake packages, shell, etc. + systems = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + # This is a function that generates an attribute by calling a function you + # pass to it, with each system as an argument + forAllSystems = nixpkgs.lib.genAttrs systems; + in { + # Your custom packages + # Acessible through 'nix build', 'nix shell', etc + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # Formatter for your nix files, available through 'nix fmt' + # Other options beside 'alejandra' include 'nixpkgs-fmt' + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + + # Your custom packages and modifications, exported as overlays + overlays = import ./overlays {inherit inputs;}; + # Reusable nixos modules you might want to export + # These are usually stuff you would upstream into nixpkgs + nixosModules = import ./modules/nixos; + # Reusable home-manager modules you might want to export + # These are usually stuff you would upstream into home-manager + homeManagerModules = import ./modules/home-manager; + + # NixOS configuration entrypoint + # Available through 'nixos-rebuild --flake .#your-hostname' + nixosConfigurations = { + EDI = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main nixos configuration file < + ./nixos/EDI/configuration.nix + ]; + }; + }; + + # Standalone home-manager configuration entrypoint + # Available through 'home-manager --flake .#your-username@your-hostname' + homeConfigurations = { + "lillian@EDI" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main home-manager configuration file < + ./home-manager/EDI-Lillian.nix + ]; + }; + }; + }; +} diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix new file mode 100644 index 0000000..9505858 --- /dev/null +++ b/home-manager/EDI-Lillian.nix @@ -0,0 +1,196 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + }; + }; + + home = { + username = "lillian"; + homeDirectory = "/home/lillian"; + }; + + # Add stuff for your user as you see fit: + # programs.neovim.enable = true; + # home.packages = with pkgs; [ steam ]; + + home.packages = with pkgs; [ + # Coding: + git + kate + + # Chat applications: + element-desktop + signal-desktop + webcord-vencord + + # Gaming: + prismlauncher + steam + + # Multimedia: + freetube + obs-studio + vlc + + # Office applications: + onlyoffice-bin + + # System tools: + rage + bitwarden + discover + flameshot + fzf + nextcloud-client + nitrokey-app + protonvpn-gui + virtualbox + watchmate + qbittorrent + zsh + + # Web browsing: + firefox + ungoogled-chromium + ]; + + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + dracula-theme.theme-dracula + arrterian.nix-env-selector + jnoortheen.nix-ide + kamadorueda.alejandra + ms-toolsai.jupyter + ms-python.python + rust-lang.rust-analyzer + yzhang.markdown-all-in-one + ]; + }; + + programs.zsh = { + enable = true; + enableAutosuggestions = true; + enableCompletion = true; + historySubstringSearch.enable = true; + syntaxHighlighting.enable = true; + zsh-abbr.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "adb" + "battery" + "branch" + "coffee" + "colored-man-pages" + "colorize" + "command-not-found" + "common-aliases" + "compleat" + "composer" + "copypath" + "copybuffer" + "copyfile" + "cp" + "dirhistory" + "dirpersist" + "docker" + "docker-compose" + "extract" + "fancy-ctrl-z" + "fastfile" + "frontend-search" + "git-auto-fetch" + "git-escape-magic" + "git-extras" + "git-flow" + "github" + "gitignore" + "gnu-utils" + "gpg-agent" + "history" + "history-substring-search" + "isodate" + "jsontools" + "keychain" + "man" + "nanoc" + "pip" + "pipenv" + "pyenv" + "python" + "rsync" + "rvm" + "screen" + "sdk" + "sfdx" + "shell-proxy" + "sudo" + "systemadmin" + "systemd" + "themes" + "urltools" + "web-search" + "zsh-interactive-cd" + "zsh-navigation-tools" + "zsh-nix-shell" + ]; + theme = "jtriley"; + }; + }; + + # Enable home-manager and git + programs.home-manager.enable = true; + programs.git.enable = true; + + # Nicely reload system units when changing configs + systemd.user.startServices = "sd-switch"; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "23.05"; +} diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix new file mode 100644 index 0000000..45aae31 --- /dev/null +++ b/modules/home-manager/default.nix @@ -0,0 +1,6 @@ +# Add your reusable home-manager modules to this directory, on their own file (https://nixos.wiki/wiki/Module). +# These should be stuff you would like to share with others, not your personal configurations. +{ + # List your module files here + # my-module = import ./my-module.nix; +} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix new file mode 100644 index 0000000..8605069 --- /dev/null +++ b/modules/nixos/default.nix @@ -0,0 +1,6 @@ +# Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module). +# These should be stuff you would like to share with others, not your personal configurations. +{ + # List your module files here + # my-module = import ./my-module.nix; +} diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix new file mode 100644 index 0000000..ea5ac94 --- /dev/null +++ b/nixos/EDI/configuration.nix @@ -0,0 +1,170 @@ +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other NixOS modules here + imports = [ + # If you want to use modules your own flake exports (from modules/nixos): + # outputs.nixosModules.example + + # Or modules from other flakes (such as nixos-hardware): + # inputs.hardware.nixosModules.common-cpu-amd + # inputs.hardware.nixosModules.common-ssd + + # You can also split up your configuration and import pieces of it here: + # ./users.nix + + # Import your generated (nixos-generate-config) hardware configuration + ./hardware-configuration.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + nix = { + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + environment.systemPackages = with pkgs; [ + rage + alejandra + git-filter-repo + home-manager + libsForQt5.discover + libsForQt5.kdepim-addons + libsForQt5.packagekit-qt + libportal-qt5 + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + noisetorch + oh-my-zsh + pciutils + rsync + wget + zsh + ]; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.defaultSession = "plasmawayland"; + + # Enable flatpak support + services.flatpak.enable = true; + services.packagekit.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + # Enable fwupd daemon and user space client + services.fwupd.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + programs.zsh = { + enable = true; + }; + + networking.hostName = "EDI"; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + users.users = { + lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + shell = pkgs.zsh; + }; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "23.05"; +} diff --git a/nixos/EDI/hardware-configuration.nix b/nixos/EDI/hardware-configuration.nix new file mode 100644 index 0000000..2dc46a9 --- /dev/null +++ b/nixos/EDI/hardware-configuration.nix @@ -0,0 +1,44 @@ +# 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.kernel.sysctl."net.ipv4.icmp_echo_ignore_broadcasts" = 1; + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/f930d7c6-2798-4e25-abc1-81d02e9abf35"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/42ED-068B"; + fsType = "vfat"; + }; + + swapDevices = []; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s20f0u9u2c2.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..a13ea3c --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,23 @@ +# This file defines overlays +{inputs, ...}: { + # This one brings our custom packages from the 'pkgs' directory + additions = final: _prev: import ../pkgs {pkgs = final;}; + + # This one contains whatever you want to overlay + # You can change versions, add patches, set compilation flags, anything really. + # https://nixos.wiki/wiki/Overlays + modifications = final: prev: { + # example = prev.example.overrideAttrs (oldAttrs: rec { + # ... + # }); + }; + + # When applied, the unstable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.unstable' + unstable-packages = final: _prev: { + unstable = import inputs.nixpkgs-unstable { + system = final.system; + config.allowUnfree = true; + }; + }; +} diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..3d9e23c --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,5 @@ +# Custom packages, that can be defined similarly to ones from nixpkgs +# You can build them using 'nix build .#example' +pkgs: { + # example = pkgs.callPackage ./example { }; +} From 44685b7f8b6875b9349a63a498b441629f455467 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 23 Oct 2023 17:32:58 +0200 Subject: [PATCH 0003/2308] Unstable versions bc I'm cutting me on that edge --- flake.nix | 4 ++-- home-manager/EDI-Lillian.nix | 4 ++-- nixos/EDI/configuration.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index bb0154e..a7e574b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: @@ -11,7 +11,7 @@ # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Add any other flake you might need diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 9505858..ffdf66d 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ]; + ];23.05 nixpkgs = { # You can add overlays here @@ -192,5 +192,5 @@ systemd.user.startServices = "sd-switch"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index ea5ac94..7d1431a 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -166,5 +166,5 @@ environment.pathsToLink = ["/share/zsh"]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } From 46ecd0b97eaff12e58a409eef688fd8ef5039b74 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Mon, 23 Oct 2023 17:32:58 +0200 Subject: [PATCH 0004/2308] Unstable versions bc I'm cutting me on that edge --- flake.nix | 4 ++-- home-manager/EDI-Lillian.nix | 4 ++-- nixos/EDI/configuration.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index bb0154e..a7e574b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: @@ -11,7 +11,7 @@ # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Add any other flake you might need diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 9505858..ffdf66d 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ]; + ];23.05 nixpkgs = { # You can add overlays here @@ -192,5 +192,5 @@ systemd.user.startServices = "sd-switch"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index ea5ac94..7d1431a 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -166,5 +166,5 @@ environment.pathsToLink = ["/share/zsh"]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } From 5515c682c662c5a5686cdaeb1ef537bd9a43e7db Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 23 Oct 2023 17:43:30 +0200 Subject: [PATCH 0005/2308] Fixed versions --- flake.lock | 16 ++++++++-------- flake.nix | 2 +- home-manager/EDI-Lillian.nix | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index ecc1a87..9082437 100644 --- a/flake.lock +++ b/flake.lock @@ -7,32 +7,32 @@ ] }, "locked": { - "lastModified": 1685599623, - "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", + "lastModified": 1698069042, + "narHash": "sha256-L6U8qNhQ3KjQ04voQ+QLQCnFbD5NuIlqC9DO9T7jIZY=", "owner": "nix-community", "repo": "home-manager", - "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", + "rev": "f540f30f1f3c76b68922550dcf5f78f42732fd37", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "master", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1686431482, - "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index a7e574b..d260865 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager - home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Add any other flake you might need diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index ffdf66d..50db1ee 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ];23.05 + ]; nixpkgs = { # You can add overlays here From dc9311a081f4027acc0dd95cf03f5fc903392626 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Mon, 23 Oct 2023 17:43:30 +0200 Subject: [PATCH 0006/2308] Fixed versions --- flake.lock | 16 ++++++++-------- flake.nix | 2 +- home-manager/EDI-Lillian.nix | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index ecc1a87..9082437 100644 --- a/flake.lock +++ b/flake.lock @@ -7,32 +7,32 @@ ] }, "locked": { - "lastModified": 1685599623, - "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", + "lastModified": 1698069042, + "narHash": "sha256-L6U8qNhQ3KjQ04voQ+QLQCnFbD5NuIlqC9DO9T7jIZY=", "owner": "nix-community", "repo": "home-manager", - "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", + "rev": "f540f30f1f3c76b68922550dcf5f78f42732fd37", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "master", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1686431482, - "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index a7e574b..d260865 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager - home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Add any other flake you might need diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index ffdf66d..50db1ee 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ];23.05 + ]; nixpkgs = { # You can add overlays here From 2a692708dd7d238ebfafe9a86db31f2d150958b8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 23 Oct 2023 17:53:36 +0200 Subject: [PATCH 0007/2308] Reduce number of boot options to 3 --- nixos/EDI/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 7d1431a..bada64d 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -152,6 +152,7 @@ networking.hostName = "EDI"; boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; users.users = { From 1275f351e2cf26fefa96c3f3c35eb522e6a1d9e1 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Mon, 23 Oct 2023 17:53:36 +0200 Subject: [PATCH 0008/2308] Reduce number of boot options to 3 --- nixos/EDI/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 7d1431a..bada64d 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -152,6 +152,7 @@ networking.hostName = "EDI"; boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; users.users = { From a0d4872affb5e1c0e5ebed90a4f944606b23c07a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 23 Oct 2023 21:52:39 +0200 Subject: [PATCH 0009/2308] Add removal of cache after 7 days --- nixos/EDI/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index bada64d..a58d23e 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -50,6 +50,11 @@ }; nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; # This will add each flake input as a registry # To make nix3 commands consistent with your flake registry = lib.mapAttrs (_: value: {flake = value;}) inputs; From 2e83debf1945664dbd6437662bb939c1e02e9966 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Mon, 23 Oct 2023 21:52:39 +0200 Subject: [PATCH 0010/2308] Add removal of cache after 7 days --- nixos/EDI/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index bada64d..a58d23e 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -50,6 +50,11 @@ }; nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; # This will add each flake input as a registry # To make nix3 commands consistent with your flake registry = lib.mapAttrs (_: value: {flake = value;}) inputs; From 2f0b9e0258470d45a04a9ded08cc105341066f8f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 23 Oct 2023 21:55:15 +0200 Subject: [PATCH 0011/2308] Update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9082437..80504ac 100644 --- a/flake.lock +++ b/flake.lock @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { From b8fc63bb762f9bb3b6ca9f50ac1b7cdcdb5ae131 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Mon, 23 Oct 2023 21:55:15 +0200 Subject: [PATCH 0012/2308] Update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9082437..80504ac 100644 --- a/flake.lock +++ b/flake.lock @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { From 88de5621c2cd28716d383ef8bb85fabbcb052da8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 26 Oct 2023 16:48:06 +0200 Subject: [PATCH 0013/2308] Added GLaDOS configs (copied from EDI) --- flake.nix | 21 ++++ home-manager/GLaDOS-Lillian.nix | 196 ++++++++++++++++++++++++++++++++ nixos/GLaDOS/configuration.nix | 176 ++++++++++++++++++++++++++++ 3 files changed, 393 insertions(+) create mode 100644 home-manager/GLaDOS-Lillian.nix create mode 100644 nixos/GLaDOS/configuration.nix diff --git a/flake.nix b/flake.nix index d260865..0316422 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,16 @@ }; }; + nixosConfigurations = { + GLaDOS = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main nixos configuration file < + ./nixos/GLaDOS/configuration.nix + ]; + }; + }; + # Standalone home-manager configuration entrypoint # Available through 'home-manager --flake .#your-username@your-hostname' homeConfigurations = { @@ -82,5 +92,16 @@ ]; }; }; + + homeConfigurations = { + "lillian@GLaDOS" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main home-manager configuration file < + ./home-manager/GLaDOS-Lillian.nix + ]; + }; + }; }; } diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix new file mode 100644 index 0000000..50db1ee --- /dev/null +++ b/home-manager/GLaDOS-Lillian.nix @@ -0,0 +1,196 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + }; + }; + + home = { + username = "lillian"; + homeDirectory = "/home/lillian"; + }; + + # Add stuff for your user as you see fit: + # programs.neovim.enable = true; + # home.packages = with pkgs; [ steam ]; + + home.packages = with pkgs; [ + # Coding: + git + kate + + # Chat applications: + element-desktop + signal-desktop + webcord-vencord + + # Gaming: + prismlauncher + steam + + # Multimedia: + freetube + obs-studio + vlc + + # Office applications: + onlyoffice-bin + + # System tools: + rage + bitwarden + discover + flameshot + fzf + nextcloud-client + nitrokey-app + protonvpn-gui + virtualbox + watchmate + qbittorrent + zsh + + # Web browsing: + firefox + ungoogled-chromium + ]; + + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + dracula-theme.theme-dracula + arrterian.nix-env-selector + jnoortheen.nix-ide + kamadorueda.alejandra + ms-toolsai.jupyter + ms-python.python + rust-lang.rust-analyzer + yzhang.markdown-all-in-one + ]; + }; + + programs.zsh = { + enable = true; + enableAutosuggestions = true; + enableCompletion = true; + historySubstringSearch.enable = true; + syntaxHighlighting.enable = true; + zsh-abbr.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "adb" + "battery" + "branch" + "coffee" + "colored-man-pages" + "colorize" + "command-not-found" + "common-aliases" + "compleat" + "composer" + "copypath" + "copybuffer" + "copyfile" + "cp" + "dirhistory" + "dirpersist" + "docker" + "docker-compose" + "extract" + "fancy-ctrl-z" + "fastfile" + "frontend-search" + "git-auto-fetch" + "git-escape-magic" + "git-extras" + "git-flow" + "github" + "gitignore" + "gnu-utils" + "gpg-agent" + "history" + "history-substring-search" + "isodate" + "jsontools" + "keychain" + "man" + "nanoc" + "pip" + "pipenv" + "pyenv" + "python" + "rsync" + "rvm" + "screen" + "sdk" + "sfdx" + "shell-proxy" + "sudo" + "systemadmin" + "systemd" + "themes" + "urltools" + "web-search" + "zsh-interactive-cd" + "zsh-navigation-tools" + "zsh-nix-shell" + ]; + theme = "jtriley"; + }; + }; + + # Enable home-manager and git + programs.home-manager.enable = true; + programs.git.enable = true; + + # Nicely reload system units when changing configs + systemd.user.startServices = "sd-switch"; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "23.11"; +} diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix new file mode 100644 index 0000000..a58d23e --- /dev/null +++ b/nixos/GLaDOS/configuration.nix @@ -0,0 +1,176 @@ +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other NixOS modules here + imports = [ + # If you want to use modules your own flake exports (from modules/nixos): + # outputs.nixosModules.example + + # Or modules from other flakes (such as nixos-hardware): + # inputs.hardware.nixosModules.common-cpu-amd + # inputs.hardware.nixosModules.common-ssd + + # You can also split up your configuration and import pieces of it here: + # ./users.nix + + # Import your generated (nixos-generate-config) hardware configuration + ./hardware-configuration.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + environment.systemPackages = with pkgs; [ + rage + alejandra + git-filter-repo + home-manager + libsForQt5.discover + libsForQt5.kdepim-addons + libsForQt5.packagekit-qt + libportal-qt5 + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + noisetorch + oh-my-zsh + pciutils + rsync + wget + zsh + ]; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.defaultSession = "plasmawayland"; + + # Enable flatpak support + services.flatpak.enable = true; + services.packagekit.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + # Enable fwupd daemon and user space client + services.fwupd.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + programs.zsh = { + enable = true; + }; + + networking.hostName = "EDI"; + + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + + users.users = { + lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + shell = pkgs.zsh; + }; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "unstable"; +} From 4e286b0e10b62fcf523068502b26fd2284a6f0b8 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 26 Oct 2023 16:48:06 +0200 Subject: [PATCH 0014/2308] Added GLaDOS configs (copied from EDI) --- flake.nix | 21 ++++ home-manager/GLaDOS-Lillian.nix | 196 ++++++++++++++++++++++++++++++++ nixos/GLaDOS/configuration.nix | 176 ++++++++++++++++++++++++++++ 3 files changed, 393 insertions(+) create mode 100644 home-manager/GLaDOS-Lillian.nix create mode 100644 nixos/GLaDOS/configuration.nix diff --git a/flake.nix b/flake.nix index d260865..0316422 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,16 @@ }; }; + nixosConfigurations = { + GLaDOS = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main nixos configuration file < + ./nixos/GLaDOS/configuration.nix + ]; + }; + }; + # Standalone home-manager configuration entrypoint # Available through 'home-manager --flake .#your-username@your-hostname' homeConfigurations = { @@ -82,5 +92,16 @@ ]; }; }; + + homeConfigurations = { + "lillian@GLaDOS" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main home-manager configuration file < + ./home-manager/GLaDOS-Lillian.nix + ]; + }; + }; }; } diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix new file mode 100644 index 0000000..50db1ee --- /dev/null +++ b/home-manager/GLaDOS-Lillian.nix @@ -0,0 +1,196 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + }; + }; + + home = { + username = "lillian"; + homeDirectory = "/home/lillian"; + }; + + # Add stuff for your user as you see fit: + # programs.neovim.enable = true; + # home.packages = with pkgs; [ steam ]; + + home.packages = with pkgs; [ + # Coding: + git + kate + + # Chat applications: + element-desktop + signal-desktop + webcord-vencord + + # Gaming: + prismlauncher + steam + + # Multimedia: + freetube + obs-studio + vlc + + # Office applications: + onlyoffice-bin + + # System tools: + rage + bitwarden + discover + flameshot + fzf + nextcloud-client + nitrokey-app + protonvpn-gui + virtualbox + watchmate + qbittorrent + zsh + + # Web browsing: + firefox + ungoogled-chromium + ]; + + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + dracula-theme.theme-dracula + arrterian.nix-env-selector + jnoortheen.nix-ide + kamadorueda.alejandra + ms-toolsai.jupyter + ms-python.python + rust-lang.rust-analyzer + yzhang.markdown-all-in-one + ]; + }; + + programs.zsh = { + enable = true; + enableAutosuggestions = true; + enableCompletion = true; + historySubstringSearch.enable = true; + syntaxHighlighting.enable = true; + zsh-abbr.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "adb" + "battery" + "branch" + "coffee" + "colored-man-pages" + "colorize" + "command-not-found" + "common-aliases" + "compleat" + "composer" + "copypath" + "copybuffer" + "copyfile" + "cp" + "dirhistory" + "dirpersist" + "docker" + "docker-compose" + "extract" + "fancy-ctrl-z" + "fastfile" + "frontend-search" + "git-auto-fetch" + "git-escape-magic" + "git-extras" + "git-flow" + "github" + "gitignore" + "gnu-utils" + "gpg-agent" + "history" + "history-substring-search" + "isodate" + "jsontools" + "keychain" + "man" + "nanoc" + "pip" + "pipenv" + "pyenv" + "python" + "rsync" + "rvm" + "screen" + "sdk" + "sfdx" + "shell-proxy" + "sudo" + "systemadmin" + "systemd" + "themes" + "urltools" + "web-search" + "zsh-interactive-cd" + "zsh-navigation-tools" + "zsh-nix-shell" + ]; + theme = "jtriley"; + }; + }; + + # Enable home-manager and git + programs.home-manager.enable = true; + programs.git.enable = true; + + # Nicely reload system units when changing configs + systemd.user.startServices = "sd-switch"; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "23.11"; +} diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix new file mode 100644 index 0000000..a58d23e --- /dev/null +++ b/nixos/GLaDOS/configuration.nix @@ -0,0 +1,176 @@ +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other NixOS modules here + imports = [ + # If you want to use modules your own flake exports (from modules/nixos): + # outputs.nixosModules.example + + # Or modules from other flakes (such as nixos-hardware): + # inputs.hardware.nixosModules.common-cpu-amd + # inputs.hardware.nixosModules.common-ssd + + # You can also split up your configuration and import pieces of it here: + # ./users.nix + + # Import your generated (nixos-generate-config) hardware configuration + ./hardware-configuration.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + environment.systemPackages = with pkgs; [ + rage + alejandra + git-filter-repo + home-manager + libsForQt5.discover + libsForQt5.kdepim-addons + libsForQt5.packagekit-qt + libportal-qt5 + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + noisetorch + oh-my-zsh + pciutils + rsync + wget + zsh + ]; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.defaultSession = "plasmawayland"; + + # Enable flatpak support + services.flatpak.enable = true; + services.packagekit.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + # Enable fwupd daemon and user space client + services.fwupd.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + programs.zsh = { + enable = true; + }; + + networking.hostName = "EDI"; + + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + + users.users = { + lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + shell = pkgs.zsh; + }; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "unstable"; +} From 6c4d72005ebf0e15ef91411628d861ec7e7374d0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 26 Oct 2023 16:48:19 +0200 Subject: [PATCH 0015/2308] Update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 80504ac..6555b64 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698069042, - "narHash": "sha256-L6U8qNhQ3KjQ04voQ+QLQCnFbD5NuIlqC9DO9T7jIZY=", + "lastModified": 1698250431, + "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f540f30f1f3c76b68922550dcf5f78f42732fd37", + "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1697943852, - "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", + "lastModified": 1698273636, + "narHash": "sha256-swsqg/ckSVJnravx7ie9NFQSKIH27owtlk0wh4+xStk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", + "rev": "014e44d334a39481223a5d163530d4c4ca2e75cb", "type": "github" }, "original": { From 96a19d2f83403b27e5a16b7e15435202600fd737 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 26 Oct 2023 16:48:19 +0200 Subject: [PATCH 0016/2308] Update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 80504ac..6555b64 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698069042, - "narHash": "sha256-L6U8qNhQ3KjQ04voQ+QLQCnFbD5NuIlqC9DO9T7jIZY=", + "lastModified": 1698250431, + "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f540f30f1f3c76b68922550dcf5f78f42732fd37", + "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1697943852, - "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", + "lastModified": 1698273636, + "narHash": "sha256-swsqg/ckSVJnravx7ie9NFQSKIH27owtlk0wh4+xStk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", + "rev": "014e44d334a39481223a5d163530d4c4ca2e75cb", "type": "github" }, "original": { From e293e53ddb214d2b20aaee050c380a814ec405c0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 26 Oct 2023 17:11:31 +0200 Subject: [PATCH 0017/2308] Change webcord version --- home-manager/EDI-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 50db1ee..7241190 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -64,7 +64,7 @@ # Chat applications: element-desktop signal-desktop - webcord-vencord + webcord # Gaming: prismlauncher From ba77a4031515f65cd3d8ef1f56a9562d1159933b Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 26 Oct 2023 17:11:31 +0200 Subject: [PATCH 0018/2308] Change webcord version --- home-manager/EDI-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 50db1ee..7241190 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -64,7 +64,7 @@ # Chat applications: element-desktop signal-desktop - webcord-vencord + webcord # Gaming: prismlauncher From 984a90e7c2540b3cbf65451cf62dce1646947c45 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 26 Oct 2023 17:24:42 +0200 Subject: [PATCH 0019/2308] That didn't fix it, let's just wait for a fix --- home-manager/EDI-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 7241190..50db1ee 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -64,7 +64,7 @@ # Chat applications: element-desktop signal-desktop - webcord + webcord-vencord # Gaming: prismlauncher From dbce319c1d63fde105be89f096bda583bcb09721 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 26 Oct 2023 17:24:42 +0200 Subject: [PATCH 0020/2308] That didn't fix it, let's just wait for a fix --- home-manager/EDI-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 7241190..50db1ee 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -64,7 +64,7 @@ # Chat applications: element-desktop signal-desktop - webcord + webcord-vencord # Gaming: prismlauncher From 816c04902989b4ea15dcd666ebe70e1c514b63b7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 12:51:39 +0200 Subject: [PATCH 0021/2308] Works in shell, let's replace vencord with webcord --- home-manager/EDI-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 50db1ee..7241190 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -64,7 +64,7 @@ # Chat applications: element-desktop signal-desktop - webcord-vencord + webcord # Gaming: prismlauncher From 8678f8d3562658ced9b328bf93fd1f48c6f9f444 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 27 Oct 2023 12:51:39 +0200 Subject: [PATCH 0022/2308] Works in shell, let's replace vencord with webcord --- home-manager/EDI-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 50db1ee..7241190 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -64,7 +64,7 @@ # Chat applications: element-desktop signal-desktop - webcord-vencord + webcord # Gaming: prismlauncher From 430c90110c6a013c69016edb462ba9af840695f8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 12:57:53 +0200 Subject: [PATCH 0023/2308] import home config in main config --- home-manager/EDI-Lillian.nix | 2 +- nixos/EDI/configuration.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 7241190..50db1ee 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -64,7 +64,7 @@ # Chat applications: element-desktop signal-desktop - webcord + webcord-vencord # Gaming: prismlauncher diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index a58d23e..5315f57 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -22,6 +22,7 @@ # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix + ./././home-manager/EDI-Lillian.nix ]; nixpkgs = { From b8082ea87d6e3aa3fcfe45d55342987d91faca86 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 27 Oct 2023 12:57:53 +0200 Subject: [PATCH 0024/2308] import home config in main config --- home-manager/EDI-Lillian.nix | 2 +- nixos/EDI/configuration.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 7241190..50db1ee 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -64,7 +64,7 @@ # Chat applications: element-desktop signal-desktop - webcord + webcord-vencord # Gaming: prismlauncher diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index a58d23e..5315f57 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -22,6 +22,7 @@ # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix + ./././home-manager/EDI-Lillian.nix ]; nixpkgs = { From 8a5eeaf7747d958c1f22b7481b82168b91447888 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 13:00:40 +0200 Subject: [PATCH 0025/2308] import home-manager module --- nixos/EDI/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 5315f57..96c084f 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -10,6 +10,7 @@ }: { # You can import other NixOS modules here imports = [ + # If you want to use modules your own flake exports (from modules/nixos): # outputs.nixosModules.example From 1b0f970633f0cbeb83056d5eeebdb8ae8f3a3e78 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 27 Oct 2023 13:00:40 +0200 Subject: [PATCH 0026/2308] import home-manager module --- nixos/EDI/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 5315f57..96c084f 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -10,6 +10,7 @@ }: { # You can import other NixOS modules here imports = [ + # If you want to use modules your own flake exports (from modules/nixos): # outputs.nixosModules.example From ee1eabbd15ecb68947afb1f4a5dfc5491b777a9d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 13:58:20 +0200 Subject: [PATCH 0027/2308] Update to make home-manager hopefully work --- flake.lock | 6 +++--- flake.nix | 4 +++- nixos/EDI/configuration.nix | 12 ++++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6555b64..c9c92d4 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698250431, - "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", + "lastModified": 1698392685, + "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=", "owner": "nix-community", "repo": "home-manager", - "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", + "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0316422..1ee144d 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,8 @@ # Standalone home-manager configuration entrypoint # Available through 'home-manager --flake .#your-username@your-hostname' - homeConfigurations = { + /* + homeConfigurations = { "lillian@EDI" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance extraSpecialArgs = {inherit inputs outputs;}; @@ -103,5 +104,6 @@ ]; }; }; + */ }; } diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 96c084f..63c5586 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -10,7 +10,8 @@ }: { # You can import other NixOS modules here imports = [ - + # Import home-manager's NixOS module + inputs.home-manager.nixosModules.home-manager # If you want to use modules your own flake exports (from modules/nixos): # outputs.nixosModules.example @@ -23,9 +24,16 @@ # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix - ./././home-manager/EDI-Lillian.nix ]; + home-manager = { + extraSpecialArgs = { inherit inputs outputs; }; + users = { + # Import your home-manager configuration + lillian = import .../home-manager/EDI-Lillian.nix; + }; + }; + nixpkgs = { # You can add overlays here overlays = [ From 29ad90bcc1dd61c4e1d1450b2603d8098b62f67c Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 27 Oct 2023 13:58:20 +0200 Subject: [PATCH 0028/2308] Update to make home-manager hopefully work --- flake.lock | 6 +++--- flake.nix | 4 +++- nixos/EDI/configuration.nix | 12 ++++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6555b64..c9c92d4 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698250431, - "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", + "lastModified": 1698392685, + "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=", "owner": "nix-community", "repo": "home-manager", - "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", + "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0316422..1ee144d 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,8 @@ # Standalone home-manager configuration entrypoint # Available through 'home-manager --flake .#your-username@your-hostname' - homeConfigurations = { + /* + homeConfigurations = { "lillian@EDI" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance extraSpecialArgs = {inherit inputs outputs;}; @@ -103,5 +104,6 @@ ]; }; }; + */ }; } diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 96c084f..63c5586 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -10,7 +10,8 @@ }: { # You can import other NixOS modules here imports = [ - + # Import home-manager's NixOS module + inputs.home-manager.nixosModules.home-manager # If you want to use modules your own flake exports (from modules/nixos): # outputs.nixosModules.example @@ -23,9 +24,16 @@ # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix - ./././home-manager/EDI-Lillian.nix ]; + home-manager = { + extraSpecialArgs = { inherit inputs outputs; }; + users = { + # Import your home-manager configuration + lillian = import .../home-manager/EDI-Lillian.nix; + }; + }; + nixpkgs = { # You can add overlays here overlays = [ From a4b87e272968d375c638968d91c5fa43f803a340 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 13:59:34 +0200 Subject: [PATCH 0029/2308] Relative path fix --- nixos/EDI/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 63c5586..6476ac4 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -27,10 +27,10 @@ ]; home-manager = { - extraSpecialArgs = { inherit inputs outputs; }; + extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import .../home-manager/EDI-Lillian.nix; + lillian = import ../../../home-manager/EDI-Lillian.nix; }; }; From dbecc938580081f7cc0ae64354c30fd435f0d4ca Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 27 Oct 2023 13:59:34 +0200 Subject: [PATCH 0030/2308] Relative path fix --- nixos/EDI/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 63c5586..6476ac4 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -27,10 +27,10 @@ ]; home-manager = { - extraSpecialArgs = { inherit inputs outputs; }; + extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import .../home-manager/EDI-Lillian.nix; + lillian = import ../../../home-manager/EDI-Lillian.nix; }; }; From d65f9f6be3aad24228602a8a7d08d5846f30e0c1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 14:02:01 +0200 Subject: [PATCH 0031/2308] This confuses me, relative paths are confusing --- nixos/EDI/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 6476ac4..bfb29eb 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -30,7 +30,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../../home-manager/EDI-Lillian.nix; + lillian = import ../../home-manager/EDI-Lillian.nix; }; }; From b4d4822137a5740f73768836675c2b301e2444e0 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 27 Oct 2023 14:02:01 +0200 Subject: [PATCH 0032/2308] This confuses me, relative paths are confusing --- nixos/EDI/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 6476ac4..bfb29eb 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -30,7 +30,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../../home-manager/EDI-Lillian.nix; + lillian = import ../../home-manager/EDI-Lillian.nix; }; }; From da5f257edf7103d4a888f588686b20b64f4aaf5b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 14:04:54 +0200 Subject: [PATCH 0033/2308] Allow insecure electron --- nixos/EDI/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index bfb29eb..d42717a 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -56,6 +56,9 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; + permittedInsecurePackages = [ + "electron-22.3.27" + ] }; }; From 9a53fe914b8b0723b8023067b6dcd510fc649a27 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 27 Oct 2023 14:04:54 +0200 Subject: [PATCH 0034/2308] Allow insecure electron --- nixos/EDI/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index bfb29eb..d42717a 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -56,6 +56,9 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; + permittedInsecurePackages = [ + "electron-22.3.27" + ] }; }; From 6c784f846d939df04ae558b8db197a689a0a7655 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 14:05:23 +0200 Subject: [PATCH 0035/2308] Forgot semicolon --- nixos/EDI/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index d42717a..334b2bf 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -58,7 +58,7 @@ allowUnfree = true; permittedInsecurePackages = [ "electron-22.3.27" - ] + ]; }; }; From ccf0abd976cc4c6da2e72ead5b6ac61780202d9c Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 27 Oct 2023 14:05:23 +0200 Subject: [PATCH 0036/2308] Forgot semicolon --- nixos/EDI/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index d42717a..334b2bf 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -58,7 +58,7 @@ allowUnfree = true; permittedInsecurePackages = [ "electron-22.3.27" - ] + ]; }; }; From fcfaf30016936652ea448a99f24cfdbd440e2ac8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 14:07:24 +0200 Subject: [PATCH 0037/2308] In home manager maybe? --- home-manager/EDI-Lillian.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 50db1ee..b6cfc95 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -44,6 +44,10 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; + + permittedInsecurePackages = [ + "electron-22.3.27" + ]; }; }; From 7141a8c776a23870cdc7ae9f13e9c8c1ff9603a8 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 27 Oct 2023 14:07:24 +0200 Subject: [PATCH 0038/2308] In home manager maybe? --- home-manager/EDI-Lillian.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 50db1ee..b6cfc95 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -44,6 +44,10 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; + + permittedInsecurePackages = [ + "electron-22.3.27" + ]; }; }; From 69f244e973c69f747ac3a3a6b4eacb5a79158201 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 14:10:48 +0200 Subject: [PATCH 0039/2308] Errors on building the python plugin --- home-manager/EDI-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index b6cfc95..3fabd58 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -110,7 +110,7 @@ jnoortheen.nix-ide kamadorueda.alejandra ms-toolsai.jupyter - ms-python.python + #ms-python.python rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; From 1becc93db76b5aee49e44fde915232b90e4e7c31 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 27 Oct 2023 14:10:48 +0200 Subject: [PATCH 0040/2308] Errors on building the python plugin --- home-manager/EDI-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index b6cfc95..3fabd58 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -110,7 +110,7 @@ jnoortheen.nix-ide kamadorueda.alejandra ms-toolsai.jupyter - ms-python.python + #ms-python.python rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; From c1ae6aa8c7666f5adef3b9bd34880b2877931db1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 14:22:35 +0200 Subject: [PATCH 0041/2308] Set git identity --- home-manager/EDI-Lillian.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 3fabd58..bbba052 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -68,7 +68,7 @@ # Chat applications: element-desktop signal-desktop - webcord-vencord + webcord # Gaming: prismlauncher @@ -190,8 +190,11 @@ # Enable home-manager and git programs.home-manager.enable = true; - programs.git.enable = true; - + programs.git = { + enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; + }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; From fd113f70785e637e3d7bd5a66ed6100dbf0fa5ed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 14:22:35 +0200 Subject: [PATCH 0042/2308] Set git identity --- home-manager/EDI-Lillian.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 3fabd58..bbba052 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -68,7 +68,7 @@ # Chat applications: element-desktop signal-desktop - webcord-vencord + webcord # Gaming: prismlauncher @@ -190,8 +190,11 @@ # Enable home-manager and git programs.home-manager.enable = true; - programs.git.enable = true; - + programs.git = { + enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; + }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; From bd0b2e5eae803c824a36e196bbaed463ac9e50c1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 15:42:20 +0200 Subject: [PATCH 0043/2308] Going to try sops again after all fixes --- flake.nix | 2 ++ nixos/EDI/configuration.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 1ee144d..54ee3b8 100644 --- a/flake.nix +++ b/flake.nix @@ -66,6 +66,7 @@ modules = [ # > Our main nixos configuration file < ./nixos/EDI/configuration.nix + sops-nix.nixosModules.sops ]; }; }; @@ -76,6 +77,7 @@ modules = [ # > Our main nixos configuration file < ./nixos/GLaDOS/configuration.nix + sops-nix.nixosModules.sops ]; }; }; diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 334b2bf..59f17d1 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -85,7 +85,7 @@ }; environment.systemPackages = with pkgs; [ - rage + age alejandra git-filter-repo home-manager From 5b6c9302ea005ea9db05c942da175c7fe8928a51 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 27 Oct 2023 15:42:20 +0200 Subject: [PATCH 0044/2308] Going to try sops again after all fixes --- flake.nix | 2 ++ nixos/EDI/configuration.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 1ee144d..54ee3b8 100644 --- a/flake.nix +++ b/flake.nix @@ -66,6 +66,7 @@ modules = [ # > Our main nixos configuration file < ./nixos/EDI/configuration.nix + sops-nix.nixosModules.sops ]; }; }; @@ -76,6 +77,7 @@ modules = [ # > Our main nixos configuration file < ./nixos/GLaDOS/configuration.nix + sops-nix.nixosModules.sops ]; }; }; diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 334b2bf..59f17d1 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -85,7 +85,7 @@ }; environment.systemPackages = with pkgs; [ - rage + age alejandra git-filter-repo home-manager From 9e0db08a00ab498736aef127240fea7e0761839a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 29 Oct 2023 21:19:51 +0100 Subject: [PATCH 0045/2308] Sops don't work yet, updated lock, zsh nix shell --- .sops.yaml | 11 +++++++++++ flake.lock | 36 ++++++++++++++++++------------------ home-manager/EDI-Lillian.nix | 13 ++++++++++++- 3 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 .sops.yaml diff --git a/.sops.yaml b/.sops.yaml new file mode 100644 index 0000000..826efd6 --- /dev/null +++ b/.sops.yaml @@ -0,0 +1,11 @@ +# This example uses YAML anchors which allows reuse of multiple keys +# without having to repeat yourself. +# Also see https://github.com/Mic92/dotfiles/blob/master/nixos/.sops.yaml +# for a more complex example. +keys: + - &lillian age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz +creation_rules: + - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ + key_groups: + age: + - *lillian \ No newline at end of file diff --git a/flake.lock b/flake.lock index c9c92d4..f012b25 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698392685, - "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=", + "lastModified": 1698479159, + "narHash": "sha256-rJHBDwW4LbADEfhkgGHjKGfL2dF44NrlyXdXeZrQahs=", "owner": "nix-community", "repo": "home-manager", - "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f", + "rev": "f92a54fef4eacdbe86b0a2054054dd58b0e2a2a4", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698134075, - "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1697929210, - "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", + "lastModified": 1698544399, + "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", + "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1698134075, - "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697886341, - "narHash": "sha256-AdE67xPty9M9wn36nPVp6aDntIdigrs7UbyaGv1VAaM=", + "lastModified": 1698336494, + "narHash": "sha256-sO72WDBKyijYD1GcKPlGsycKbMBiTJMBCnmOxLAs880=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44881e03af1c730cbb1d72a4d41274a2c957813a", + "rev": "808c0d8c53c7ae50f82aca8e7df263225cf235bf", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698273636, - "narHash": "sha256-swsqg/ckSVJnravx7ie9NFQSKIH27owtlk0wh4+xStk=", + "lastModified": 1698548647, + "narHash": "sha256-7c03OjBGqnwDW0FBaBc+NjfEBxMkza+dxZGJPyIzfFE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "014e44d334a39481223a5d163530d4c4ca2e75cb", + "rev": "632c3161a6cc24142c8e3f5529f5d81042571165", "type": "github" }, "original": { diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index bbba052..9fe9080 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -118,6 +118,18 @@ programs.zsh = { enable = true; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.7.0"; + sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + }; + } + ]; enableAutosuggestions = true; enableCompletion = true; historySubstringSearch.enable = true; @@ -182,7 +194,6 @@ "web-search" "zsh-interactive-cd" "zsh-navigation-tools" - "zsh-nix-shell" ]; theme = "jtriley"; }; From 816b858c75abb7b5b8d2fe204b0152e1ea8c50f1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 29 Oct 2023 21:19:51 +0100 Subject: [PATCH 0046/2308] Sops don't work yet, updated lock, zsh nix shell --- .sops.yaml | 11 +++++++++++ flake.lock | 36 ++++++++++++++++++------------------ home-manager/EDI-Lillian.nix | 13 ++++++++++++- 3 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 .sops.yaml diff --git a/.sops.yaml b/.sops.yaml new file mode 100644 index 0000000..826efd6 --- /dev/null +++ b/.sops.yaml @@ -0,0 +1,11 @@ +# This example uses YAML anchors which allows reuse of multiple keys +# without having to repeat yourself. +# Also see https://github.com/Mic92/dotfiles/blob/master/nixos/.sops.yaml +# for a more complex example. +keys: + - &lillian age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz +creation_rules: + - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ + key_groups: + age: + - *lillian \ No newline at end of file diff --git a/flake.lock b/flake.lock index c9c92d4..f012b25 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698392685, - "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=", + "lastModified": 1698479159, + "narHash": "sha256-rJHBDwW4LbADEfhkgGHjKGfL2dF44NrlyXdXeZrQahs=", "owner": "nix-community", "repo": "home-manager", - "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f", + "rev": "f92a54fef4eacdbe86b0a2054054dd58b0e2a2a4", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698134075, - "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1697929210, - "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", + "lastModified": 1698544399, + "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", + "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1698134075, - "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697886341, - "narHash": "sha256-AdE67xPty9M9wn36nPVp6aDntIdigrs7UbyaGv1VAaM=", + "lastModified": 1698336494, + "narHash": "sha256-sO72WDBKyijYD1GcKPlGsycKbMBiTJMBCnmOxLAs880=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44881e03af1c730cbb1d72a4d41274a2c957813a", + "rev": "808c0d8c53c7ae50f82aca8e7df263225cf235bf", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698273636, - "narHash": "sha256-swsqg/ckSVJnravx7ie9NFQSKIH27owtlk0wh4+xStk=", + "lastModified": 1698548647, + "narHash": "sha256-7c03OjBGqnwDW0FBaBc+NjfEBxMkza+dxZGJPyIzfFE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "014e44d334a39481223a5d163530d4c4ca2e75cb", + "rev": "632c3161a6cc24142c8e3f5529f5d81042571165", "type": "github" }, "original": { diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index bbba052..9fe9080 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -118,6 +118,18 @@ programs.zsh = { enable = true; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.7.0"; + sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + }; + } + ]; enableAutosuggestions = true; enableCompletion = true; historySubstringSearch.enable = true; @@ -182,7 +194,6 @@ "web-search" "zsh-interactive-cd" "zsh-navigation-tools" - "zsh-nix-shell" ]; theme = "jtriley"; }; From 64572c4fcf7f08214ea2a64db3b7a6e21e9705eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 Nov 2023 21:57:49 +0100 Subject: [PATCH 0047/2308] Add kirigami and some small fixes to GLaDOS --- home-manager/GLaDOS-Lillian.nix | 28 +++++++++++++++++++++++----- nixos/EDI/configuration.nix | 1 + nixos/GLaDOS/configuration.nix | 18 ++++++++++++++++-- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index 50db1ee..9fe9080 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -44,6 +44,10 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; + + permittedInsecurePackages = [ + "electron-22.3.27" + ]; }; }; @@ -64,7 +68,7 @@ # Chat applications: element-desktop signal-desktop - webcord-vencord + webcord # Gaming: prismlauncher @@ -106,7 +110,7 @@ jnoortheen.nix-ide kamadorueda.alejandra ms-toolsai.jupyter - ms-python.python + #ms-python.python rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; @@ -114,6 +118,18 @@ programs.zsh = { enable = true; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.7.0"; + sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + }; + } + ]; enableAutosuggestions = true; enableCompletion = true; historySubstringSearch.enable = true; @@ -178,7 +194,6 @@ "web-search" "zsh-interactive-cd" "zsh-navigation-tools" - "zsh-nix-shell" ]; theme = "jtriley"; }; @@ -186,8 +201,11 @@ # Enable home-manager and git programs.home-manager.enable = true; - programs.git.enable = true; - + programs.git = { + enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; + }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 59f17d1..95630c4 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -89,6 +89,7 @@ alejandra git-filter-repo home-manager + kirigami libsForQt5.discover libsForQt5.kdepim-addons libsForQt5.packagekit-qt diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index a58d23e..a88005f 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -10,6 +10,8 @@ }: { # You can import other NixOS modules here imports = [ + # Import home-manager's NixOS module + inputs.home-manager.nixosModules.home-manager # If you want to use modules your own flake exports (from modules/nixos): # outputs.nixosModules.example @@ -24,6 +26,14 @@ ./hardware-configuration.nix ]; + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../home-manager/GLaDOS-Lillian.nix; + }; + }; + nixpkgs = { # You can add overlays here overlays = [ @@ -46,6 +56,9 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; + permittedInsecurePackages = [ + "electron-22.3.27" + ]; }; }; @@ -72,10 +85,11 @@ }; environment.systemPackages = with pkgs; [ - rage + age alejandra git-filter-repo home-manager + kirigami libsForQt5.discover libsForQt5.kdepim-addons libsForQt5.packagekit-qt @@ -154,7 +168,7 @@ enable = true; }; - networking.hostName = "EDI"; + networking.hostName = "GLaDOS"; boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; From 7a91bb818f011f70a16c3678336479cc583efe55 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 Nov 2023 21:57:49 +0100 Subject: [PATCH 0048/2308] Add kirigami and some small fixes to GLaDOS --- home-manager/GLaDOS-Lillian.nix | 28 +++++++++++++++++++++++----- nixos/EDI/configuration.nix | 1 + nixos/GLaDOS/configuration.nix | 18 ++++++++++++++++-- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index 50db1ee..9fe9080 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -44,6 +44,10 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; + + permittedInsecurePackages = [ + "electron-22.3.27" + ]; }; }; @@ -64,7 +68,7 @@ # Chat applications: element-desktop signal-desktop - webcord-vencord + webcord # Gaming: prismlauncher @@ -106,7 +110,7 @@ jnoortheen.nix-ide kamadorueda.alejandra ms-toolsai.jupyter - ms-python.python + #ms-python.python rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; @@ -114,6 +118,18 @@ programs.zsh = { enable = true; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.7.0"; + sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + }; + } + ]; enableAutosuggestions = true; enableCompletion = true; historySubstringSearch.enable = true; @@ -178,7 +194,6 @@ "web-search" "zsh-interactive-cd" "zsh-navigation-tools" - "zsh-nix-shell" ]; theme = "jtriley"; }; @@ -186,8 +201,11 @@ # Enable home-manager and git programs.home-manager.enable = true; - programs.git.enable = true; - + programs.git = { + enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; + }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 59f17d1..95630c4 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -89,6 +89,7 @@ alejandra git-filter-repo home-manager + kirigami libsForQt5.discover libsForQt5.kdepim-addons libsForQt5.packagekit-qt diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index a58d23e..a88005f 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -10,6 +10,8 @@ }: { # You can import other NixOS modules here imports = [ + # Import home-manager's NixOS module + inputs.home-manager.nixosModules.home-manager # If you want to use modules your own flake exports (from modules/nixos): # outputs.nixosModules.example @@ -24,6 +26,14 @@ ./hardware-configuration.nix ]; + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../home-manager/GLaDOS-Lillian.nix; + }; + }; + nixpkgs = { # You can add overlays here overlays = [ @@ -46,6 +56,9 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; + permittedInsecurePackages = [ + "electron-22.3.27" + ]; }; }; @@ -72,10 +85,11 @@ }; environment.systemPackages = with pkgs; [ - rage + age alejandra git-filter-repo home-manager + kirigami libsForQt5.discover libsForQt5.kdepim-addons libsForQt5.packagekit-qt @@ -154,7 +168,7 @@ enable = true; }; - networking.hostName = "EDI"; + networking.hostName = "GLaDOS"; boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; From 7a0f29b1c3d5524c5d1f5951a2f2f731a8405534 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 Nov 2023 22:00:51 +0100 Subject: [PATCH 0049/2308] Wrong package name --- nixos/EDI/configuration.nix | 2 +- nixos/GLaDOS/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 95630c4..911f83e 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -89,9 +89,9 @@ alejandra git-filter-repo home-manager - kirigami libsForQt5.discover libsForQt5.kdepim-addons + libsForQt5.kirigami2 libsForQt5.packagekit-qt libportal-qt5 noto-fonts diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index a88005f..bb17da7 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -89,9 +89,9 @@ alejandra git-filter-repo home-manager - kirigami libsForQt5.discover libsForQt5.kdepim-addons + libsForQt5.kirigami2 libsForQt5.packagekit-qt libportal-qt5 noto-fonts From 6a4b2581d9d73a53754454d6da60e1b1cd245255 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 Nov 2023 22:00:51 +0100 Subject: [PATCH 0050/2308] Wrong package name --- nixos/EDI/configuration.nix | 2 +- nixos/GLaDOS/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 95630c4..911f83e 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -89,9 +89,9 @@ alejandra git-filter-repo home-manager - kirigami libsForQt5.discover libsForQt5.kdepim-addons + libsForQt5.kirigami2 libsForQt5.packagekit-qt libportal-qt5 noto-fonts diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index a88005f..bb17da7 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -89,9 +89,9 @@ alejandra git-filter-repo home-manager - kirigami libsForQt5.discover libsForQt5.kdepim-addons + libsForQt5.kirigami2 libsForQt5.packagekit-qt libportal-qt5 noto-fonts From bedcbfb89152828cfc1686e6fcaf2be033242781 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 Nov 2023 22:02:15 +0100 Subject: [PATCH 0051/2308] Flake lock update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f012b25..4ba8f83 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698479159, - "narHash": "sha256-rJHBDwW4LbADEfhkgGHjKGfL2dF44NrlyXdXeZrQahs=", + "lastModified": 1699025595, + "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f92a54fef4eacdbe86b0a2054054dd58b0e2a2a4", + "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698548647, - "narHash": "sha256-7c03OjBGqnwDW0FBaBc+NjfEBxMkza+dxZGJPyIzfFE=", + "lastModified": 1699021419, + "narHash": "sha256-oy2j2OHXYcckifASMeZzpmbDLSvobMGt0V/RvoDotF4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "632c3161a6cc24142c8e3f5529f5d81042571165", + "rev": "275b28593ef3a1b9d05b6eeda3ddce2f45f5c06f", "type": "github" }, "original": { From 7aaba9881ba8aee041e23c2c01bea17e43262b64 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 Nov 2023 22:02:15 +0100 Subject: [PATCH 0052/2308] Flake lock update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f012b25..4ba8f83 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1698479159, - "narHash": "sha256-rJHBDwW4LbADEfhkgGHjKGfL2dF44NrlyXdXeZrQahs=", + "lastModified": 1699025595, + "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f92a54fef4eacdbe86b0a2054054dd58b0e2a2a4", + "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698548647, - "narHash": "sha256-7c03OjBGqnwDW0FBaBc+NjfEBxMkza+dxZGJPyIzfFE=", + "lastModified": 1699021419, + "narHash": "sha256-oy2j2OHXYcckifASMeZzpmbDLSvobMGt0V/RvoDotF4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "632c3161a6cc24142c8e3f5529f5d81042571165", + "rev": "275b28593ef3a1b9d05b6eeda3ddce2f45f5c06f", "type": "github" }, "original": { From a992ce6931b941eacd61d95ff51e584524a478cd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 Nov 2023 23:22:04 +0100 Subject: [PATCH 0053/2308] Added extra vscode extensions --- home-manager/EDI-Lillian.nix | 10 +++++++++- home-manager/GLaDOS-Lillian.nix | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 9fe9080..6b96032 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -105,12 +105,20 @@ enable = true; package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ - dracula-theme.theme-dracula arrterian.nix-env-selector + ban.spellright + dracula-theme.theme-dracula + eamodio.gitlens + github.vscode-pull-request-github jnoortheen.nix-ide kamadorueda.alejandra ms-toolsai.jupyter + ms-pyright.pyright #ms-python.python + ms-python.vscode-pylance + ms-vscode-remote.remote-containers + ms-vscode-remote.remote-ssh + oderwat.indent-rainbow rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index 9fe9080..6b96032 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -105,12 +105,20 @@ enable = true; package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ - dracula-theme.theme-dracula arrterian.nix-env-selector + ban.spellright + dracula-theme.theme-dracula + eamodio.gitlens + github.vscode-pull-request-github jnoortheen.nix-ide kamadorueda.alejandra ms-toolsai.jupyter + ms-pyright.pyright #ms-python.python + ms-python.vscode-pylance + ms-vscode-remote.remote-containers + ms-vscode-remote.remote-ssh + oderwat.indent-rainbow rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; From d0cc5648f8ae7a8f8e6d3b73784fdc86d920ed5b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 Nov 2023 23:22:04 +0100 Subject: [PATCH 0054/2308] Added extra vscode extensions --- home-manager/EDI-Lillian.nix | 10 +++++++++- home-manager/GLaDOS-Lillian.nix | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 9fe9080..6b96032 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -105,12 +105,20 @@ enable = true; package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ - dracula-theme.theme-dracula arrterian.nix-env-selector + ban.spellright + dracula-theme.theme-dracula + eamodio.gitlens + github.vscode-pull-request-github jnoortheen.nix-ide kamadorueda.alejandra ms-toolsai.jupyter + ms-pyright.pyright #ms-python.python + ms-python.vscode-pylance + ms-vscode-remote.remote-containers + ms-vscode-remote.remote-ssh + oderwat.indent-rainbow rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index 9fe9080..6b96032 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -105,12 +105,20 @@ enable = true; package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ - dracula-theme.theme-dracula arrterian.nix-env-selector + ban.spellright + dracula-theme.theme-dracula + eamodio.gitlens + github.vscode-pull-request-github jnoortheen.nix-ide kamadorueda.alejandra ms-toolsai.jupyter + ms-pyright.pyright #ms-python.python + ms-python.vscode-pylance + ms-vscode-remote.remote-containers + ms-vscode-remote.remote-ssh + oderwat.indent-rainbow rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; From a1a02a638acf2052bd10f49401c3a7796a40d45c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 4 Nov 2023 10:30:17 +0100 Subject: [PATCH 0055/2308] Figured out sops --- .sops.yaml | 8 +++++--- secrets/EDI-Lillian.yaml | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 secrets/EDI-Lillian.yaml diff --git a/.sops.yaml b/.sops.yaml index 826efd6..b7b6799 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -3,9 +3,11 @@ # Also see https://github.com/Mic92/dotfiles/blob/master/nixos/.sops.yaml # for a more complex example. keys: - - &lillian age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + - &admin_lillian age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz creation_rules: - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ key_groups: - age: - - *lillian \ No newline at end of file + - age: + - *admin_lillian +#Run the following command to create EDI-Lillian.yaml in the secrets folder: +# nix-shell -p sops --run "sops secrets/EDI-Lillian.yaml" \ No newline at end of file diff --git a/secrets/EDI-Lillian.yaml b/secrets/EDI-Lillian.yaml new file mode 100644 index 0000000..8a2082f --- /dev/null +++ b/secrets/EDI-Lillian.yaml @@ -0,0 +1,21 @@ +password: ENC[AES256_GCM,data:4EAU7m0RF3BWnIDdcRFkC+UcwcQ=,iv:s1gF8edUjatry3h/e5ZmBXLOEJO1iX8tiyuanzuJgJY=,tag:cicC8WzOnIhG8xIM09nrTw==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2R2hoVEwvOGV5ZnlNZHFa + SkNLUmdLc29kVEZqeXJDSmxmd2ZmNzFCREg0CklvbUpTMTJ4OXk3K1FOK013Y01m + Lzk3czVrek56N1VpZkJkeUlDaDM1VXcKLS0tIHJNTitsT3kwNHpzWkIxM0VsZmtP + eUZ6b09pYlRVWFBuUm1Ua2l6Z0dacW8KeQdAVsxXsDiDMtFA2koSpDsw7Ib63vA0 + GE/ubWDwwRc7wMPFGuofIe6TaDSFgtVXza+yo+i4y51+BOpwqxlYYA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-11-04T09:24:15Z" + mac: ENC[AES256_GCM,data:SoNQ2F2hye6l4B29dLOycZYNqdpluRWgsIj0ZJ5aanExBKq8REHyoXU11X+ItZkrHkyNHyDf1cpQSwyL0AMJG6KXn0z//hKuMijOF3AQ5fXgIu4vmutvpvvIQ/7rBxATsFq43QjIWHsSOOfi1HYpBRlDwc/oTCG9G//NzR9MqOo=,iv:uhZuK1wGPUbhby++T2diyleLWvGbFE+1HCuw0y73eTQ=,tag:lkWn+nYkGP0L0HyVjjYhCA==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 From c78cf04195e0dc7240bf38e357412e6897927097 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 4 Nov 2023 10:30:17 +0100 Subject: [PATCH 0056/2308] Figured out sops --- .sops.yaml | 8 +++++--- secrets/EDI-Lillian.yaml | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 secrets/EDI-Lillian.yaml diff --git a/.sops.yaml b/.sops.yaml index 826efd6..b7b6799 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -3,9 +3,11 @@ # Also see https://github.com/Mic92/dotfiles/blob/master/nixos/.sops.yaml # for a more complex example. keys: - - &lillian age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + - &admin_lillian age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz creation_rules: - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ key_groups: - age: - - *lillian \ No newline at end of file + - age: + - *admin_lillian +#Run the following command to create EDI-Lillian.yaml in the secrets folder: +# nix-shell -p sops --run "sops secrets/EDI-Lillian.yaml" \ No newline at end of file diff --git a/secrets/EDI-Lillian.yaml b/secrets/EDI-Lillian.yaml new file mode 100644 index 0000000..8a2082f --- /dev/null +++ b/secrets/EDI-Lillian.yaml @@ -0,0 +1,21 @@ +password: ENC[AES256_GCM,data:4EAU7m0RF3BWnIDdcRFkC+UcwcQ=,iv:s1gF8edUjatry3h/e5ZmBXLOEJO1iX8tiyuanzuJgJY=,tag:cicC8WzOnIhG8xIM09nrTw==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2R2hoVEwvOGV5ZnlNZHFa + SkNLUmdLc29kVEZqeXJDSmxmd2ZmNzFCREg0CklvbUpTMTJ4OXk3K1FOK013Y01m + Lzk3czVrek56N1VpZkJkeUlDaDM1VXcKLS0tIHJNTitsT3kwNHpzWkIxM0VsZmtP + eUZ6b09pYlRVWFBuUm1Ua2l6Z0dacW8KeQdAVsxXsDiDMtFA2koSpDsw7Ib63vA0 + GE/ubWDwwRc7wMPFGuofIe6TaDSFgtVXza+yo+i4y51+BOpwqxlYYA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-11-04T09:24:15Z" + mac: ENC[AES256_GCM,data:SoNQ2F2hye6l4B29dLOycZYNqdpluRWgsIj0ZJ5aanExBKq8REHyoXU11X+ItZkrHkyNHyDf1cpQSwyL0AMJG6KXn0z//hKuMijOF3AQ5fXgIu4vmutvpvvIQ/7rBxATsFq43QjIWHsSOOfi1HYpBRlDwc/oTCG9G//NzR9MqOo=,iv:uhZuK1wGPUbhby++T2diyleLWvGbFE+1HCuw0y73eTQ=,tag:lkWn+nYkGP0L0HyVjjYhCA==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 From 9bb32c5b2b136b3e1ac23ce9c93cd8abd794d4cc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 4 Nov 2023 11:06:21 +0100 Subject: [PATCH 0057/2308] Removed standalone home-manager entrypoint --- flake.nix | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/flake.nix b/flake.nix index 54ee3b8..55ecf53 100644 --- a/flake.nix +++ b/flake.nix @@ -81,31 +81,5 @@ ]; }; }; - - # Standalone home-manager configuration entrypoint - # Available through 'home-manager --flake .#your-username@your-hostname' - /* - homeConfigurations = { - "lillian@EDI" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs;}; - modules = [ - # > Our main home-manager configuration file < - ./home-manager/EDI-Lillian.nix - ]; - }; - }; - - homeConfigurations = { - "lillian@GLaDOS" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs;}; - modules = [ - # > Our main home-manager configuration file < - ./home-manager/GLaDOS-Lillian.nix - ]; - }; - }; - */ }; } From 998a040dd4a28f458b1a672452f4ff61fedd4f48 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 4 Nov 2023 11:06:21 +0100 Subject: [PATCH 0058/2308] Removed standalone home-manager entrypoint --- flake.nix | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/flake.nix b/flake.nix index 54ee3b8..55ecf53 100644 --- a/flake.nix +++ b/flake.nix @@ -81,31 +81,5 @@ ]; }; }; - - # Standalone home-manager configuration entrypoint - # Available through 'home-manager --flake .#your-username@your-hostname' - /* - homeConfigurations = { - "lillian@EDI" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs;}; - modules = [ - # > Our main home-manager configuration file < - ./home-manager/EDI-Lillian.nix - ]; - }; - }; - - homeConfigurations = { - "lillian@GLaDOS" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs;}; - modules = [ - # > Our main home-manager configuration file < - ./home-manager/GLaDOS-Lillian.nix - ]; - }; - }; - */ }; } From 32270fba5bbb8c54540b68475fb632f3860729ff Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 8 Nov 2023 09:43:19 +0100 Subject: [PATCH 0059/2308] Nix flake update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 4ba8f83..acf2e6b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1699025595, - "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", + "lastModified": 1699368917, + "narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", + "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1698544399, - "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", + "lastModified": 1699110214, + "narHash": "sha256-L2TU4RgtiqF69W8Gacg2jEkEYJrW+Kp0Mp4plwQh5b8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", + "rev": "78f3a4ae19f0e99d5323dd2e3853916b8ee4afee", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1698336494, - "narHash": "sha256-sO72WDBKyijYD1GcKPlGsycKbMBiTJMBCnmOxLAs880=", + "lastModified": 1699094435, + "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "808c0d8c53c7ae50f82aca8e7df263225cf235bf", + "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699021419, - "narHash": "sha256-oy2j2OHXYcckifASMeZzpmbDLSvobMGt0V/RvoDotF4=", + "lastModified": 1699311858, + "narHash": "sha256-W/sQrghPAn5J9d+9kMnHqi4NPVWVpy0V/qzQeZfS/dM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "275b28593ef3a1b9d05b6eeda3ddce2f45f5c06f", + "rev": "664187539871f63857bda2d498f452792457b998", "type": "github" }, "original": { From d6f7ce3c98555c2061d7f6be4aa61a54d0c8571a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 8 Nov 2023 09:43:19 +0100 Subject: [PATCH 0060/2308] Nix flake update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 4ba8f83..acf2e6b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1699025595, - "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", + "lastModified": 1699368917, + "narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", + "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1698544399, - "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", + "lastModified": 1699110214, + "narHash": "sha256-L2TU4RgtiqF69W8Gacg2jEkEYJrW+Kp0Mp4plwQh5b8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", + "rev": "78f3a4ae19f0e99d5323dd2e3853916b8ee4afee", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1698336494, - "narHash": "sha256-sO72WDBKyijYD1GcKPlGsycKbMBiTJMBCnmOxLAs880=", + "lastModified": 1699094435, + "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "808c0d8c53c7ae50f82aca8e7df263225cf235bf", + "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699021419, - "narHash": "sha256-oy2j2OHXYcckifASMeZzpmbDLSvobMGt0V/RvoDotF4=", + "lastModified": 1699311858, + "narHash": "sha256-W/sQrghPAn5J9d+9kMnHqi4NPVWVpy0V/qzQeZfS/dM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "275b28593ef3a1b9d05b6eeda3ddce2f45f5c06f", + "rev": "664187539871f63857bda2d498f452792457b998", "type": "github" }, "original": { From 8d5750944c362e8644959c3e93bf205dd4eb45e9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 Nov 2023 21:20:35 +0100 Subject: [PATCH 0061/2308] GLaDOS hardware configuration added :) --- nixos/GLaDOS/hardware-configuration.nix | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 nixos/GLaDOS/hardware-configuration.nix diff --git a/nixos/GLaDOS/hardware-configuration.nix b/nixos/GLaDOS/hardware-configuration.nix new file mode 100644 index 0000000..3b523fc --- /dev/null +++ b/nixos/GLaDOS/hardware-configuration.nix @@ -0,0 +1,40 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/BA43-C24E"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From 73bb5e8da9adb6cfb52ce90ef76aa05e7a4dee3e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 Nov 2023 21:20:35 +0100 Subject: [PATCH 0062/2308] GLaDOS hardware configuration added :) --- nixos/GLaDOS/hardware-configuration.nix | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 nixos/GLaDOS/hardware-configuration.nix diff --git a/nixos/GLaDOS/hardware-configuration.nix b/nixos/GLaDOS/hardware-configuration.nix new file mode 100644 index 0000000..3b523fc --- /dev/null +++ b/nixos/GLaDOS/hardware-configuration.nix @@ -0,0 +1,40 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/BA43-C24E"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From e4403b4836425616a38e75db3bc625986748c8b8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 Nov 2023 21:21:27 +0100 Subject: [PATCH 0063/2308] Add input leap --- nixos/EDI/configuration.nix | 1 + nixos/GLaDOS/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 911f83e..90f89fb 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -89,6 +89,7 @@ alejandra git-filter-repo home-manager + input-leap libsForQt5.discover libsForQt5.kdepim-addons libsForQt5.kirigami2 diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index bb17da7..b95eecc 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -89,6 +89,7 @@ alejandra git-filter-repo home-manager + input-leap libsForQt5.discover libsForQt5.kdepim-addons libsForQt5.kirigami2 From 79959fe58179319e61f8d1015c885136d13b77dd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 Nov 2023 21:21:27 +0100 Subject: [PATCH 0064/2308] Add input leap --- nixos/EDI/configuration.nix | 1 + nixos/GLaDOS/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 911f83e..90f89fb 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -89,6 +89,7 @@ alejandra git-filter-repo home-manager + input-leap libsForQt5.discover libsForQt5.kdepim-addons libsForQt5.kirigami2 diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index bb17da7..b95eecc 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -89,6 +89,7 @@ alejandra git-filter-repo home-manager + input-leap libsForQt5.discover libsForQt5.kdepim-addons libsForQt5.kirigami2 From 6729fcbd7a7b122656631193a6fab41b140c266a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 Nov 2023 23:26:34 +0100 Subject: [PATCH 0065/2308] add kde connect --- nixos/EDI/configuration.nix | 1 + nixos/GLaDOS/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 90f89fb..bf42bdf 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -93,6 +93,7 @@ libsForQt5.discover libsForQt5.kdepim-addons libsForQt5.kirigami2 + libsForQt5.kdeconnect-kde libsForQt5.packagekit-qt libportal-qt5 noto-fonts diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index b95eecc..c2a0c0f 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -91,6 +91,7 @@ home-manager input-leap libsForQt5.discover + libsForQt5.kdeconnect-kde libsForQt5.kdepim-addons libsForQt5.kirigami2 libsForQt5.packagekit-qt From facbb268a09d5dbf540251461a844ed6f8e5f0a9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 Nov 2023 23:26:34 +0100 Subject: [PATCH 0066/2308] add kde connect --- nixos/EDI/configuration.nix | 1 + nixos/GLaDOS/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 90f89fb..bf42bdf 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -93,6 +93,7 @@ libsForQt5.discover libsForQt5.kdepim-addons libsForQt5.kirigami2 + libsForQt5.kdeconnect-kde libsForQt5.packagekit-qt libportal-qt5 noto-fonts diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index b95eecc..c2a0c0f 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -91,6 +91,7 @@ home-manager input-leap libsForQt5.discover + libsForQt5.kdeconnect-kde libsForQt5.kdepim-addons libsForQt5.kirigami2 libsForQt5.packagekit-qt From d0826142495b52cb178428114b931b9bc2f62e42 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 Nov 2023 23:36:41 +0100 Subject: [PATCH 0067/2308] Enable kde connect --- nixos/EDI/configuration.nix | 1 + nixos/GLaDOS/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index bf42bdf..e6d4ef0 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -135,6 +135,7 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.defaultSession = "plasmawayland"; + programs.kdeconnect.enable # Enable flatpak support services.flatpak.enable = true; diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index c2a0c0f..8bc214e 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -135,6 +135,7 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.defaultSession = "plasmawayland"; + programs.kdeconnect.enable # Enable flatpak support services.flatpak.enable = true; From 8bd69b5da6f9cab9b86c86200883232f064d377f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 Nov 2023 23:36:41 +0100 Subject: [PATCH 0068/2308] Enable kde connect --- nixos/EDI/configuration.nix | 1 + nixos/GLaDOS/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index bf42bdf..e6d4ef0 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -135,6 +135,7 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.defaultSession = "plasmawayland"; + programs.kdeconnect.enable # Enable flatpak support services.flatpak.enable = true; diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index c2a0c0f..8bc214e 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -135,6 +135,7 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.defaultSession = "plasmawayland"; + programs.kdeconnect.enable # Enable flatpak support services.flatpak.enable = true; From adedcc7f787a3b3950e4ed7e7ce750a3ea392a21 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 Nov 2023 23:37:39 +0100 Subject: [PATCH 0069/2308] That's not how you do that... --- nixos/EDI/configuration.nix | 2 +- nixos/GLaDOS/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index e6d4ef0..8163f90 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -135,7 +135,7 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.defaultSession = "plasmawayland"; - programs.kdeconnect.enable + programs.kdeconnect.enable = true; # Enable flatpak support services.flatpak.enable = true; diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index 8bc214e..630aa92 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -135,7 +135,7 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.defaultSession = "plasmawayland"; - programs.kdeconnect.enable + programs.kdeconnect.enable = true; # Enable flatpak support services.flatpak.enable = true; From 7b85352d97a6a78f8c01013bd618537fc67a1d74 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 Nov 2023 23:37:39 +0100 Subject: [PATCH 0070/2308] That's not how you do that... --- nixos/EDI/configuration.nix | 2 +- nixos/GLaDOS/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index e6d4ef0..8163f90 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -135,7 +135,7 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.defaultSession = "plasmawayland"; - programs.kdeconnect.enable + programs.kdeconnect.enable = true; # Enable flatpak support services.flatpak.enable = true; diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index 8bc214e..630aa92 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -135,7 +135,7 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.defaultSession = "plasmawayland"; - programs.kdeconnect.enable + programs.kdeconnect.enable = true; # Enable flatpak support services.flatpak.enable = true; From 25537cd5d3d01452b07da53d9f8432ac3dffea88 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 Nov 2023 18:50:59 +0100 Subject: [PATCH 0071/2308] Confgure steam correctly --- home-manager/EDI-Lillian.nix | 7 +++++++ home-manager/GLaDOS-Lillian.nix | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 6b96032..61bf07e 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -101,6 +101,13 @@ ungoogled-chromium ]; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index 6b96032..dd0c713 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -101,6 +101,13 @@ ungoogled-chromium ]; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam usess + programs.vscode = { enable = true; package = pkgs.vscodium; From 4f784e56821cb1ff8d069aa7d2429c86ba698cf9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 Nov 2023 18:50:59 +0100 Subject: [PATCH 0072/2308] Confgure steam correctly --- home-manager/EDI-Lillian.nix | 7 +++++++ home-manager/GLaDOS-Lillian.nix | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 6b96032..61bf07e 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -101,6 +101,13 @@ ungoogled-chromium ]; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index 6b96032..dd0c713 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -101,6 +101,13 @@ ungoogled-chromium ]; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam usess + programs.vscode = { enable = true; package = pkgs.vscodium; From 5330691d00bb634bd11c10f81287bfd0245fa1ea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 Nov 2023 18:53:06 +0100 Subject: [PATCH 0073/2308] Put hardware config in configuration not home --- home-manager/EDI-Lillian.nix | 1 - home-manager/GLaDOS-Lillian.nix | 1 - nixos/EDI/configuration.nix | 2 ++ nixos/GLaDOS/configuration.nix | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 61bf07e..8515ffe 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -106,7 +106,6 @@ remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses programs.vscode = { enable = true; diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index dd0c713..8515ffe 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -106,7 +106,6 @@ remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam usess programs.vscode = { enable = true; diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 8163f90..cbbeaea 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -110,6 +110,8 @@ # Enable networking networking.networkmanager.enable = true; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + # Set your time zone. time.timeZone = "Europe/Amsterdam"; diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index 630aa92..39639df 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -110,6 +110,8 @@ # Enable networking networking.networkmanager.enable = true; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + # Set your time zone. time.timeZone = "Europe/Amsterdam"; From fc71d948639f1fddb5df46292e99193b833d307e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 Nov 2023 18:53:06 +0100 Subject: [PATCH 0074/2308] Put hardware config in configuration not home --- home-manager/EDI-Lillian.nix | 1 - home-manager/GLaDOS-Lillian.nix | 1 - nixos/EDI/configuration.nix | 2 ++ nixos/GLaDOS/configuration.nix | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 61bf07e..8515ffe 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -106,7 +106,6 @@ remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses programs.vscode = { enable = true; diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index dd0c713..8515ffe 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -106,7 +106,6 @@ remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam usess programs.vscode = { enable = true; diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 8163f90..cbbeaea 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -110,6 +110,8 @@ # Enable networking networking.networkmanager.enable = true; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + # Set your time zone. time.timeZone = "Europe/Amsterdam"; diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index 630aa92..39639df 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -110,6 +110,8 @@ # Enable networking networking.networkmanager.enable = true; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + # Set your time zone. time.timeZone = "Europe/Amsterdam"; From c3402f954b52466b6afae0c4b48086101c3d0122 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 Nov 2023 18:55:26 +0100 Subject: [PATCH 0075/2308] Maybe steam doesn't work with home manager? --- home-manager/EDI-Lillian.nix | 6 ------ home-manager/GLaDOS-Lillian.nix | 6 ------ nixos/EDI/configuration.nix | 6 ++++++ nixos/GLaDOS/configuration.nix | 6 ++++++ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 8515ffe..6b96032 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -101,12 +101,6 @@ ungoogled-chromium ]; - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - }; - programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index 8515ffe..6b96032 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -101,12 +101,6 @@ ungoogled-chromium ]; - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - }; - programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index cbbeaea..2c6b575 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -103,6 +103,7 @@ oh-my-zsh pciutils rsync + steam wget zsh ]; @@ -110,6 +111,11 @@ # Enable networking networking.networkmanager.enable = true; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses # Set your time zone. diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index 39639df..51a2553 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -103,6 +103,7 @@ oh-my-zsh pciutils rsync + steam wget zsh ]; @@ -110,6 +111,11 @@ # Enable networking networking.networkmanager.enable = true; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses # Set your time zone. From f30d4ebba4552fc645368b41d15f86554da97d5a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 Nov 2023 18:55:26 +0100 Subject: [PATCH 0076/2308] Maybe steam doesn't work with home manager? --- home-manager/EDI-Lillian.nix | 6 ------ home-manager/GLaDOS-Lillian.nix | 6 ------ nixos/EDI/configuration.nix | 6 ++++++ nixos/GLaDOS/configuration.nix | 6 ++++++ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 8515ffe..6b96032 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -101,12 +101,6 @@ ungoogled-chromium ]; - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - }; - programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index 8515ffe..6b96032 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -101,12 +101,6 @@ ungoogled-chromium ]; - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - }; - programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index cbbeaea..2c6b575 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -103,6 +103,7 @@ oh-my-zsh pciutils rsync + steam wget zsh ]; @@ -110,6 +111,11 @@ # Enable networking networking.networkmanager.enable = true; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses # Set your time zone. diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index 39639df..51a2553 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -103,6 +103,7 @@ oh-my-zsh pciutils rsync + steam wget zsh ]; @@ -110,6 +111,11 @@ # Enable networking networking.networkmanager.enable = true; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses # Set your time zone. From ab5bad8ebf558797556758a5605972ab0e76f516 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 13 Nov 2023 00:22:23 +0100 Subject: [PATCH 0077/2308] Update flake --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index acf2e6b..a2ed76a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1699368917, - "narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1699110214, - "narHash": "sha256-L2TU4RgtiqF69W8Gacg2jEkEYJrW+Kp0Mp4plwQh5b8=", + "lastModified": 1699756042, + "narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78f3a4ae19f0e99d5323dd2e3853916b8ee4afee", + "rev": "9502d0245983bb233da8083b55d60d96fd3c29ff", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699094435, - "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=", + "lastModified": 1699374756, + "narHash": "sha256-X21OIoVcJejN9JKoLuoZSx3ZZkMh/iSpJ+GGrSNQyGU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454", + "rev": "9b92dad3804b543a8b5db878aabf7132d601fa91", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699311858, - "narHash": "sha256-W/sQrghPAn5J9d+9kMnHqi4NPVWVpy0V/qzQeZfS/dM=", + "lastModified": 1699770333, + "narHash": "sha256-tWIifHuqPZKCuAVjewewX/LyC6LCf5dsIkyDHlXr7DM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "664187539871f63857bda2d498f452792457b998", + "rev": "2fc3c9edc3029ed396ec917f39a7253acc3d8999", "type": "github" }, "original": { From 08e335c3d25e38dabc5a18f90b0ef0ac1d6662dd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 13 Nov 2023 00:22:23 +0100 Subject: [PATCH 0078/2308] Update flake --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index acf2e6b..a2ed76a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1699368917, - "narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1699110214, - "narHash": "sha256-L2TU4RgtiqF69W8Gacg2jEkEYJrW+Kp0Mp4plwQh5b8=", + "lastModified": 1699756042, + "narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78f3a4ae19f0e99d5323dd2e3853916b8ee4afee", + "rev": "9502d0245983bb233da8083b55d60d96fd3c29ff", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699094435, - "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=", + "lastModified": 1699374756, + "narHash": "sha256-X21OIoVcJejN9JKoLuoZSx3ZZkMh/iSpJ+GGrSNQyGU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454", + "rev": "9b92dad3804b543a8b5db878aabf7132d601fa91", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699311858, - "narHash": "sha256-W/sQrghPAn5J9d+9kMnHqi4NPVWVpy0V/qzQeZfS/dM=", + "lastModified": 1699770333, + "narHash": "sha256-tWIifHuqPZKCuAVjewewX/LyC6LCf5dsIkyDHlXr7DM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "664187539871f63857bda2d498f452792457b998", + "rev": "2fc3c9edc3029ed396ec917f39a7253acc3d8999", "type": "github" }, "original": { From 862cac306e2fd5514686524a7fd1ce727dab48f5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 13 Nov 2023 21:14:59 +0100 Subject: [PATCH 0079/2308] Unified home manager overlap (except state vers) --- home-manager/EDI-Lillian.nix | 198 +----------------------------- home-manager/GLaDOS-Lillian.nix | 198 +----------------------------- home-manager/desktop-shared.nix | 205 ++++++++++++++++++++++++++++++++ 3 files changed, 207 insertions(+), 394 deletions(-) create mode 100644 home-manager/desktop-shared.nix diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 6b96032..fb6fcb7 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -18,205 +18,9 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix + ./desktop-shared.nix ]; - nixpkgs = { - # You can add overlays here - overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; - - permittedInsecurePackages = [ - "electron-22.3.27" - ]; - }; - }; - - home = { - username = "lillian"; - homeDirectory = "/home/lillian"; - }; - - # Add stuff for your user as you see fit: - # programs.neovim.enable = true; - # home.packages = with pkgs; [ steam ]; - - home.packages = with pkgs; [ - # Coding: - git - kate - - # Chat applications: - element-desktop - signal-desktop - webcord - - # Gaming: - prismlauncher - steam - - # Multimedia: - freetube - obs-studio - vlc - - # Office applications: - onlyoffice-bin - - # System tools: - rage - bitwarden - discover - flameshot - fzf - nextcloud-client - nitrokey-app - protonvpn-gui - virtualbox - watchmate - qbittorrent - zsh - - # Web browsing: - firefox - ungoogled-chromium - ]; - - programs.vscode = { - enable = true; - package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - arrterian.nix-env-selector - ban.spellright - dracula-theme.theme-dracula - eamodio.gitlens - github.vscode-pull-request-github - jnoortheen.nix-ide - kamadorueda.alejandra - ms-toolsai.jupyter - ms-pyright.pyright - #ms-python.python - ms-python.vscode-pylance - ms-vscode-remote.remote-containers - ms-vscode-remote.remote-ssh - oderwat.indent-rainbow - rust-lang.rust-analyzer - yzhang.markdown-all-in-one - ]; - }; - - programs.zsh = { - enable = true; - plugins = [ - { - name = "zsh-nix-shell"; - file = "nix-shell.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "v0.7.0"; - sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; - }; - } - ]; - enableAutosuggestions = true; - enableCompletion = true; - historySubstringSearch.enable = true; - syntaxHighlighting.enable = true; - zsh-abbr.enable = true; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "adb" - "battery" - "branch" - "coffee" - "colored-man-pages" - "colorize" - "command-not-found" - "common-aliases" - "compleat" - "composer" - "copypath" - "copybuffer" - "copyfile" - "cp" - "dirhistory" - "dirpersist" - "docker" - "docker-compose" - "extract" - "fancy-ctrl-z" - "fastfile" - "frontend-search" - "git-auto-fetch" - "git-escape-magic" - "git-extras" - "git-flow" - "github" - "gitignore" - "gnu-utils" - "gpg-agent" - "history" - "history-substring-search" - "isodate" - "jsontools" - "keychain" - "man" - "nanoc" - "pip" - "pipenv" - "pyenv" - "python" - "rsync" - "rvm" - "screen" - "sdk" - "sfdx" - "shell-proxy" - "sudo" - "systemadmin" - "systemd" - "themes" - "urltools" - "web-search" - "zsh-interactive-cd" - "zsh-navigation-tools" - ]; - theme = "jtriley"; - }; - }; - - # Enable home-manager and git - programs.home-manager.enable = true; - programs.git = { - enable = true; - userEmail = "git@gladtherescake.eu"; - userName = "Lillian-Violet"; - }; - # Nicely reload system units when changing configs - systemd.user.startServices = "sd-switch"; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.11"; } diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index 6b96032..fb6fcb7 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -18,205 +18,9 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix + ./desktop-shared.nix ]; - nixpkgs = { - # You can add overlays here - overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; - - permittedInsecurePackages = [ - "electron-22.3.27" - ]; - }; - }; - - home = { - username = "lillian"; - homeDirectory = "/home/lillian"; - }; - - # Add stuff for your user as you see fit: - # programs.neovim.enable = true; - # home.packages = with pkgs; [ steam ]; - - home.packages = with pkgs; [ - # Coding: - git - kate - - # Chat applications: - element-desktop - signal-desktop - webcord - - # Gaming: - prismlauncher - steam - - # Multimedia: - freetube - obs-studio - vlc - - # Office applications: - onlyoffice-bin - - # System tools: - rage - bitwarden - discover - flameshot - fzf - nextcloud-client - nitrokey-app - protonvpn-gui - virtualbox - watchmate - qbittorrent - zsh - - # Web browsing: - firefox - ungoogled-chromium - ]; - - programs.vscode = { - enable = true; - package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - arrterian.nix-env-selector - ban.spellright - dracula-theme.theme-dracula - eamodio.gitlens - github.vscode-pull-request-github - jnoortheen.nix-ide - kamadorueda.alejandra - ms-toolsai.jupyter - ms-pyright.pyright - #ms-python.python - ms-python.vscode-pylance - ms-vscode-remote.remote-containers - ms-vscode-remote.remote-ssh - oderwat.indent-rainbow - rust-lang.rust-analyzer - yzhang.markdown-all-in-one - ]; - }; - - programs.zsh = { - enable = true; - plugins = [ - { - name = "zsh-nix-shell"; - file = "nix-shell.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "v0.7.0"; - sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; - }; - } - ]; - enableAutosuggestions = true; - enableCompletion = true; - historySubstringSearch.enable = true; - syntaxHighlighting.enable = true; - zsh-abbr.enable = true; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "adb" - "battery" - "branch" - "coffee" - "colored-man-pages" - "colorize" - "command-not-found" - "common-aliases" - "compleat" - "composer" - "copypath" - "copybuffer" - "copyfile" - "cp" - "dirhistory" - "dirpersist" - "docker" - "docker-compose" - "extract" - "fancy-ctrl-z" - "fastfile" - "frontend-search" - "git-auto-fetch" - "git-escape-magic" - "git-extras" - "git-flow" - "github" - "gitignore" - "gnu-utils" - "gpg-agent" - "history" - "history-substring-search" - "isodate" - "jsontools" - "keychain" - "man" - "nanoc" - "pip" - "pipenv" - "pyenv" - "python" - "rsync" - "rvm" - "screen" - "sdk" - "sfdx" - "shell-proxy" - "sudo" - "systemadmin" - "systemd" - "themes" - "urltools" - "web-search" - "zsh-interactive-cd" - "zsh-navigation-tools" - ]; - theme = "jtriley"; - }; - }; - - # Enable home-manager and git - programs.home-manager.enable = true; - programs.git = { - enable = true; - userEmail = "git@gladtherescake.eu"; - userName = "Lillian-Violet"; - }; - # Nicely reload system units when changing configs - systemd.user.startServices = "sd-switch"; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.11"; } diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix new file mode 100644 index 0000000..a85b349 --- /dev/null +++ b/home-manager/desktop-shared.nix @@ -0,0 +1,205 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + + permittedInsecurePackages = [ + "electron-22.3.27" + ]; + }; + }; + + home = { + username = "lillian"; + homeDirectory = "/home/lillian"; + }; + + # Add stuff for your user as you see fit: + # programs.neovim.enable = true; + # home.packages = with pkgs; [ steam ]; + + home.packages = with pkgs; [ + # Coding: + git + kate + + # Chat applications: + element-desktop + signal-desktop + webcord + + # Gaming: + prismlauncher + steam + + # Multimedia: + freetube + obs-studio + vlc + + # Office applications: + onlyoffice-bin + + # System tools: + rage + bitwarden + discover + flameshot + fzf + nextcloud-client + nitrokey-app + protonvpn-gui + virtualbox + watchmate + qbittorrent + zsh + + # Web browsing: + firefox + ungoogled-chromium + ]; + + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + arrterian.nix-env-selector + ban.spellright + dracula-theme.theme-dracula + eamodio.gitlens + github.vscode-pull-request-github + jnoortheen.nix-ide + kamadorueda.alejandra + ms-toolsai.jupyter + ms-pyright.pyright + #ms-python.python + ms-python.vscode-pylance + ms-vscode-remote.remote-containers + ms-vscode-remote.remote-ssh + oderwat.indent-rainbow + rust-lang.rust-analyzer + yzhang.markdown-all-in-one + ]; + }; + + programs.zsh = { + enable = true; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.7.0"; + sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + }; + } + ]; + enableAutosuggestions = true; + enableCompletion = true; + historySubstringSearch.enable = true; + syntaxHighlighting.enable = true; + zsh-abbr.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "adb" + "battery" + "branch" + "coffee" + "colored-man-pages" + "colorize" + "command-not-found" + "common-aliases" + "compleat" + "composer" + "copypath" + "copybuffer" + "copyfile" + "cp" + "dirhistory" + "dirpersist" + "docker" + "docker-compose" + "extract" + "fancy-ctrl-z" + "fastfile" + "frontend-search" + "git-auto-fetch" + "git-escape-magic" + "git-extras" + "git-flow" + "github" + "gitignore" + "gnu-utils" + "gpg-agent" + "history" + "history-substring-search" + "isodate" + "jsontools" + "keychain" + "man" + "nanoc" + "pip" + "pipenv" + "pyenv" + "python" + "rsync" + "rvm" + "screen" + "sdk" + "sfdx" + "shell-proxy" + "sudo" + "systemadmin" + "systemd" + "themes" + "urltools" + "web-search" + "zsh-interactive-cd" + "zsh-navigation-tools" + ]; + theme = "jtriley"; + }; + }; + + # Enable home-manager and git + programs.home-manager.enable = true; + programs.git = { + enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; + }; + # Nicely reload system units when changing configs + systemd.user.startServices = "sd-switch"; +} From 51de245cc734446d4b98dfb0c323f0f6e34180b4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 13 Nov 2023 21:14:59 +0100 Subject: [PATCH 0080/2308] Unified home manager overlap (except state vers) --- home-manager/EDI-Lillian.nix | 198 +----------------------------- home-manager/GLaDOS-Lillian.nix | 198 +----------------------------- home-manager/desktop-shared.nix | 205 ++++++++++++++++++++++++++++++++ 3 files changed, 207 insertions(+), 394 deletions(-) create mode 100644 home-manager/desktop-shared.nix diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 6b96032..fb6fcb7 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -18,205 +18,9 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix + ./desktop-shared.nix ]; - nixpkgs = { - # You can add overlays here - overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; - - permittedInsecurePackages = [ - "electron-22.3.27" - ]; - }; - }; - - home = { - username = "lillian"; - homeDirectory = "/home/lillian"; - }; - - # Add stuff for your user as you see fit: - # programs.neovim.enable = true; - # home.packages = with pkgs; [ steam ]; - - home.packages = with pkgs; [ - # Coding: - git - kate - - # Chat applications: - element-desktop - signal-desktop - webcord - - # Gaming: - prismlauncher - steam - - # Multimedia: - freetube - obs-studio - vlc - - # Office applications: - onlyoffice-bin - - # System tools: - rage - bitwarden - discover - flameshot - fzf - nextcloud-client - nitrokey-app - protonvpn-gui - virtualbox - watchmate - qbittorrent - zsh - - # Web browsing: - firefox - ungoogled-chromium - ]; - - programs.vscode = { - enable = true; - package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - arrterian.nix-env-selector - ban.spellright - dracula-theme.theme-dracula - eamodio.gitlens - github.vscode-pull-request-github - jnoortheen.nix-ide - kamadorueda.alejandra - ms-toolsai.jupyter - ms-pyright.pyright - #ms-python.python - ms-python.vscode-pylance - ms-vscode-remote.remote-containers - ms-vscode-remote.remote-ssh - oderwat.indent-rainbow - rust-lang.rust-analyzer - yzhang.markdown-all-in-one - ]; - }; - - programs.zsh = { - enable = true; - plugins = [ - { - name = "zsh-nix-shell"; - file = "nix-shell.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "v0.7.0"; - sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; - }; - } - ]; - enableAutosuggestions = true; - enableCompletion = true; - historySubstringSearch.enable = true; - syntaxHighlighting.enable = true; - zsh-abbr.enable = true; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "adb" - "battery" - "branch" - "coffee" - "colored-man-pages" - "colorize" - "command-not-found" - "common-aliases" - "compleat" - "composer" - "copypath" - "copybuffer" - "copyfile" - "cp" - "dirhistory" - "dirpersist" - "docker" - "docker-compose" - "extract" - "fancy-ctrl-z" - "fastfile" - "frontend-search" - "git-auto-fetch" - "git-escape-magic" - "git-extras" - "git-flow" - "github" - "gitignore" - "gnu-utils" - "gpg-agent" - "history" - "history-substring-search" - "isodate" - "jsontools" - "keychain" - "man" - "nanoc" - "pip" - "pipenv" - "pyenv" - "python" - "rsync" - "rvm" - "screen" - "sdk" - "sfdx" - "shell-proxy" - "sudo" - "systemadmin" - "systemd" - "themes" - "urltools" - "web-search" - "zsh-interactive-cd" - "zsh-navigation-tools" - ]; - theme = "jtriley"; - }; - }; - - # Enable home-manager and git - programs.home-manager.enable = true; - programs.git = { - enable = true; - userEmail = "git@gladtherescake.eu"; - userName = "Lillian-Violet"; - }; - # Nicely reload system units when changing configs - systemd.user.startServices = "sd-switch"; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.11"; } diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index 6b96032..fb6fcb7 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -18,205 +18,9 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix + ./desktop-shared.nix ]; - nixpkgs = { - # You can add overlays here - overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; - - permittedInsecurePackages = [ - "electron-22.3.27" - ]; - }; - }; - - home = { - username = "lillian"; - homeDirectory = "/home/lillian"; - }; - - # Add stuff for your user as you see fit: - # programs.neovim.enable = true; - # home.packages = with pkgs; [ steam ]; - - home.packages = with pkgs; [ - # Coding: - git - kate - - # Chat applications: - element-desktop - signal-desktop - webcord - - # Gaming: - prismlauncher - steam - - # Multimedia: - freetube - obs-studio - vlc - - # Office applications: - onlyoffice-bin - - # System tools: - rage - bitwarden - discover - flameshot - fzf - nextcloud-client - nitrokey-app - protonvpn-gui - virtualbox - watchmate - qbittorrent - zsh - - # Web browsing: - firefox - ungoogled-chromium - ]; - - programs.vscode = { - enable = true; - package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - arrterian.nix-env-selector - ban.spellright - dracula-theme.theme-dracula - eamodio.gitlens - github.vscode-pull-request-github - jnoortheen.nix-ide - kamadorueda.alejandra - ms-toolsai.jupyter - ms-pyright.pyright - #ms-python.python - ms-python.vscode-pylance - ms-vscode-remote.remote-containers - ms-vscode-remote.remote-ssh - oderwat.indent-rainbow - rust-lang.rust-analyzer - yzhang.markdown-all-in-one - ]; - }; - - programs.zsh = { - enable = true; - plugins = [ - { - name = "zsh-nix-shell"; - file = "nix-shell.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "v0.7.0"; - sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; - }; - } - ]; - enableAutosuggestions = true; - enableCompletion = true; - historySubstringSearch.enable = true; - syntaxHighlighting.enable = true; - zsh-abbr.enable = true; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "adb" - "battery" - "branch" - "coffee" - "colored-man-pages" - "colorize" - "command-not-found" - "common-aliases" - "compleat" - "composer" - "copypath" - "copybuffer" - "copyfile" - "cp" - "dirhistory" - "dirpersist" - "docker" - "docker-compose" - "extract" - "fancy-ctrl-z" - "fastfile" - "frontend-search" - "git-auto-fetch" - "git-escape-magic" - "git-extras" - "git-flow" - "github" - "gitignore" - "gnu-utils" - "gpg-agent" - "history" - "history-substring-search" - "isodate" - "jsontools" - "keychain" - "man" - "nanoc" - "pip" - "pipenv" - "pyenv" - "python" - "rsync" - "rvm" - "screen" - "sdk" - "sfdx" - "shell-proxy" - "sudo" - "systemadmin" - "systemd" - "themes" - "urltools" - "web-search" - "zsh-interactive-cd" - "zsh-navigation-tools" - ]; - theme = "jtriley"; - }; - }; - - # Enable home-manager and git - programs.home-manager.enable = true; - programs.git = { - enable = true; - userEmail = "git@gladtherescake.eu"; - userName = "Lillian-Violet"; - }; - # Nicely reload system units when changing configs - systemd.user.startServices = "sd-switch"; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.11"; } diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix new file mode 100644 index 0000000..a85b349 --- /dev/null +++ b/home-manager/desktop-shared.nix @@ -0,0 +1,205 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + + permittedInsecurePackages = [ + "electron-22.3.27" + ]; + }; + }; + + home = { + username = "lillian"; + homeDirectory = "/home/lillian"; + }; + + # Add stuff for your user as you see fit: + # programs.neovim.enable = true; + # home.packages = with pkgs; [ steam ]; + + home.packages = with pkgs; [ + # Coding: + git + kate + + # Chat applications: + element-desktop + signal-desktop + webcord + + # Gaming: + prismlauncher + steam + + # Multimedia: + freetube + obs-studio + vlc + + # Office applications: + onlyoffice-bin + + # System tools: + rage + bitwarden + discover + flameshot + fzf + nextcloud-client + nitrokey-app + protonvpn-gui + virtualbox + watchmate + qbittorrent + zsh + + # Web browsing: + firefox + ungoogled-chromium + ]; + + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + arrterian.nix-env-selector + ban.spellright + dracula-theme.theme-dracula + eamodio.gitlens + github.vscode-pull-request-github + jnoortheen.nix-ide + kamadorueda.alejandra + ms-toolsai.jupyter + ms-pyright.pyright + #ms-python.python + ms-python.vscode-pylance + ms-vscode-remote.remote-containers + ms-vscode-remote.remote-ssh + oderwat.indent-rainbow + rust-lang.rust-analyzer + yzhang.markdown-all-in-one + ]; + }; + + programs.zsh = { + enable = true; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.7.0"; + sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + }; + } + ]; + enableAutosuggestions = true; + enableCompletion = true; + historySubstringSearch.enable = true; + syntaxHighlighting.enable = true; + zsh-abbr.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "adb" + "battery" + "branch" + "coffee" + "colored-man-pages" + "colorize" + "command-not-found" + "common-aliases" + "compleat" + "composer" + "copypath" + "copybuffer" + "copyfile" + "cp" + "dirhistory" + "dirpersist" + "docker" + "docker-compose" + "extract" + "fancy-ctrl-z" + "fastfile" + "frontend-search" + "git-auto-fetch" + "git-escape-magic" + "git-extras" + "git-flow" + "github" + "gitignore" + "gnu-utils" + "gpg-agent" + "history" + "history-substring-search" + "isodate" + "jsontools" + "keychain" + "man" + "nanoc" + "pip" + "pipenv" + "pyenv" + "python" + "rsync" + "rvm" + "screen" + "sdk" + "sfdx" + "shell-proxy" + "sudo" + "systemadmin" + "systemd" + "themes" + "urltools" + "web-search" + "zsh-interactive-cd" + "zsh-navigation-tools" + ]; + theme = "jtriley"; + }; + }; + + # Enable home-manager and git + programs.home-manager.enable = true; + programs.git = { + enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; + }; + # Nicely reload system units when changing configs + systemd.user.startServices = "sd-switch"; +} From 06b4b75306fade6c4e498d907c0d8560c1cd52d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 13 Nov 2023 21:26:22 +0100 Subject: [PATCH 0081/2308] Unify shared configuration (except state vers) --- nixos/EDI/configuration.nix | 162 +---------------------- nixos/GLaDOS/configuration.nix | 162 +---------------------- nixos/shared-desktop/configuration.nix | 170 +++++++++++++++++++++++++ 3 files changed, 174 insertions(+), 320 deletions(-) create mode 100644 nixos/shared-desktop/configuration.nix diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 2c6b575..7386127 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -22,6 +22,8 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix + ././shared-desktop/configuration.nix + # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix ]; @@ -34,168 +36,8 @@ }; }; - nixpkgs = { - # You can add overlays here - overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - permittedInsecurePackages = [ - "electron-22.3.27" - ]; - }; - }; - - nix = { - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: {flake = value;}) inputs; - - # This will additionally add your inputs to the system's legacy channels - # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Deduplicate and optimize nix store - auto-optimise-store = true; - }; - }; - - environment.systemPackages = with pkgs; [ - age - alejandra - git-filter-repo - home-manager - input-leap - libsForQt5.discover - libsForQt5.kdepim-addons - libsForQt5.kirigami2 - libsForQt5.kdeconnect-kde - libsForQt5.packagekit-qt - libportal-qt5 - noto-fonts - noto-fonts-emoji-blob-bin - noto-fonts-emoji - noisetorch - oh-my-zsh - pciutils - rsync - steam - wget - zsh - ]; - - # Enable networking - networking.networkmanager.enable = true; - - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses - - # Set your time zone. - time.timeZone = "Europe/Amsterdam"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; - }; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.defaultSession = "plasmawayland"; - programs.kdeconnect.enable = true; - - # Enable flatpak support - services.flatpak.enable = true; - services.packagekit.enable = true; - - # Configure keymap in X11 - services.xserver = { - layout = "us"; - xkbVariant = ""; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable bluetooth hardware - hardware.bluetooth.enable = true; - - # Enable fwupd daemon and user space client - services.fwupd.enable = true; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - programs.zsh = { - enable = true; - }; - networking.hostName = "EDI"; - boot.loader.systemd-boot.enable = true; - boot.loader.systemd-boot.configurationLimit = 3; - boot.loader.efi.canTouchEfiVariables = true; - - users.users = { - lillian = { - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; - shell = pkgs.zsh; - }; - }; - - # Enable completion of system packages by zsh - environment.pathsToLink = ["/share/zsh"]; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index 51a2553..4b087c1 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -22,6 +22,8 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix + ././shared-desktop/configuration.nix + # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix ]; @@ -34,168 +36,8 @@ }; }; - nixpkgs = { - # You can add overlays here - overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - permittedInsecurePackages = [ - "electron-22.3.27" - ]; - }; - }; - - nix = { - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: {flake = value;}) inputs; - - # This will additionally add your inputs to the system's legacy channels - # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Deduplicate and optimize nix store - auto-optimise-store = true; - }; - }; - - environment.systemPackages = with pkgs; [ - age - alejandra - git-filter-repo - home-manager - input-leap - libsForQt5.discover - libsForQt5.kdeconnect-kde - libsForQt5.kdepim-addons - libsForQt5.kirigami2 - libsForQt5.packagekit-qt - libportal-qt5 - noto-fonts - noto-fonts-emoji-blob-bin - noto-fonts-emoji - noisetorch - oh-my-zsh - pciutils - rsync - steam - wget - zsh - ]; - - # Enable networking - networking.networkmanager.enable = true; - - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses - - # Set your time zone. - time.timeZone = "Europe/Amsterdam"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; - }; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.defaultSession = "plasmawayland"; - programs.kdeconnect.enable = true; - - # Enable flatpak support - services.flatpak.enable = true; - services.packagekit.enable = true; - - # Configure keymap in X11 - services.xserver = { - layout = "us"; - xkbVariant = ""; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable bluetooth hardware - hardware.bluetooth.enable = true; - - # Enable fwupd daemon and user space client - services.fwupd.enable = true; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - programs.zsh = { - enable = true; - }; - networking.hostName = "GLaDOS"; - boot.loader.systemd-boot.enable = true; - boot.loader.systemd-boot.configurationLimit = 3; - boot.loader.efi.canTouchEfiVariables = true; - - users.users = { - lillian = { - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; - shell = pkgs.zsh; - }; - }; - - # Enable completion of system packages by zsh - environment.pathsToLink = ["/share/zsh"]; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix new file mode 100644 index 0000000..86c1ce2 --- /dev/null +++ b/nixos/shared-desktop/configuration.nix @@ -0,0 +1,170 @@ +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + permittedInsecurePackages = [ + "electron-22.3.27" + ]; + }; + }; + + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + environment.systemPackages = with pkgs; [ + age + alejandra + git-filter-repo + home-manager + input-leap + libsForQt5.discover + libsForQt5.kdepim-addons + libsForQt5.kirigami2 + libsForQt5.kdeconnect-kde + libsForQt5.packagekit-qt + libportal-qt5 + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + noisetorch + oh-my-zsh + pciutils + rsync + steam + wget + zsh + ]; + + # Enable networking + networking.networkmanager.enable = true; + + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.defaultSession = "plasmawayland"; + programs.kdeconnect.enable = true; + + # Enable flatpak support + services.flatpak.enable = true; + services.packagekit.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + # Enable fwupd daemon and user space client + services.fwupd.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + programs.zsh = { + enable = true; + }; + + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + + users.users = { + lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + shell = pkgs.zsh; + }; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; +} From 29ce9c3bde8aa5604ef32705307c9674a5979163 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 13 Nov 2023 21:26:22 +0100 Subject: [PATCH 0082/2308] Unify shared configuration (except state vers) --- nixos/EDI/configuration.nix | 162 +---------------------- nixos/GLaDOS/configuration.nix | 162 +---------------------- nixos/shared-desktop/configuration.nix | 170 +++++++++++++++++++++++++ 3 files changed, 174 insertions(+), 320 deletions(-) create mode 100644 nixos/shared-desktop/configuration.nix diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 2c6b575..7386127 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -22,6 +22,8 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix + ././shared-desktop/configuration.nix + # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix ]; @@ -34,168 +36,8 @@ }; }; - nixpkgs = { - # You can add overlays here - overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - permittedInsecurePackages = [ - "electron-22.3.27" - ]; - }; - }; - - nix = { - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: {flake = value;}) inputs; - - # This will additionally add your inputs to the system's legacy channels - # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Deduplicate and optimize nix store - auto-optimise-store = true; - }; - }; - - environment.systemPackages = with pkgs; [ - age - alejandra - git-filter-repo - home-manager - input-leap - libsForQt5.discover - libsForQt5.kdepim-addons - libsForQt5.kirigami2 - libsForQt5.kdeconnect-kde - libsForQt5.packagekit-qt - libportal-qt5 - noto-fonts - noto-fonts-emoji-blob-bin - noto-fonts-emoji - noisetorch - oh-my-zsh - pciutils - rsync - steam - wget - zsh - ]; - - # Enable networking - networking.networkmanager.enable = true; - - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses - - # Set your time zone. - time.timeZone = "Europe/Amsterdam"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; - }; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.defaultSession = "plasmawayland"; - programs.kdeconnect.enable = true; - - # Enable flatpak support - services.flatpak.enable = true; - services.packagekit.enable = true; - - # Configure keymap in X11 - services.xserver = { - layout = "us"; - xkbVariant = ""; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable bluetooth hardware - hardware.bluetooth.enable = true; - - # Enable fwupd daemon and user space client - services.fwupd.enable = true; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - programs.zsh = { - enable = true; - }; - networking.hostName = "EDI"; - boot.loader.systemd-boot.enable = true; - boot.loader.systemd-boot.configurationLimit = 3; - boot.loader.efi.canTouchEfiVariables = true; - - users.users = { - lillian = { - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; - shell = pkgs.zsh; - }; - }; - - # Enable completion of system packages by zsh - environment.pathsToLink = ["/share/zsh"]; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index 51a2553..4b087c1 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -22,6 +22,8 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix + ././shared-desktop/configuration.nix + # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix ]; @@ -34,168 +36,8 @@ }; }; - nixpkgs = { - # You can add overlays here - overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - permittedInsecurePackages = [ - "electron-22.3.27" - ]; - }; - }; - - nix = { - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: {flake = value;}) inputs; - - # This will additionally add your inputs to the system's legacy channels - # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Deduplicate and optimize nix store - auto-optimise-store = true; - }; - }; - - environment.systemPackages = with pkgs; [ - age - alejandra - git-filter-repo - home-manager - input-leap - libsForQt5.discover - libsForQt5.kdeconnect-kde - libsForQt5.kdepim-addons - libsForQt5.kirigami2 - libsForQt5.packagekit-qt - libportal-qt5 - noto-fonts - noto-fonts-emoji-blob-bin - noto-fonts-emoji - noisetorch - oh-my-zsh - pciutils - rsync - steam - wget - zsh - ]; - - # Enable networking - networking.networkmanager.enable = true; - - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses - - # Set your time zone. - time.timeZone = "Europe/Amsterdam"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; - }; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.defaultSession = "plasmawayland"; - programs.kdeconnect.enable = true; - - # Enable flatpak support - services.flatpak.enable = true; - services.packagekit.enable = true; - - # Configure keymap in X11 - services.xserver = { - layout = "us"; - xkbVariant = ""; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable bluetooth hardware - hardware.bluetooth.enable = true; - - # Enable fwupd daemon and user space client - services.fwupd.enable = true; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - programs.zsh = { - enable = true; - }; - networking.hostName = "GLaDOS"; - boot.loader.systemd-boot.enable = true; - boot.loader.systemd-boot.configurationLimit = 3; - boot.loader.efi.canTouchEfiVariables = true; - - users.users = { - lillian = { - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; - shell = pkgs.zsh; - }; - }; - - # Enable completion of system packages by zsh - environment.pathsToLink = ["/share/zsh"]; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix new file mode 100644 index 0000000..86c1ce2 --- /dev/null +++ b/nixos/shared-desktop/configuration.nix @@ -0,0 +1,170 @@ +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + permittedInsecurePackages = [ + "electron-22.3.27" + ]; + }; + }; + + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + environment.systemPackages = with pkgs; [ + age + alejandra + git-filter-repo + home-manager + input-leap + libsForQt5.discover + libsForQt5.kdepim-addons + libsForQt5.kirigami2 + libsForQt5.kdeconnect-kde + libsForQt5.packagekit-qt + libportal-qt5 + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + noisetorch + oh-my-zsh + pciutils + rsync + steam + wget + zsh + ]; + + # Enable networking + networking.networkmanager.enable = true; + + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.defaultSession = "plasmawayland"; + programs.kdeconnect.enable = true; + + # Enable flatpak support + services.flatpak.enable = true; + services.packagekit.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + # Enable fwupd daemon and user space client + services.fwupd.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + programs.zsh = { + enable = true; + }; + + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + + users.users = { + lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + shell = pkgs.zsh; + }; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; +} From a06da0e5a24e40424cb3ae674778b41ed7e1bd22 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 13 Nov 2023 21:28:22 +0100 Subject: [PATCH 0083/2308] Relative paths my beloathed --- nixos/EDI/configuration.nix | 2 +- nixos/GLaDOS/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 7386127..c291657 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - ././shared-desktop/configuration.nix + .././shared-desktop/configuration.nix # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index 4b087c1..a5614d9 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - ././shared-desktop/configuration.nix + .././shared-desktop/configuration.nix # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix From 16a270f0605bb12123654466191440290483ec87 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 13 Nov 2023 21:28:22 +0100 Subject: [PATCH 0084/2308] Relative paths my beloathed --- nixos/EDI/configuration.nix | 2 +- nixos/GLaDOS/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 7386127..c291657 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - ././shared-desktop/configuration.nix + .././shared-desktop/configuration.nix # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix index 4b087c1..a5614d9 100644 --- a/nixos/GLaDOS/configuration.nix +++ b/nixos/GLaDOS/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - ././shared-desktop/configuration.nix + .././shared-desktop/configuration.nix # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix From 100d77051b3e2646bc3b748bc1acc300d5a5972b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 14 Nov 2023 11:37:10 +0100 Subject: [PATCH 0085/2308] Add heroic to GLaDOS --- home-manager/GLaDOS-Lillian.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index fb6fcb7..e3e7cf2 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -21,6 +21,10 @@ ./desktop-shared.nix ]; + home.packages = with pkgs; [ + heroic + ]; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.11"; } From 92113f7c2eaf70925b6dff2ec016c86a0d9ba17b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 14 Nov 2023 11:37:10 +0100 Subject: [PATCH 0086/2308] Add heroic to GLaDOS --- home-manager/GLaDOS-Lillian.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index fb6fcb7..e3e7cf2 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -21,6 +21,10 @@ ./desktop-shared.nix ]; + home.packages = with pkgs; [ + heroic + ]; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.11"; } From 7c89c421ac89d79eeebe107cd207959a531bdecb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 14 Nov 2023 11:39:17 +0100 Subject: [PATCH 0087/2308] Add electron version as permitted --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index a85b349..81d2b8d 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -33,6 +33,7 @@ permittedInsecurePackages = [ "electron-22.3.27" + "electron-24.8.6" ]; }; }; From f455bca8546055bd827ce1cfcb65c0142b702b8e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 14 Nov 2023 11:39:17 +0100 Subject: [PATCH 0088/2308] Add electron version as permitted --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index a85b349..81d2b8d 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -33,6 +33,7 @@ permittedInsecurePackages = [ "electron-22.3.27" + "electron-24.8.6" ]; }; }; From 677e0be3399b3f1bb155af51bd903080e9f97879 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 14 Nov 2023 11:53:12 +0100 Subject: [PATCH 0089/2308] This version of heroic seems more up to date --- home-manager/GLaDOS-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index e3e7cf2..7d0d024 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -22,7 +22,7 @@ ]; home.packages = with pkgs; [ - heroic + heroic-unwrapped ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From a83ee12e05689c02e475b2e94d8dea73bb88c10b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 14 Nov 2023 11:53:12 +0100 Subject: [PATCH 0090/2308] This version of heroic seems more up to date --- home-manager/GLaDOS-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix index e3e7cf2..7d0d024 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/GLaDOS-Lillian.nix @@ -22,7 +22,7 @@ ]; home.packages = with pkgs; [ - heroic + heroic-unwrapped ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From d4714e6a75eb30f9898aba0b35b480d53fe7f83b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 14 Nov 2023 11:58:49 +0100 Subject: [PATCH 0091/2308] Can remove that one since heroic updated --- home-manager/desktop-shared.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 81d2b8d..a85b349 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -33,7 +33,6 @@ permittedInsecurePackages = [ "electron-22.3.27" - "electron-24.8.6" ]; }; }; From 58c13e7303582f6fdc1edbd15b19a4516586e6d3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 14 Nov 2023 11:58:49 +0100 Subject: [PATCH 0092/2308] Can remove that one since heroic updated --- home-manager/desktop-shared.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 81d2b8d..a85b349 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -33,7 +33,6 @@ permittedInsecurePackages = [ "electron-22.3.27" - "electron-24.8.6" ]; }; }; From f18c1c18c4481fef6d7dde0972ab0adc6267d5df Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 17 Nov 2023 19:25:12 +0100 Subject: [PATCH 0093/2308] Enable noisetorch --- nixos/shared-desktop/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 86c1ce2..48745fb 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -149,6 +149,10 @@ pulse.enable = true; }; + programs.noisetorch = { + enable = true; + }; + programs.zsh = { enable = true; }; From b76092b4bdd5ed27ccbbef84f704b0d88bbcf85f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 17 Nov 2023 19:25:12 +0100 Subject: [PATCH 0094/2308] Enable noisetorch --- nixos/shared-desktop/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 86c1ce2..48745fb 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -149,6 +149,10 @@ pulse.enable = true; }; + programs.noisetorch = { + enable = true; + }; + programs.zsh = { enable = true; }; From ef23a08e71de2c676831f2aaa2b1b0fab9fe158b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 17 Nov 2023 19:26:46 +0100 Subject: [PATCH 0095/2308] Update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index a2ed76a..18cb860 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1700118404, + "narHash": "sha256-XkqpZpVoy1FV7UbiLkP+fQxxv/6KnwLYkFEHgE8z2IQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "c1a033122df8a3c74fda3780c83a104a7d60873c", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1699963925, + "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "bf744fe90419885eefced41b3e5ae442d732712d", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1699963925, + "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "bf744fe90419885eefced41b3e5ae442d732712d", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699770333, - "narHash": "sha256-tWIifHuqPZKCuAVjewewX/LyC6LCf5dsIkyDHlXr7DM=", + "lastModified": 1699951338, + "narHash": "sha256-1GeczM7XfgHcYGYiYNcdwSFu3E62vmh4d7mffWZvyzE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2fc3c9edc3029ed396ec917f39a7253acc3d8999", + "rev": "0e3a94167dcd10a47b89141f35b2ff9e04b34c46", "type": "github" }, "original": { From d66cb2488ec28969ee51ac0ed90a9488c4dc0ef0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 17 Nov 2023 19:26:46 +0100 Subject: [PATCH 0096/2308] Update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index a2ed76a..18cb860 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1700118404, + "narHash": "sha256-XkqpZpVoy1FV7UbiLkP+fQxxv/6KnwLYkFEHgE8z2IQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "c1a033122df8a3c74fda3780c83a104a7d60873c", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1699963925, + "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "bf744fe90419885eefced41b3e5ae442d732712d", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1699963925, + "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "bf744fe90419885eefced41b3e5ae442d732712d", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699770333, - "narHash": "sha256-tWIifHuqPZKCuAVjewewX/LyC6LCf5dsIkyDHlXr7DM=", + "lastModified": 1699951338, + "narHash": "sha256-1GeczM7XfgHcYGYiYNcdwSFu3E62vmh4d7mffWZvyzE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2fc3c9edc3029ed396ec917f39a7253acc3d8999", + "rev": "0e3a94167dcd10a47b89141f35b2ff9e04b34c46", "type": "github" }, "original": { From fe953a0432b2a204c8c06ef0373a4a680a57363f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 18 Nov 2023 16:39:41 +0100 Subject: [PATCH 0097/2308] Am I using an insecure package still? --- nixos/shared-desktop/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 48745fb..2044233 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -30,9 +30,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - permittedInsecurePackages = [ - "electron-22.3.27" - ]; }; }; From 7997a0e7d43b8999a8737feb8a99b346ddcfb279 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 18 Nov 2023 16:39:41 +0100 Subject: [PATCH 0098/2308] Am I using an insecure package still? --- nixos/shared-desktop/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 48745fb..2044233 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -30,9 +30,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - permittedInsecurePackages = [ - "electron-22.3.27" - ]; }; }; From cbf77c4cbeb6961e6a8192a773768c1896713fef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 18 Nov 2023 16:42:45 +0100 Subject: [PATCH 0099/2308] Also from this one --- home-manager/desktop-shared.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index a85b349..7d6b34a 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -30,10 +30,6 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; - - permittedInsecurePackages = [ - "electron-22.3.27" - ]; }; }; From 67dbbe3c298024a8b964d2b973574b27a8eed42f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 18 Nov 2023 16:42:45 +0100 Subject: [PATCH 0100/2308] Also from this one --- home-manager/desktop-shared.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index a85b349..7d6b34a 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -30,10 +30,6 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; - - permittedInsecurePackages = [ - "electron-22.3.27" - ]; }; }; From 012ba5e6f460e97ae2fcb12c6eda593569987427 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 19 Nov 2023 23:12:21 +0100 Subject: [PATCH 0101/2308] a little refactoring to prepare for the vps --- flake.nix | 11 ++++ home-manager/desktop-shared.nix | 95 ++++------------------------ home-manager/program-configs/zsh.nix | 91 ++++++++++++++++++++++++++ home-manager/queen-Lillian.nix | 26 ++++++++ nixos/queen/configuration.nix | 93 +++++++++++++++++++++++++++ 5 files changed, 233 insertions(+), 83 deletions(-) create mode 100644 home-manager/program-configs/zsh.nix create mode 100644 home-manager/queen-Lillian.nix create mode 100644 nixos/queen/configuration.nix diff --git a/flake.nix b/flake.nix index 55ecf53..89d218e 100644 --- a/flake.nix +++ b/flake.nix @@ -81,5 +81,16 @@ ]; }; }; + + nixosConfigurations = { + queen = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main nixos configuration file < + ./nixos/queen/configuration.nix + sops-nix.nixosModules.sops + ]; + }; + }; }; } diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 7d6b34a..1501cda 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -6,6 +6,18 @@ pkgs, ... }: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ./program-configs/zsh.nix + ]; nixpkgs = { # You can add overlays here overlays = [ @@ -106,89 +118,6 @@ ]; }; - programs.zsh = { - enable = true; - plugins = [ - { - name = "zsh-nix-shell"; - file = "nix-shell.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "v0.7.0"; - sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; - }; - } - ]; - enableAutosuggestions = true; - enableCompletion = true; - historySubstringSearch.enable = true; - syntaxHighlighting.enable = true; - zsh-abbr.enable = true; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "adb" - "battery" - "branch" - "coffee" - "colored-man-pages" - "colorize" - "command-not-found" - "common-aliases" - "compleat" - "composer" - "copypath" - "copybuffer" - "copyfile" - "cp" - "dirhistory" - "dirpersist" - "docker" - "docker-compose" - "extract" - "fancy-ctrl-z" - "fastfile" - "frontend-search" - "git-auto-fetch" - "git-escape-magic" - "git-extras" - "git-flow" - "github" - "gitignore" - "gnu-utils" - "gpg-agent" - "history" - "history-substring-search" - "isodate" - "jsontools" - "keychain" - "man" - "nanoc" - "pip" - "pipenv" - "pyenv" - "python" - "rsync" - "rvm" - "screen" - "sdk" - "sfdx" - "shell-proxy" - "sudo" - "systemadmin" - "systemd" - "themes" - "urltools" - "web-search" - "zsh-interactive-cd" - "zsh-navigation-tools" - ]; - theme = "jtriley"; - }; - }; - # Enable home-manager and git programs.home-manager.enable = true; programs.git = { diff --git a/home-manager/program-configs/zsh.nix b/home-manager/program-configs/zsh.nix new file mode 100644 index 0000000..e61cb4b --- /dev/null +++ b/home-manager/program-configs/zsh.nix @@ -0,0 +1,91 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + programs.zsh = { + enable = true; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.7.0"; + sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + }; + } + ]; + enableAutosuggestions = true; + enableCompletion = true; + historySubstringSearch.enable = true; + syntaxHighlighting.enable = true; + zsh-abbr.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "adb" + "battery" + "branch" + "coffee" + "colored-man-pages" + "colorize" + "command-not-found" + "common-aliases" + "compleat" + "composer" + "copypath" + "copybuffer" + "copyfile" + "cp" + "dirhistory" + "dirpersist" + "docker" + "docker-compose" + "extract" + "fancy-ctrl-z" + "fastfile" + "frontend-search" + "git-auto-fetch" + "git-escape-magic" + "git-extras" + "git-flow" + "github" + "gitignore" + "gnu-utils" + "gpg-agent" + "history" + "history-substring-search" + "isodate" + "jsontools" + "keychain" + "man" + "nanoc" + "pip" + "pipenv" + "pyenv" + "python" + "rsync" + "rvm" + "screen" + "sdk" + "sfdx" + "shell-proxy" + "sudo" + "systemadmin" + "systemd" + "themes" + "urltools" + "web-search" + "zsh-interactive-cd" + "zsh-navigation-tools" + ]; + theme = "jtriley"; + }; + }; +} diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix new file mode 100644 index 0000000..7684183 --- /dev/null +++ b/home-manager/queen-Lillian.nix @@ -0,0 +1,26 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ./program-configs/zsh.nix + ]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "23.11"; +} diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix new file mode 100644 index 0000000..c4675df --- /dev/null +++ b/nixos/queen/configuration.nix @@ -0,0 +1,93 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + environment.systemPackages = with pkgs; [ + age + alejandra + git-filter-repo + home-manager + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + oh-my-zsh + rsync + wget + zsh + ]; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + programs.zsh = { + enable = true; + }; + + users.users = { + lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + shell = pkgs.zsh; + }; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../home-manager/queen-Lillian.nix; + }; + }; + + networking.hostName = "queen"; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "unstable"; +} From fa6f35f4e66d75691cb83a8a74831a9bc7baa794 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 19 Nov 2023 23:12:21 +0100 Subject: [PATCH 0102/2308] a little refactoring to prepare for the vps --- flake.nix | 11 ++++ home-manager/desktop-shared.nix | 95 ++++------------------------ home-manager/program-configs/zsh.nix | 91 ++++++++++++++++++++++++++ home-manager/queen-Lillian.nix | 26 ++++++++ nixos/queen/configuration.nix | 93 +++++++++++++++++++++++++++ 5 files changed, 233 insertions(+), 83 deletions(-) create mode 100644 home-manager/program-configs/zsh.nix create mode 100644 home-manager/queen-Lillian.nix create mode 100644 nixos/queen/configuration.nix diff --git a/flake.nix b/flake.nix index 55ecf53..89d218e 100644 --- a/flake.nix +++ b/flake.nix @@ -81,5 +81,16 @@ ]; }; }; + + nixosConfigurations = { + queen = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main nixos configuration file < + ./nixos/queen/configuration.nix + sops-nix.nixosModules.sops + ]; + }; + }; }; } diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 7d6b34a..1501cda 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -6,6 +6,18 @@ pkgs, ... }: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ./program-configs/zsh.nix + ]; nixpkgs = { # You can add overlays here overlays = [ @@ -106,89 +118,6 @@ ]; }; - programs.zsh = { - enable = true; - plugins = [ - { - name = "zsh-nix-shell"; - file = "nix-shell.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "v0.7.0"; - sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; - }; - } - ]; - enableAutosuggestions = true; - enableCompletion = true; - historySubstringSearch.enable = true; - syntaxHighlighting.enable = true; - zsh-abbr.enable = true; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "adb" - "battery" - "branch" - "coffee" - "colored-man-pages" - "colorize" - "command-not-found" - "common-aliases" - "compleat" - "composer" - "copypath" - "copybuffer" - "copyfile" - "cp" - "dirhistory" - "dirpersist" - "docker" - "docker-compose" - "extract" - "fancy-ctrl-z" - "fastfile" - "frontend-search" - "git-auto-fetch" - "git-escape-magic" - "git-extras" - "git-flow" - "github" - "gitignore" - "gnu-utils" - "gpg-agent" - "history" - "history-substring-search" - "isodate" - "jsontools" - "keychain" - "man" - "nanoc" - "pip" - "pipenv" - "pyenv" - "python" - "rsync" - "rvm" - "screen" - "sdk" - "sfdx" - "shell-proxy" - "sudo" - "systemadmin" - "systemd" - "themes" - "urltools" - "web-search" - "zsh-interactive-cd" - "zsh-navigation-tools" - ]; - theme = "jtriley"; - }; - }; - # Enable home-manager and git programs.home-manager.enable = true; programs.git = { diff --git a/home-manager/program-configs/zsh.nix b/home-manager/program-configs/zsh.nix new file mode 100644 index 0000000..e61cb4b --- /dev/null +++ b/home-manager/program-configs/zsh.nix @@ -0,0 +1,91 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + programs.zsh = { + enable = true; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.7.0"; + sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + }; + } + ]; + enableAutosuggestions = true; + enableCompletion = true; + historySubstringSearch.enable = true; + syntaxHighlighting.enable = true; + zsh-abbr.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "adb" + "battery" + "branch" + "coffee" + "colored-man-pages" + "colorize" + "command-not-found" + "common-aliases" + "compleat" + "composer" + "copypath" + "copybuffer" + "copyfile" + "cp" + "dirhistory" + "dirpersist" + "docker" + "docker-compose" + "extract" + "fancy-ctrl-z" + "fastfile" + "frontend-search" + "git-auto-fetch" + "git-escape-magic" + "git-extras" + "git-flow" + "github" + "gitignore" + "gnu-utils" + "gpg-agent" + "history" + "history-substring-search" + "isodate" + "jsontools" + "keychain" + "man" + "nanoc" + "pip" + "pipenv" + "pyenv" + "python" + "rsync" + "rvm" + "screen" + "sdk" + "sfdx" + "shell-proxy" + "sudo" + "systemadmin" + "systemd" + "themes" + "urltools" + "web-search" + "zsh-interactive-cd" + "zsh-navigation-tools" + ]; + theme = "jtriley"; + }; + }; +} diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix new file mode 100644 index 0000000..7684183 --- /dev/null +++ b/home-manager/queen-Lillian.nix @@ -0,0 +1,26 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ./program-configs/zsh.nix + ]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "23.11"; +} diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix new file mode 100644 index 0000000..c4675df --- /dev/null +++ b/nixos/queen/configuration.nix @@ -0,0 +1,93 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + environment.systemPackages = with pkgs; [ + age + alejandra + git-filter-repo + home-manager + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + oh-my-zsh + rsync + wget + zsh + ]; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + programs.zsh = { + enable = true; + }; + + users.users = { + lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + shell = pkgs.zsh; + }; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../home-manager/queen-Lillian.nix; + }; + }; + + networking.hostName = "queen"; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "unstable"; +} From dc741a02fddeacc38c932646a9b7024d4ac2100e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 19 Nov 2023 23:13:22 +0100 Subject: [PATCH 0103/2308] Might as well flake update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 18cb860..85c6871 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700118404, - "narHash": "sha256-XkqpZpVoy1FV7UbiLkP+fQxxv/6KnwLYkFEHgE8z2IQ=", + "lastModified": 1700419052, + "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1a033122df8a3c74fda3780c83a104a7d60873c", + "rev": "993fb02d20760067b8ee19c713d94cee07037759", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699963925, - "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bf744fe90419885eefced41b3e5ae442d732712d", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1699756042, - "narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=", + "lastModified": 1700342017, + "narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9502d0245983bb233da8083b55d60d96fd3c29ff", + "rev": "decdf666c833a325cb4417041a90681499e06a41", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1699963925, - "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bf744fe90419885eefced41b3e5ae442d732712d", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699374756, - "narHash": "sha256-X21OIoVcJejN9JKoLuoZSx3ZZkMh/iSpJ+GGrSNQyGU=", + "lastModified": 1700108881, + "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b92dad3804b543a8b5db878aabf7132d601fa91", + "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699951338, - "narHash": "sha256-1GeczM7XfgHcYGYiYNcdwSFu3E62vmh4d7mffWZvyzE=", + "lastModified": 1700362823, + "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0e3a94167dcd10a47b89141f35b2ff9e04b34c46", + "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", "type": "github" }, "original": { From 4d290fc6c66cb040b24b93a3bd098f0c76b5fb83 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 19 Nov 2023 23:13:22 +0100 Subject: [PATCH 0104/2308] Might as well flake update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 18cb860..85c6871 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700118404, - "narHash": "sha256-XkqpZpVoy1FV7UbiLkP+fQxxv/6KnwLYkFEHgE8z2IQ=", + "lastModified": 1700419052, + "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1a033122df8a3c74fda3780c83a104a7d60873c", + "rev": "993fb02d20760067b8ee19c713d94cee07037759", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699963925, - "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bf744fe90419885eefced41b3e5ae442d732712d", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1699756042, - "narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=", + "lastModified": 1700342017, + "narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9502d0245983bb233da8083b55d60d96fd3c29ff", + "rev": "decdf666c833a325cb4417041a90681499e06a41", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1699963925, - "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bf744fe90419885eefced41b3e5ae442d732712d", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699374756, - "narHash": "sha256-X21OIoVcJejN9JKoLuoZSx3ZZkMh/iSpJ+GGrSNQyGU=", + "lastModified": 1700108881, + "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b92dad3804b543a8b5db878aabf7132d601fa91", + "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699951338, - "narHash": "sha256-1GeczM7XfgHcYGYiYNcdwSFu3E62vmh4d7mffWZvyzE=", + "lastModified": 1700362823, + "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0e3a94167dcd10a47b89141f35b2ff9e04b34c46", + "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", "type": "github" }, "original": { From 0694fad67bb1b743956af52633ff0f787cca3523 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 19 Nov 2023 23:20:16 +0100 Subject: [PATCH 0105/2308] Initial setup for vps, no tests done --- nixos/queen/configuration.nix | 8 ++++ nixos/queen/nextcloud.nix | 83 +++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 nixos/queen/nextcloud.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c4675df..5a3b344 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -45,6 +45,8 @@ # Enable networking networking.networkmanager.enable = true; + networking.firewall.allowedTCPPorts = [80 443]; + # Set your time zone. time.timeZone = "Europe/Amsterdam"; @@ -67,6 +69,12 @@ enable = true; }; + security.acme = { + acceptTerms = true; + # Replace the email here! + email = "letsencrypt@gladtherescake.eu"; + }; + users.users = { lillian = { isNormalUser = true; diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix new file mode 100644 index 0000000..e65cd84 --- /dev/null +++ b/nixos/queen/nextcloud.nix @@ -0,0 +1,83 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + #this came from https://jacobneplokh.com/how-to-setup-nextcloud-on-nixos/ + services.nginx = { + enable = true; + + # Use recommended settings + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + + # Only allow PFS-enabled ciphers with AES256 + sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL"; + + # Setup Nextcloud virtual host to listen on ports + virtualHosts = { + "nextcloud.gladtherescake.eu" = { + ## Force HTTP redirect to HTTPS + forceSSL = true; + ## LetsEncrypt + enableACME = true; + }; + }; + }; + + services.nextcloud = { + enable = true; + hostName = "nextcloud.gladtherescake.eu"; + # Enable built-in virtual host management + # Takes care of somewhat complicated setup + # See here: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/web-apps/nextcloud.nix#L529 + nginx.enable = true; + + # Use HTTPS for links + https = true; + + # Auto-update Nextcloud Apps + autoUpdateApps.enable = true; + # Set what time makes sense for you + autoUpdateApps.startAt = "05:00:00"; + + config = { + # Further forces Nextcloud to use HTTPS + overwriteProtocol = "https"; + + # Nextcloud PostegreSQL database configuration, recommended over using SQLite + dbtype = "pgsql"; + dbuser = "nextcloud"; + dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself + dbname = "nextcloud"; + dbpassFile = "/var/nextcloud-db-pass"; + + #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration + adminpassFile = "/var/nextcloud-admin-pass"; + adminuser = "admin"; + }; + }; + + services.postgresql = { + enable = true; + + # Ensure the database, user, and permissions always exist + ensureDatabases = ["nextcloud"]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + ]; + }; + + systemd.services."nextcloud-setup" = { + requires = ["postgresql.service"]; + after = ["postgresql.service"]; + }; +} From 11fefc6296bad723971d55801afe08327c5ce0a3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 19 Nov 2023 23:20:16 +0100 Subject: [PATCH 0106/2308] Initial setup for vps, no tests done --- nixos/queen/configuration.nix | 8 ++++ nixos/queen/nextcloud.nix | 83 +++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 nixos/queen/nextcloud.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c4675df..5a3b344 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -45,6 +45,8 @@ # Enable networking networking.networkmanager.enable = true; + networking.firewall.allowedTCPPorts = [80 443]; + # Set your time zone. time.timeZone = "Europe/Amsterdam"; @@ -67,6 +69,12 @@ enable = true; }; + security.acme = { + acceptTerms = true; + # Replace the email here! + email = "letsencrypt@gladtherescake.eu"; + }; + users.users = { lillian = { isNormalUser = true; diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix new file mode 100644 index 0000000..e65cd84 --- /dev/null +++ b/nixos/queen/nextcloud.nix @@ -0,0 +1,83 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + #this came from https://jacobneplokh.com/how-to-setup-nextcloud-on-nixos/ + services.nginx = { + enable = true; + + # Use recommended settings + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + + # Only allow PFS-enabled ciphers with AES256 + sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL"; + + # Setup Nextcloud virtual host to listen on ports + virtualHosts = { + "nextcloud.gladtherescake.eu" = { + ## Force HTTP redirect to HTTPS + forceSSL = true; + ## LetsEncrypt + enableACME = true; + }; + }; + }; + + services.nextcloud = { + enable = true; + hostName = "nextcloud.gladtherescake.eu"; + # Enable built-in virtual host management + # Takes care of somewhat complicated setup + # See here: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/web-apps/nextcloud.nix#L529 + nginx.enable = true; + + # Use HTTPS for links + https = true; + + # Auto-update Nextcloud Apps + autoUpdateApps.enable = true; + # Set what time makes sense for you + autoUpdateApps.startAt = "05:00:00"; + + config = { + # Further forces Nextcloud to use HTTPS + overwriteProtocol = "https"; + + # Nextcloud PostegreSQL database configuration, recommended over using SQLite + dbtype = "pgsql"; + dbuser = "nextcloud"; + dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself + dbname = "nextcloud"; + dbpassFile = "/var/nextcloud-db-pass"; + + #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration + adminpassFile = "/var/nextcloud-admin-pass"; + adminuser = "admin"; + }; + }; + + services.postgresql = { + enable = true; + + # Ensure the database, user, and permissions always exist + ensureDatabases = ["nextcloud"]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + ]; + }; + + systemd.services."nextcloud-setup" = { + requires = ["postgresql.service"]; + after = ["postgresql.service"]; + }; +} From 9f7b3047f0eeea3179a8e85becb5962432c92636 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 11:51:01 +0100 Subject: [PATCH 0107/2308] Dry run target to see if it works --- nixos/queen/configuration.nix | 14 ++++++++ nixos/queen/hardware-configuration.nix | 44 ++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 nixos/queen/hardware-configuration.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 5a3b344..7c7c142 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -6,6 +6,17 @@ pkgs, ... }: { + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ./nextcloud.nix + ]; nix = { gc = { automatic = true; @@ -33,10 +44,13 @@ alejandra git-filter-repo home-manager + nextcloud + nginx noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh + postgesql rsync wget zsh diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix new file mode 100644 index 0000000..a91384e --- /dev/null +++ b/nixos/queen/hardware-configuration.nix @@ -0,0 +1,44 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/BA43-C24E"; + fsType = "vfat"; + }; + + swapDevices = [ + {device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd";} + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From 3189cebee7f8e1f13dec22070e8572d92afd1397 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 11:51:01 +0100 Subject: [PATCH 0108/2308] Dry run target to see if it works --- nixos/queen/configuration.nix | 14 ++++++++ nixos/queen/hardware-configuration.nix | 44 ++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 nixos/queen/hardware-configuration.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 5a3b344..7c7c142 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -6,6 +6,17 @@ pkgs, ... }: { + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ./nextcloud.nix + ]; nix = { gc = { automatic = true; @@ -33,10 +44,13 @@ alejandra git-filter-repo home-manager + nextcloud + nginx noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh + postgesql rsync wget zsh diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix new file mode 100644 index 0000000..a91384e --- /dev/null +++ b/nixos/queen/hardware-configuration.nix @@ -0,0 +1,44 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/BA43-C24E"; + fsType = "vfat"; + }; + + swapDevices = [ + {device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd";} + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From 16e953ff458105deb233cc7a806c2eef48e56b68 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 11:52:32 +0100 Subject: [PATCH 0109/2308] Add import of hardware config --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 7c7c142..41458c1 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -15,6 +15,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix + ./hardware-configuration.nix ./nextcloud.nix ]; nix = { From 5120fd1a539d06a41011ed76b21b7dd1f6dfb0b4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 11:52:32 +0100 Subject: [PATCH 0110/2308] Add import of hardware config --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 7c7c142..41458c1 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -15,6 +15,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix + ./hardware-configuration.nix ./nextcloud.nix ]; nix = { From d7d1e00f40924cc12e2630d6681f0e23a2365dfe Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 11:53:42 +0100 Subject: [PATCH 0111/2308] Add home manager module --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 41458c1..17e506a 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -9,7 +9,7 @@ imports = [ # If you want to use modules your own flake exports (from modules/home-manager): # outputs.homeManagerModules.example - + inputs.home-manager.nixosModules.home-manager # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default From becf7414687d118fa1c9c10bbe3792bbfdfb9427 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 11:53:42 +0100 Subject: [PATCH 0112/2308] Add home manager module --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 41458c1..17e506a 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -9,7 +9,7 @@ imports = [ # If you want to use modules your own flake exports (from modules/home-manager): # outputs.homeManagerModules.example - + inputs.home-manager.nixosModules.home-manager # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default From 98782b9c00c2a41a9d0b8db87d93b07da3863556 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 11:55:27 +0100 Subject: [PATCH 0113/2308] Different version --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 7684183..708c277 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -22,5 +22,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 17e506a..c7ac220 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -112,5 +112,5 @@ networking.hostName = "queen"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From 4620a7e06bf7aa2258d5611f8f6bc15bf9354bfe Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 11:55:27 +0100 Subject: [PATCH 0114/2308] Different version --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 7684183..708c277 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -22,5 +22,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 17e506a..c7ac220 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -112,5 +112,5 @@ networking.hostName = "queen"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From 13243fc43a42a0ee6fe97b32eea478d127e35db8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 11:56:24 +0100 Subject: [PATCH 0115/2308] It said to remove this --- nixos/queen/nextcloud.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index e65cd84..3fce172 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -33,10 +33,6 @@ services.nextcloud = { enable = true; hostName = "nextcloud.gladtherescake.eu"; - # Enable built-in virtual host management - # Takes care of somewhat complicated setup - # See here: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/web-apps/nextcloud.nix#L529 - nginx.enable = true; # Use HTTPS for links https = true; From 114fddeed89d785b836b22eb0ed840ca9f3434d5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 11:56:24 +0100 Subject: [PATCH 0116/2308] It said to remove this --- nixos/queen/nextcloud.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index e65cd84..3fce172 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -33,10 +33,6 @@ services.nextcloud = { enable = true; hostName = "nextcloud.gladtherescake.eu"; - # Enable built-in virtual host management - # Takes care of somewhat complicated setup - # See here: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/web-apps/nextcloud.nix#L529 - nginx.enable = true; # Use HTTPS for links https = true; From 57c530a3c2ed50c307116f702dc598d71c7cab4a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 12:01:14 +0100 Subject: [PATCH 0117/2308] Small fixes to allow unfree --- home-manager/queen-Lillian.nix | 27 ++++++++++++++++++++++ nixos/queen/configuration.nix | 31 ++++++++++++++++++++++++++ nixos/queen/hardware-configuration.nix | 1 + 3 files changed, 59 insertions(+) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 708c277..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -21,6 +21,33 @@ ./program-configs/zsh.nix ]; + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + }; + }; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c7ac220..37e0283 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -18,6 +18,32 @@ ./hardware-configuration.nix ./nextcloud.nix ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + nix = { gc = { automatic = true; @@ -111,6 +137,11 @@ networking.hostName = "queen"; + #TODO: see if this bootloader works on the vps and if not replace it! + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "23.05"; } diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix index a91384e..4097208 100644 --- a/nixos/queen/hardware-configuration.nix +++ b/nixos/queen/hardware-configuration.nix @@ -1,6 +1,7 @@ # 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. +#TODO: REPLACE THIS, THIS IS PLACEHOLDER COPY FROM GLaDOS!!! { config, lib, From 596e43fcb81ab4504b7e2e1ec430e8484260a437 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 12:01:14 +0100 Subject: [PATCH 0118/2308] Small fixes to allow unfree --- home-manager/queen-Lillian.nix | 27 ++++++++++++++++++++++ nixos/queen/configuration.nix | 31 ++++++++++++++++++++++++++ nixos/queen/hardware-configuration.nix | 1 + 3 files changed, 59 insertions(+) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 708c277..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -21,6 +21,33 @@ ./program-configs/zsh.nix ]; + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + }; + }; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c7ac220..37e0283 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -18,6 +18,32 @@ ./hardware-configuration.nix ./nextcloud.nix ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + nix = { gc = { automatic = true; @@ -111,6 +137,11 @@ networking.hostName = "queen"; + #TODO: see if this bootloader works on the vps and if not replace it! + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "23.05"; } diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix index a91384e..4097208 100644 --- a/nixos/queen/hardware-configuration.nix +++ b/nixos/queen/hardware-configuration.nix @@ -1,6 +1,7 @@ # 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. +#TODO: REPLACE THIS, THIS IS PLACEHOLDER COPY FROM GLaDOS!!! { config, lib, From d8546da581c88bbdd2e964d9c16ab8681b7772dd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 12:02:38 +0100 Subject: [PATCH 0119/2308] Version for nextcloud --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 37e0283..4dec1b7 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -71,7 +71,7 @@ alejandra git-filter-repo home-manager - nextcloud + nextcloud27 nginx noto-fonts noto-fonts-emoji-blob-bin From 7fcebf1a6fc7dd2380b4f8e8ae2b3a92de4e9e6f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 12:02:38 +0100 Subject: [PATCH 0120/2308] Version for nextcloud --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 37e0283..4dec1b7 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -71,7 +71,7 @@ alejandra git-filter-repo home-manager - nextcloud + nextcloud27 nginx noto-fonts noto-fonts-emoji-blob-bin From 32655b4b9a8ab0be5780545a6947c6927f248086 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 12:03:07 +0100 Subject: [PATCH 0121/2308] Idem postgres --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 4dec1b7..efeb3cd 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -77,7 +77,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - postgesql + postgresql_16 rsync wget zsh From 8102d8143584f39b3c631f0613ebcd955931fbb8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 12:03:07 +0100 Subject: [PATCH 0122/2308] Idem postgres --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 4dec1b7..efeb3cd 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -77,7 +77,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - postgesql + postgresql_16 rsync wget zsh From 0896f3fb0166a554c3371289bc53482e7ec7808c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 12:03:55 +0100 Subject: [PATCH 0123/2308] Remove the template for hardware, it compiles --- nixos/queen/hardware-configuration.nix | 45 -------------------------- 1 file changed, 45 deletions(-) delete mode 100644 nixos/queen/hardware-configuration.nix diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix deleted file mode 100644 index 4097208..0000000 --- a/nixos/queen/hardware-configuration.nix +++ /dev/null @@ -1,45 +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. -#TODO: REPLACE THIS, THIS IS PLACEHOLDER COPY FROM GLaDOS!!! -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/BA43-C24E"; - fsType = "vfat"; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd";} - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} From 0ef0a4b67bb334ed347335f98f375d1ab386bfa8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 12:03:55 +0100 Subject: [PATCH 0124/2308] Remove the template for hardware, it compiles --- nixos/queen/hardware-configuration.nix | 45 -------------------------- 1 file changed, 45 deletions(-) delete mode 100644 nixos/queen/hardware-configuration.nix diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix deleted file mode 100644 index 4097208..0000000 --- a/nixos/queen/hardware-configuration.nix +++ /dev/null @@ -1,45 +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. -#TODO: REPLACE THIS, THIS IS PLACEHOLDER COPY FROM GLaDOS!!! -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/BA43-C24E"; - fsType = "vfat"; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd";} - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} From e0ea1c9f06721e3357a57d2a40c4e1bbaf9057eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 15:36:39 +0100 Subject: [PATCH 0125/2308] A sops test in practice, not tested yet --- nixos/queen/configuration.nix | 1 + nixos/queen/nextcloud.nix | 6 ++++-- secrets/queen-Lillian.yaml | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 secrets/queen-Lillian.yaml diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index efeb3cd..50c54f6 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -122,6 +122,7 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; + nextcloud.extraGroups = [config.sops.secrets.queen-Lillian."nextcloudadmin" config.sops.secrets.queen-Lillian."nextclouddb"]; }; # Enable completion of system packages by zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 3fce172..d1fcf28 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -42,6 +42,8 @@ # Set what time makes sense for you autoUpdateApps.startAt = "05:00:00"; + configureRedis = true; + config = { # Further forces Nextcloud to use HTTPS overwriteProtocol = "https"; @@ -51,10 +53,10 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = "/var/nextcloud-db-pass"; + dbpassFile = config.sops.secrets.queen-Lillian."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration - adminpassFile = "/var/nextcloud-admin-pass"; + adminpassFile = config.sops.secrets.queen-Lillian."nextcloudadmin".path; adminuser = "admin"; }; }; diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml new file mode 100644 index 0000000..37aa2c1 --- /dev/null +++ b/secrets/queen-Lillian.yaml @@ -0,0 +1,22 @@ +nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] +nextclouddb: ENC[AES256_GCM,data:Jl2Lz2n64tQYVmj0t/ZIfae3KNk=,iv:e/ne3VfIMhCX1ohgGyhFK2tHGwuXJGFhxtNIR0ZHe3I=,tag:Vr1Nn2279t91LvD1XVbJKg==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUMmlWMEsrVHhYT2ZuN05a + alAzNWlPMDVJeVdGMTQzQXNlTmw0V3E3UHljCmQ3WnNuY0liOGtqdmNiRmQyV1RN + d0ZKQVUyeWFjOXpXWVVSSFlPVXhjUmcKLS0tIFA0RkltN01XVXZnR3p4SWxkVnAr + KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz + NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-11-20T14:35:52Z" + mac: ENC[AES256_GCM,data:IZg0gpsnLu4/dSjeiV3nf2ZW+ifq3FvshLeYE/fNOpNWTdCRm8OhCJNxY0kTuTBae7vCQXcjUQHCuAd+1eZPQD4juBOUd7CVOE5Chn4/o01HyEncjBjwha7uxLazqe15Q3gIFxC+8vqnAbV1BVTh1gIpkSaM61nE8Thr5sE8kvg=,iv:Dg8tUPT2V+IQK7/7DhrZHcnWoxC1APwQcM9owTzU+PU=,tag:qbypt7U5r0O3RRuNdOswIQ==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 From 470d865cdeab147379d6be4aebf6f0a914f1495c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 15:36:39 +0100 Subject: [PATCH 0126/2308] A sops test in practice, not tested yet --- nixos/queen/configuration.nix | 1 + nixos/queen/nextcloud.nix | 6 ++++-- secrets/queen-Lillian.yaml | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 secrets/queen-Lillian.yaml diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index efeb3cd..50c54f6 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -122,6 +122,7 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; + nextcloud.extraGroups = [config.sops.secrets.queen-Lillian."nextcloudadmin" config.sops.secrets.queen-Lillian."nextclouddb"]; }; # Enable completion of system packages by zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 3fce172..d1fcf28 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -42,6 +42,8 @@ # Set what time makes sense for you autoUpdateApps.startAt = "05:00:00"; + configureRedis = true; + config = { # Further forces Nextcloud to use HTTPS overwriteProtocol = "https"; @@ -51,10 +53,10 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = "/var/nextcloud-db-pass"; + dbpassFile = config.sops.secrets.queen-Lillian."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration - adminpassFile = "/var/nextcloud-admin-pass"; + adminpassFile = config.sops.secrets.queen-Lillian."nextcloudadmin".path; adminuser = "admin"; }; }; diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml new file mode 100644 index 0000000..37aa2c1 --- /dev/null +++ b/secrets/queen-Lillian.yaml @@ -0,0 +1,22 @@ +nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] +nextclouddb: ENC[AES256_GCM,data:Jl2Lz2n64tQYVmj0t/ZIfae3KNk=,iv:e/ne3VfIMhCX1ohgGyhFK2tHGwuXJGFhxtNIR0ZHe3I=,tag:Vr1Nn2279t91LvD1XVbJKg==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUMmlWMEsrVHhYT2ZuN05a + alAzNWlPMDVJeVdGMTQzQXNlTmw0V3E3UHljCmQ3WnNuY0liOGtqdmNiRmQyV1RN + d0ZKQVUyeWFjOXpXWVVSSFlPVXhjUmcKLS0tIFA0RkltN01XVXZnR3p4SWxkVnAr + KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz + NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-11-20T14:35:52Z" + mac: ENC[AES256_GCM,data:IZg0gpsnLu4/dSjeiV3nf2ZW+ifq3FvshLeYE/fNOpNWTdCRm8OhCJNxY0kTuTBae7vCQXcjUQHCuAd+1eZPQD4juBOUd7CVOE5Chn4/o01HyEncjBjwha7uxLazqe15Q3gIFxC+8vqnAbV1BVTh1gIpkSaM61nE8Thr5sE8kvg=,iv:Dg8tUPT2V+IQK7/7DhrZHcnWoxC1APwQcM9owTzU+PU=,tag:qbypt7U5r0O3RRuNdOswIQ==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 From 741c58926271a16d302f6c0efb2c8cb79ae70669 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:14:05 +0100 Subject: [PATCH 0127/2308] Test hw conf --- nixos/queen/hardware-configuration.nix | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 nixos/queen/hardware-configuration.nix diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix new file mode 100644 index 0000000..3b523fc --- /dev/null +++ b/nixos/queen/hardware-configuration.nix @@ -0,0 +1,40 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/BA43-C24E"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From c54191d41516793f759b910580ec4fc0605e1c04 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:14:05 +0100 Subject: [PATCH 0128/2308] Test hw conf --- nixos/queen/hardware-configuration.nix | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 nixos/queen/hardware-configuration.nix diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix new file mode 100644 index 0000000..3b523fc --- /dev/null +++ b/nixos/queen/hardware-configuration.nix @@ -0,0 +1,40 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/BA43-C24E"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From fe5ac7f7af6d53635fdae46c66e582935eb42466 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:15:05 +0100 Subject: [PATCH 0129/2308] attribute "queen-Lillian" is missing --- nixos/queen/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index d1fcf28..075ed6a 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,10 +53,10 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = config.sops.secrets.queen-Lillian."nextclouddb".path; + dbpassFile = config.sops.secrets."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration - adminpassFile = config.sops.secrets.queen-Lillian."nextcloudadmin".path; + adminpassFile = config.sops.secrets.queen."nextcloudadmin".path; adminuser = "admin"; }; }; From b3d991e345ee1794e5c338d69f3aca1d0bc396c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:15:05 +0100 Subject: [PATCH 0130/2308] attribute "queen-Lillian" is missing --- nixos/queen/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index d1fcf28..075ed6a 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,10 +53,10 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = config.sops.secrets.queen-Lillian."nextclouddb".path; + dbpassFile = config.sops.secrets."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration - adminpassFile = config.sops.secrets.queen-Lillian."nextcloudadmin".path; + adminpassFile = config.sops.secrets.queen."nextcloudadmin".path; adminuser = "admin"; }; }; From 49828264155ac10adc4fa4c9cabf0da931f322cd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:17:34 +0100 Subject: [PATCH 0131/2308] Maybe this? --- nixos/queen/configuration.nix | 3 +++ nixos/queen/nextcloud.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 50c54f6..2275d63 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -44,6 +44,9 @@ }; }; + sops.secrets.queen-Lillian."nextcloudadmin".mode = "0400"; + sops.secrets.queen-Lillian."nextclouddb".mode = "0400"; + nix = { gc = { automatic = true; diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 075ed6a..d1fcf28 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,10 +53,10 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = config.sops.secrets."nextclouddb".path; + dbpassFile = config.sops.secrets.queen-Lillian."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration - adminpassFile = config.sops.secrets.queen."nextcloudadmin".path; + adminpassFile = config.sops.secrets.queen-Lillian."nextcloudadmin".path; adminuser = "admin"; }; }; From e49fb061890c884cd834428633a23a72306f78f4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:17:34 +0100 Subject: [PATCH 0132/2308] Maybe this? --- nixos/queen/configuration.nix | 3 +++ nixos/queen/nextcloud.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 50c54f6..2275d63 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -44,6 +44,9 @@ }; }; + sops.secrets.queen-Lillian."nextcloudadmin".mode = "0400"; + sops.secrets.queen-Lillian."nextclouddb".mode = "0400"; + nix = { gc = { automatic = true; diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 075ed6a..d1fcf28 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,10 +53,10 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = config.sops.secrets."nextclouddb".path; + dbpassFile = config.sops.secrets.queen-Lillian."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration - adminpassFile = config.sops.secrets.queen."nextcloudadmin".path; + adminpassFile = config.sops.secrets.queen-Lillian."nextcloudadmin".path; adminuser = "admin"; }; }; From 91d530b1663846c5133575d4c2974b16496a683c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:19:15 +0100 Subject: [PATCH 0133/2308] Or this? --- nixos/queen/configuration.nix | 6 +++--- nixos/queen/nextcloud.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 2275d63..a4e651f 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -44,8 +44,8 @@ }; }; - sops.secrets.queen-Lillian."nextcloudadmin".mode = "0400"; - sops.secrets.queen-Lillian."nextclouddb".mode = "0400"; + sops.secrets."nextcloudadmin".mode = "0400"; + sops.secrets."nextclouddb".mode = "0400"; nix = { gc = { @@ -125,7 +125,7 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; - nextcloud.extraGroups = [config.sops.secrets.queen-Lillian."nextcloudadmin" config.sops.secrets.queen-Lillian."nextclouddb"]; + nextcloud.extraGroups = [config.sops.secrets."nextcloudadmin" config.sops.secrets."nextclouddb"]; }; # Enable completion of system packages by zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index d1fcf28..f3c2673 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,10 +53,10 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = config.sops.secrets.queen-Lillian."nextclouddb".path; + dbpassFile = config.sops.secrets"nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration - adminpassFile = config.sops.secrets.queen-Lillian."nextcloudadmin".path; + adminpassFile = config.sops.secrets.nextcloudadmin".path; adminuser = "admin"; }; }; From 140a666c38ed7733bbb44dc7c7f5fb5fd0a9f5d3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:19:15 +0100 Subject: [PATCH 0134/2308] Or this? --- nixos/queen/configuration.nix | 6 +++--- nixos/queen/nextcloud.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 2275d63..a4e651f 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -44,8 +44,8 @@ }; }; - sops.secrets.queen-Lillian."nextcloudadmin".mode = "0400"; - sops.secrets.queen-Lillian."nextclouddb".mode = "0400"; + sops.secrets."nextcloudadmin".mode = "0400"; + sops.secrets."nextclouddb".mode = "0400"; nix = { gc = { @@ -125,7 +125,7 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; - nextcloud.extraGroups = [config.sops.secrets.queen-Lillian."nextcloudadmin" config.sops.secrets.queen-Lillian."nextclouddb"]; + nextcloud.extraGroups = [config.sops.secrets."nextcloudadmin" config.sops.secrets."nextclouddb"]; }; # Enable completion of system packages by zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index d1fcf28..f3c2673 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,10 +53,10 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = config.sops.secrets.queen-Lillian."nextclouddb".path; + dbpassFile = config.sops.secrets"nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration - adminpassFile = config.sops.secrets.queen-Lillian."nextcloudadmin".path; + adminpassFile = config.sops.secrets.nextcloudadmin".path; adminuser = "admin"; }; }; From 55645517cc5c8d0c022975507ea893dbaf82b95e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:19:52 +0100 Subject: [PATCH 0135/2308] Oops quote wrong --- nixos/queen/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index f3c2673..ae4c56f 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,10 +53,10 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = config.sops.secrets"nextclouddb".path; + dbpassFile = config.sops.secrets "nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration - adminpassFile = config.sops.secrets.nextcloudadmin".path; + adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "admin"; }; }; From 4cc2f1ea56b5b0e6b60752e1238fe48111e17b1f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:19:52 +0100 Subject: [PATCH 0136/2308] Oops quote wrong --- nixos/queen/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index f3c2673..ae4c56f 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,10 +53,10 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = config.sops.secrets"nextclouddb".path; + dbpassFile = config.sops.secrets "nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration - adminpassFile = config.sops.secrets.nextcloudadmin".path; + adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "admin"; }; }; From c5d0e22f80402b2d0da56c48d5d1452d99053cd8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:21:36 +0100 Subject: [PATCH 0137/2308] This makes sense, default path --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index a4e651f..6c0f6b6 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -44,6 +44,7 @@ }; }; + sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From c5894e4ae3de1a98ae9d4d6f285b5ccf938018b6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:21:36 +0100 Subject: [PATCH 0138/2308] This makes sense, default path --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index a4e651f..6c0f6b6 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -44,6 +44,7 @@ }; }; + sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From d61ff1e0f72e2ff6cbdccd66511dafeaa2bf708e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:28:21 +0100 Subject: [PATCH 0139/2308] Keyfile added --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6c0f6b6..beccebe 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -45,6 +45,8 @@ }; sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; + #TODO: keyfile for age (generate and sync) + sops.age.keyFile = /home/lillian/.config/sops/age.keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From 8a775e1f571e3e9cd941c97ac53b290fc35c703b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:28:21 +0100 Subject: [PATCH 0140/2308] Keyfile added --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6c0f6b6..beccebe 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -45,6 +45,8 @@ }; sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; + #TODO: keyfile for age (generate and sync) + sops.age.keyFile = /home/lillian/.config/sops/age.keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From b6114222786543b6bde4aedf1e806138931fcac1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:30:00 +0100 Subject: [PATCH 0141/2308] We do a little fixing --- nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index beccebe..9a5185b 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -128,7 +128,7 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; - nextcloud.extraGroups = [config.sops.secrets."nextcloudadmin" config.sops.secrets."nextclouddb"]; + nextcloud.extraGroups = [config.users.groups.keys.name]; }; # Enable completion of system packages by zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index ae4c56f..6fa0211 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,7 +53,7 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = config.sops.secrets "nextclouddb".path; + dbpassFile = config.sops.secrets."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration adminpassFile = config.sops.secrets."nextcloudadmin".path; From 0c20e687956c95d4ce999e67e68b4b464580aa0e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:30:00 +0100 Subject: [PATCH 0142/2308] We do a little fixing --- nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index beccebe..9a5185b 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -128,7 +128,7 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; - nextcloud.extraGroups = [config.sops.secrets."nextcloudadmin" config.sops.secrets."nextclouddb"]; + nextcloud.extraGroups = [config.users.groups.keys.name]; }; # Enable completion of system packages by zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index ae4c56f..6fa0211 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,7 +53,7 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = config.sops.secrets "nextclouddb".path; + dbpassFile = config.sops.secrets."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration adminpassFile = config.sops.secrets."nextcloudadmin".path; From f8b7d0c94d132a9fd3af83eae8fb153a7dddbbea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:30:40 +0100 Subject: [PATCH 0143/2308] And a little typo-ing apparently --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 9a5185b..60488d3 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -46,7 +46,7 @@ sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; #TODO: keyfile for age (generate and sync) - sops.age.keyFile = /home/lillian/.config/sops/age.keys.txt; + sops.age.keyFile = /home/lillian/.config/sops/age/keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From 9967f7cd3ad0db6c2c7ccd9e25f6225821fa1260 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:30:40 +0100 Subject: [PATCH 0144/2308] And a little typo-ing apparently --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 9a5185b..60488d3 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -46,7 +46,7 @@ sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; #TODO: keyfile for age (generate and sync) - sops.age.keyFile = /home/lillian/.config/sops/age.keys.txt; + sops.age.keyFile = /home/lillian/.config/sops/age/keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From b38af9b6dc4ca7ac8c13e83bc3afd240059a8ca1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:31:20 +0100 Subject: [PATCH 0145/2308] Remove to-do as it's to-done --- nixos/queen/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 60488d3..bed51cd 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -45,7 +45,6 @@ }; sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; - #TODO: keyfile for age (generate and sync) sops.age.keyFile = /home/lillian/.config/sops/age/keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From 69dc5391696f195e7964a8e56e3689f4bda4c455 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:31:20 +0100 Subject: [PATCH 0146/2308] Remove to-do as it's to-done --- nixos/queen/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 60488d3..bed51cd 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -45,7 +45,6 @@ }; sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; - #TODO: keyfile for age (generate and sync) sops.age.keyFile = /home/lillian/.config/sops/age/keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From 26bb9286f0b0361d58e234d5f50118bfd26a67fc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:44:23 +0100 Subject: [PATCH 0147/2308] little comment --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index bed51cd..a2ff130 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -44,6 +44,7 @@ }; }; + #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = /home/lillian/.config/sops/age/keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; From 6dd6741afbd41cbe7a40d54e21f7c2579a4ec37c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 16:44:23 +0100 Subject: [PATCH 0148/2308] little comment --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index bed51cd..a2ff130 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -44,6 +44,7 @@ }; }; + #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = /home/lillian/.config/sops/age/keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; From 28c3e3e30f30d174a44f02e12dac406b8a182e71 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 20:26:17 +0100 Subject: [PATCH 0149/2308] Some edits and sops --- nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 19 +++++++++++-------- nixos/shared-desktop/configuration.nix | 1 + secrets/queen-Lillian.yaml | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index a2ff130..7b0131d 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -83,7 +83,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - postgresql_16 + mariadb_110 rsync wget zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6fa0211..64c78bd 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -44,15 +44,17 @@ configureRedis = true; + package = pkgs.nextcloud27; + config = { # Further forces Nextcloud to use HTTPS overwriteProtocol = "https"; # Nextcloud PostegreSQL database configuration, recommended over using SQLite - dbtype = "pgsql"; + dbtype = "mysql"; dbuser = "nextcloud"; - dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself - dbname = "nextcloud"; + dbhost = "/run/mysql"; + dbname = "NC"; dbpassFile = config.sops.secrets."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration @@ -61,21 +63,22 @@ }; }; - services.postgresql = { + services.mysql = { enable = true; + package = pkgs.mariadb_110; # Ensure the database, user, and permissions always exist - ensureDatabases = ["nextcloud"]; + ensureDatabases = ["NC"]; ensureUsers = [ { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + ensurePermissions."DATABASE NC" = "ALL PRIVILEGES"; } ]; }; systemd.services."nextcloud-setup" = { - requires = ["postgresql.service"]; - after = ["postgresql.service"]; + requires = ["mysql.service"]; + after = ["mysql.service"]; }; } diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 2044233..f51403b 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -62,6 +62,7 @@ home-manager input-leap libsForQt5.discover + libsForQt5.kcalc libsForQt5.kdepim-addons libsForQt5.kirigami2 libsForQt5.kdeconnect-kde diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index 37aa2c1..450ca04 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -1,5 +1,5 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] -nextclouddb: ENC[AES256_GCM,data:Jl2Lz2n64tQYVmj0t/ZIfae3KNk=,iv:e/ne3VfIMhCX1ohgGyhFK2tHGwuXJGFhxtNIR0ZHe3I=,tag:Vr1Nn2279t91LvD1XVbJKg==,type:str] +nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +15,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-20T14:35:52Z" - mac: ENC[AES256_GCM,data:IZg0gpsnLu4/dSjeiV3nf2ZW+ifq3FvshLeYE/fNOpNWTdCRm8OhCJNxY0kTuTBae7vCQXcjUQHCuAd+1eZPQD4juBOUd7CVOE5Chn4/o01HyEncjBjwha7uxLazqe15Q3gIFxC+8vqnAbV1BVTh1gIpkSaM61nE8Thr5sE8kvg=,iv:Dg8tUPT2V+IQK7/7DhrZHcnWoxC1APwQcM9owTzU+PU=,tag:qbypt7U5r0O3RRuNdOswIQ==,type:str] + lastmodified: "2023-11-20T16:04:50Z" + mac: ENC[AES256_GCM,data:eXTRcUy7s6NGN7ziA4CFz1Z3bhF0nNWtVI5o/WwMg7UFmW8AhJ2Hjzp0AJSkQxZOav2Fu/t9ENsu3OTdx3khxk9a1M8BV5VqJQ/DmXXfuZjjJ5cqYDBdQqDI+E6Ai6BJHHN0A4r5xkQ7fpdXsolshJKXi9sNiAjYY3zoJi3id9Y=,iv:d214ZHFIm/KmgzYBZrRm58yFZol/dfw6twZthFOAgvY=,tag:2Z4P0iCYNSNiIc2PwW733Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 6edab8a376f4203066d517ebfa2e9774fd73ff00 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Nov 2023 20:26:17 +0100 Subject: [PATCH 0150/2308] Some edits and sops --- nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 19 +++++++++++-------- nixos/shared-desktop/configuration.nix | 1 + secrets/queen-Lillian.yaml | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index a2ff130..7b0131d 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -83,7 +83,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - postgresql_16 + mariadb_110 rsync wget zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6fa0211..64c78bd 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -44,15 +44,17 @@ configureRedis = true; + package = pkgs.nextcloud27; + config = { # Further forces Nextcloud to use HTTPS overwriteProtocol = "https"; # Nextcloud PostegreSQL database configuration, recommended over using SQLite - dbtype = "pgsql"; + dbtype = "mysql"; dbuser = "nextcloud"; - dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself - dbname = "nextcloud"; + dbhost = "/run/mysql"; + dbname = "NC"; dbpassFile = config.sops.secrets."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration @@ -61,21 +63,22 @@ }; }; - services.postgresql = { + services.mysql = { enable = true; + package = pkgs.mariadb_110; # Ensure the database, user, and permissions always exist - ensureDatabases = ["nextcloud"]; + ensureDatabases = ["NC"]; ensureUsers = [ { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + ensurePermissions."DATABASE NC" = "ALL PRIVILEGES"; } ]; }; systemd.services."nextcloud-setup" = { - requires = ["postgresql.service"]; - after = ["postgresql.service"]; + requires = ["mysql.service"]; + after = ["mysql.service"]; }; } diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 2044233..f51403b 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -62,6 +62,7 @@ home-manager input-leap libsForQt5.discover + libsForQt5.kcalc libsForQt5.kdepim-addons libsForQt5.kirigami2 libsForQt5.kdeconnect-kde diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index 37aa2c1..450ca04 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -1,5 +1,5 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] -nextclouddb: ENC[AES256_GCM,data:Jl2Lz2n64tQYVmj0t/ZIfae3KNk=,iv:e/ne3VfIMhCX1ohgGyhFK2tHGwuXJGFhxtNIR0ZHe3I=,tag:Vr1Nn2279t91LvD1XVbJKg==,type:str] +nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +15,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-20T14:35:52Z" - mac: ENC[AES256_GCM,data:IZg0gpsnLu4/dSjeiV3nf2ZW+ifq3FvshLeYE/fNOpNWTdCRm8OhCJNxY0kTuTBae7vCQXcjUQHCuAd+1eZPQD4juBOUd7CVOE5Chn4/o01HyEncjBjwha7uxLazqe15Q3gIFxC+8vqnAbV1BVTh1gIpkSaM61nE8Thr5sE8kvg=,iv:Dg8tUPT2V+IQK7/7DhrZHcnWoxC1APwQcM9owTzU+PU=,tag:qbypt7U5r0O3RRuNdOswIQ==,type:str] + lastmodified: "2023-11-20T16:04:50Z" + mac: ENC[AES256_GCM,data:eXTRcUy7s6NGN7ziA4CFz1Z3bhF0nNWtVI5o/WwMg7UFmW8AhJ2Hjzp0AJSkQxZOav2Fu/t9ENsu3OTdx3khxk9a1M8BV5VqJQ/DmXXfuZjjJ5cqYDBdQqDI+E6Ai6BJHHN0A4r5xkQ7fpdXsolshJKXi9sNiAjYY3zoJi3id9Y=,iv:d214ZHFIm/KmgzYBZrRm58yFZol/dfw6twZthFOAgvY=,tag:2Z4P0iCYNSNiIc2PwW733Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From d4084f01cf2887840cfb98b6ea7943affcebefbb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 11:59:52 +0100 Subject: [PATCH 0151/2308] Add teams (yay...) --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 1501cda..e32c583 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -75,6 +75,7 @@ # Office applications: onlyoffice-bin + teams-for-linux # System tools: rage From d470250c849354508fa2b9a05d3b13a143ccac96 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 11:59:52 +0100 Subject: [PATCH 0152/2308] Add teams (yay...) --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 1501cda..e32c583 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -75,6 +75,7 @@ # Office applications: onlyoffice-bin + teams-for-linux # System tools: rage From 556fc385669b8064f2bb5f29589ef08c005383ec Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 14:55:19 +0100 Subject: [PATCH 0153/2308] Configuration server done --- nixos/queen/configuration.nix | 6 ++++ nixos/queen/hardware-configuration.nix | 49 ++++++-------------------- nixos/queen/nextcloud.nix | 6 ++++ 3 files changed, 22 insertions(+), 39 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 7b0131d..4da8d18 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -19,6 +19,12 @@ ./nextcloud.nix ]; + boot.cleanTmpDir = true; + zramSwap.enable = false; + networking.domain = ""; + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; + nixpkgs = { # You can add overlays here overlays = [ diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix index 3b523fc..b5954e7 100644 --- a/nixos/queen/hardware-configuration.nix +++ b/nixos/queen/hardware-configuration.nix @@ -1,40 +1,11 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BA43-C24E"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +{modulesPath, ...}: { + imports = [(modulesPath + "/profiles/qemu-guest.nix")]; + boot.loader.grub.device = "/dev/sda"; + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + boot.initrd.kernelModules = ["nvme"]; + fileSystems."/" = { + device = "/dev/sda3"; + fsType = "ext4"; + }; + swapDevices = [{device = "/dev/sda2";}]; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 64c78bd..24cb258 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -46,6 +46,9 @@ package = pkgs.nextcloud27; + #Directory for the data + datadir = /var/lib/NCData; + config = { # Further forces Nextcloud to use HTTPS overwriteProtocol = "https"; @@ -67,6 +70,9 @@ enable = true; package = pkgs.mariadb_110; + + dataDir = /var/lib/NCMariaDB; + # Ensure the database, user, and permissions always exist ensureDatabases = ["NC"]; ensureUsers = [ From 6a531ca22c8477ae7d34c0d3dc4f0cf4c2302b48 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 14:55:19 +0100 Subject: [PATCH 0154/2308] Configuration server done --- nixos/queen/configuration.nix | 6 ++++ nixos/queen/hardware-configuration.nix | 49 ++++++-------------------- nixos/queen/nextcloud.nix | 6 ++++ 3 files changed, 22 insertions(+), 39 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 7b0131d..4da8d18 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -19,6 +19,12 @@ ./nextcloud.nix ]; + boot.cleanTmpDir = true; + zramSwap.enable = false; + networking.domain = ""; + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; + nixpkgs = { # You can add overlays here overlays = [ diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix index 3b523fc..b5954e7 100644 --- a/nixos/queen/hardware-configuration.nix +++ b/nixos/queen/hardware-configuration.nix @@ -1,40 +1,11 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BA43-C24E"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +{modulesPath, ...}: { + imports = [(modulesPath + "/profiles/qemu-guest.nix")]; + boot.loader.grub.device = "/dev/sda"; + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + boot.initrd.kernelModules = ["nvme"]; + fileSystems."/" = { + device = "/dev/sda3"; + fsType = "ext4"; + }; + swapDevices = [{device = "/dev/sda2";}]; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 64c78bd..24cb258 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -46,6 +46,9 @@ package = pkgs.nextcloud27; + #Directory for the data + datadir = /var/lib/NCData; + config = { # Further forces Nextcloud to use HTTPS overwriteProtocol = "https"; @@ -67,6 +70,9 @@ enable = true; package = pkgs.mariadb_110; + + dataDir = /var/lib/NCMariaDB; + # Ensure the database, user, and permissions always exist ensureDatabases = ["NC"]; ensureUsers = [ From e95cd12fda6abff1fb02d3d3416a03e907101c7c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:04:07 +0100 Subject: [PATCH 0155/2308] Hostplatform added --- nixos/queen/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix index b5954e7..1befada 100644 --- a/nixos/queen/hardware-configuration.nix +++ b/nixos/queen/hardware-configuration.nix @@ -8,4 +8,5 @@ fsType = "ext4"; }; swapDevices = [{device = "/dev/sda2";}]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } From c43d75996e88ff0472a20b905fac3d704e992e96 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:04:07 +0100 Subject: [PATCH 0156/2308] Hostplatform added --- nixos/queen/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix index b5954e7..1befada 100644 --- a/nixos/queen/hardware-configuration.nix +++ b/nixos/queen/hardware-configuration.nix @@ -8,4 +8,5 @@ fsType = "ext4"; }; swapDevices = [{device = "/dev/sda2";}]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } From 25423a3a7456978ce4786dc77c306710aecdebe8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:05:37 +0100 Subject: [PATCH 0157/2308] lib needed up there --- nixos/queen/hardware-configuration.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix index 1befada..52ea2b5 100644 --- a/nixos/queen/hardware-configuration.nix +++ b/nixos/queen/hardware-configuration.nix @@ -1,4 +1,10 @@ -{modulesPath, ...}: { +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { imports = [(modulesPath + "/profiles/qemu-guest.nix")]; boot.loader.grub.device = "/dev/sda"; boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; From 0ecbdc3d100043d6f108d7635dcd8b98beda63dc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:05:37 +0100 Subject: [PATCH 0158/2308] lib needed up there --- nixos/queen/hardware-configuration.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/queen/hardware-configuration.nix b/nixos/queen/hardware-configuration.nix index 1befada..52ea2b5 100644 --- a/nixos/queen/hardware-configuration.nix +++ b/nixos/queen/hardware-configuration.nix @@ -1,4 +1,10 @@ -{modulesPath, ...}: { +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { imports = [(modulesPath + "/profiles/qemu-guest.nix")]; boot.loader.grub.device = "/dev/sda"; boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; From 32a477aaf2f7b8b3751f2e5a06f6e4111e978507 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:09:21 +0100 Subject: [PATCH 0159/2308] RELATIVE PATHS REQUIRED --- nixos/queen/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 24cb258..1a39711 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -47,7 +47,7 @@ package = pkgs.nextcloud27; #Directory for the data - datadir = /var/lib/NCData; + datadir = ../../../../../var/lib/NCData; config = { # Further forces Nextcloud to use HTTPS @@ -71,7 +71,7 @@ package = pkgs.mariadb_110; - dataDir = /var/lib/NCMariaDB; + dataDir = ../../../../../var/lib/NCMariaDB; # Ensure the database, user, and permissions always exist ensureDatabases = ["NC"]; From 1d4206c65801d7b99e8e963cf142bad3599c56d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:09:21 +0100 Subject: [PATCH 0160/2308] RELATIVE PATHS REQUIRED --- nixos/queen/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 24cb258..1a39711 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -47,7 +47,7 @@ package = pkgs.nextcloud27; #Directory for the data - datadir = /var/lib/NCData; + datadir = ../../../../../var/lib/NCData; config = { # Further forces Nextcloud to use HTTPS @@ -71,7 +71,7 @@ package = pkgs.mariadb_110; - dataDir = /var/lib/NCMariaDB; + dataDir = ../../../../../var/lib/NCMariaDB; # Ensure the database, user, and permissions always exist ensureDatabases = ["NC"]; From 4bc04e84e24f76bd0d3eb6b88d0d679f5beadd24 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:16:20 +0100 Subject: [PATCH 0161/2308] Remove the links, too much hassle, use default --- nixos/queen/nextcloud.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 1a39711..8a52012 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -46,8 +46,7 @@ package = pkgs.nextcloud27; - #Directory for the data - datadir = ../../../../../var/lib/NCData; + #Directory for the data is /var/lib/nextcloud config = { # Further forces Nextcloud to use HTTPS @@ -71,7 +70,7 @@ package = pkgs.mariadb_110; - dataDir = ../../../../../var/lib/NCMariaDB; + #Directory for the database is /var/lib/mysql # Ensure the database, user, and permissions always exist ensureDatabases = ["NC"]; From 10f71ddff71dcdf3ccaf39b96d266ff035930f87 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:16:20 +0100 Subject: [PATCH 0162/2308] Remove the links, too much hassle, use default --- nixos/queen/nextcloud.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 1a39711..8a52012 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -46,8 +46,7 @@ package = pkgs.nextcloud27; - #Directory for the data - datadir = ../../../../../var/lib/NCData; + #Directory for the data is /var/lib/nextcloud config = { # Further forces Nextcloud to use HTTPS @@ -71,7 +70,7 @@ package = pkgs.mariadb_110; - dataDir = ../../../../../var/lib/NCMariaDB; + #Directory for the database is /var/lib/mysql # Ensure the database, user, and permissions always exist ensureDatabases = ["NC"]; From f6e205fa1c3d48e7fab1df1a39f81c94ea0086c4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:30:15 +0100 Subject: [PATCH 0163/2308] Switch to grub --- nixos/queen/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 4da8d18..ad55f71 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -150,8 +150,7 @@ networking.hostName = "queen"; - #TODO: see if this bootloader works on the vps and if not replace it! - boot.loader.systemd-boot.enable = true; + boot.loader.grub.enable = true; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; From 8a89f11691227842e62c58c1f68f729bc801630b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:30:15 +0100 Subject: [PATCH 0164/2308] Switch to grub --- nixos/queen/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 4da8d18..ad55f71 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -150,8 +150,7 @@ networking.hostName = "queen"; - #TODO: see if this bootloader works on the vps and if not replace it! - boot.loader.systemd-boot.enable = true; + boot.loader.grub.enable = true; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; From d6a7cd0b06dd822577ec40ea3a5826c47d37a282 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:38:20 +0100 Subject: [PATCH 0165/2308] Move the sops age file in queen --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ad55f71..78c6ef4 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -52,7 +52,7 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; - sops.age.keyFile = /home/lillian/.config/sops/age/keys.txt; + sops.age.keyFile = /var/lib/sops/age/keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From a9daa250f2206c4578253598850f47da49d29a4a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 15:38:20 +0100 Subject: [PATCH 0166/2308] Move the sops age file in queen --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ad55f71..78c6ef4 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -52,7 +52,7 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; - sops.age.keyFile = /home/lillian/.config/sops/age/keys.txt; + sops.age.keyFile = /var/lib/sops/age/keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From 4e9e0ed8f2e20fb38ca0e11fa4bda77298f462d7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 18:35:54 +0100 Subject: [PATCH 0167/2308] Cleanonboot instead --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 78c6ef4..c605290 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -19,7 +19,7 @@ ./nextcloud.nix ]; - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; zramSwap.enable = false; networking.domain = ""; services.openssh.enable = true; From a91b37d9df42fd344e12d88b9ee49ec3571ea87e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 18:35:54 +0100 Subject: [PATCH 0168/2308] Cleanonboot instead --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 78c6ef4..c605290 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -19,7 +19,7 @@ ./nextcloud.nix ]; - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; zramSwap.enable = false; networking.domain = ""; services.openssh.enable = true; From f145067e1b214d9e3fdc1db9c9e0ebe0060a3d69 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 18:38:24 +0100 Subject: [PATCH 0169/2308] Relative path sops file --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c605290..c1ed243 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -52,7 +52,7 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; - sops.age.keyFile = /var/lib/sops/age/keys.txt; + sops.age.keyFile = ../../../../var/lib/sops/age/keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From 77d700b2f4910742cba4d94769443713b21e45c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 18:38:24 +0100 Subject: [PATCH 0170/2308] Relative path sops file --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c605290..c1ed243 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -52,7 +52,7 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; - sops.age.keyFile = /var/lib/sops/age/keys.txt; + sops.age.keyFile = ../../../../var/lib/sops/age/keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From f93b331c818b5efa17a0e4d0c76f66f8511bf6b4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 18:40:55 +0100 Subject: [PATCH 0171/2308] Email acme changed syntax --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c1ed243..cf5bf85 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -125,7 +125,7 @@ security.acme = { acceptTerms = true; # Replace the email here! - email = "letsencrypt@gladtherescake.eu"; + defaults.email = "letsencrypt@gladtherescake.eu"; }; users.users = { From 5f9c2fa1bce55e10a63a53adb2f8fb0fb6463808 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 18:40:55 +0100 Subject: [PATCH 0172/2308] Email acme changed syntax --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c1ed243..cf5bf85 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -125,7 +125,7 @@ security.acme = { acceptTerms = true; # Replace the email here! - email = "letsencrypt@gladtherescake.eu"; + defaults.email = "letsencrypt@gladtherescake.eu"; }; users.users = { From bec0ca0f552b8e19f4f58d5c54c65c95e66971c0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 18:41:53 +0100 Subject: [PATCH 0173/2308] Just place the key here who cares --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index cf5bf85..e212489 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -52,7 +52,7 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; - sops.age.keyFile = ../../../../var/lib/sops/age/keys.txt; + sops.age.keyFile = ./keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From 433c5a1356753dcb8a75521f446b9f71d3480f82 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 18:41:53 +0100 Subject: [PATCH 0174/2308] Just place the key here who cares --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index cf5bf85..e212489 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -52,7 +52,7 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; - sops.age.keyFile = ../../../../var/lib/sops/age/keys.txt; + sops.age.keyFile = ./keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; sops.secrets."nextclouddb".mode = "0400"; From 8e8e612a54ff914bce31241d211a69c4a715ba06 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:03:25 +0100 Subject: [PATCH 0175/2308] Force recovery mode mariadb --- nixos/queen/nextcloud.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 8a52012..49750e4 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -71,6 +71,11 @@ package = pkgs.mariadb_110; #Directory for the database is /var/lib/mysql + settings = { + mysqld = { + innodb_force_recovery = true; + }; + }; # Ensure the database, user, and permissions always exist ensureDatabases = ["NC"]; From 84ad19e462703cffc47fb7116393e6efeb59c658 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:03:25 +0100 Subject: [PATCH 0176/2308] Force recovery mode mariadb --- nixos/queen/nextcloud.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 8a52012..49750e4 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -71,6 +71,11 @@ package = pkgs.mariadb_110; #Directory for the database is /var/lib/mysql + settings = { + mysqld = { + innodb_force_recovery = true; + }; + }; # Ensure the database, user, and permissions always exist ensureDatabases = ["NC"]; From 241d36425d1576699b845d3ec9246c5d6cba374d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:06:00 +0100 Subject: [PATCH 0177/2308] 1? --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 49750e4..c8621ae 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -73,7 +73,7 @@ #Directory for the database is /var/lib/mysql settings = { mysqld = { - innodb_force_recovery = true; + innodb_force_recovery = 1; }; }; From 2ec29091bac4d440a0738291dce00e33af082ce0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:06:00 +0100 Subject: [PATCH 0178/2308] 1? --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 49750e4..c8621ae 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -73,7 +73,7 @@ #Directory for the database is /var/lib/mysql settings = { mysqld = { - innodb_force_recovery = true; + innodb_force_recovery = 1; }; }; From 0711f352ebdd376d2f5bddaa9b7d13f4b72d1c2a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:08:22 +0100 Subject: [PATCH 0179/2308] 10? --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index c8621ae..08ae5ec 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -73,7 +73,7 @@ #Directory for the database is /var/lib/mysql settings = { mysqld = { - innodb_force_recovery = 1; + innodb_force_recovery = 10; }; }; From e61b4d389ccf1f727e4a807c827bfc630d828ecb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:08:22 +0100 Subject: [PATCH 0180/2308] 10? --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index c8621ae..08ae5ec 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -73,7 +73,7 @@ #Directory for the database is /var/lib/mysql settings = { mysqld = { - innodb_force_recovery = 1; + innodb_force_recovery = 10; }; }; From 5d304c4107510a58b2e4770a5875cd98e73336ef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:12:08 +0100 Subject: [PATCH 0181/2308] add error logging --- nixos/queen/nextcloud.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 08ae5ec..cfbe5d2 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -74,6 +74,10 @@ settings = { mysqld = { innodb_force_recovery = 10; + log_error = /var/log/mysql/mysql_error.log; + }; + mysqld_safe = { + log_error = /var/log/mysql/mysql_error.log; }; }; From a022574d5fb88a5275226252617fe0ff83e5f2cc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:12:08 +0100 Subject: [PATCH 0182/2308] add error logging --- nixos/queen/nextcloud.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 08ae5ec..cfbe5d2 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -74,6 +74,10 @@ settings = { mysqld = { innodb_force_recovery = 10; + log_error = /var/log/mysql/mysql_error.log; + }; + mysqld_safe = { + log_error = /var/log/mysql/mysql_error.log; }; }; From 9fe4fbec4fc00ea1fdfe7223f47e938f37427294 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:16:15 +0100 Subject: [PATCH 0183/2308] Mariadb? --- nixos/queen/nextcloud.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index cfbe5d2..fba226f 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -74,9 +74,8 @@ settings = { mysqld = { innodb_force_recovery = 10; - log_error = /var/log/mysql/mysql_error.log; }; - mysqld_safe = { + mariadb = { log_error = /var/log/mysql/mysql_error.log; }; }; From 7e3d5ec7b440c6eaa913f991defc91817e5be6d9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:16:15 +0100 Subject: [PATCH 0184/2308] Mariadb? --- nixos/queen/nextcloud.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index cfbe5d2..fba226f 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -74,9 +74,8 @@ settings = { mysqld = { innodb_force_recovery = 10; - log_error = /var/log/mysql/mysql_error.log; }; - mysqld_safe = { + mariadb = { log_error = /var/log/mysql/mysql_error.log; }; }; From da218ccbb585dbce025cd486a754158b6e29a399 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:19:49 +0100 Subject: [PATCH 0185/2308] Let's retry clean --- nixos/queen/nextcloud.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index fba226f..8a52012 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -71,14 +71,6 @@ package = pkgs.mariadb_110; #Directory for the database is /var/lib/mysql - settings = { - mysqld = { - innodb_force_recovery = 10; - }; - mariadb = { - log_error = /var/log/mysql/mysql_error.log; - }; - }; # Ensure the database, user, and permissions always exist ensureDatabases = ["NC"]; From 0d6d6374758bffd594f294f679a27bff0cf37b52 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:19:49 +0100 Subject: [PATCH 0186/2308] Let's retry clean --- nixos/queen/nextcloud.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index fba226f..8a52012 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -71,14 +71,6 @@ package = pkgs.mariadb_110; #Directory for the database is /var/lib/mysql - settings = { - mysqld = { - innodb_force_recovery = 10; - }; - mariadb = { - log_error = /var/log/mysql/mysql_error.log; - }; - }; # Ensure the database, user, and permissions always exist ensureDatabases = ["NC"]; From 93511212d073d5b1f7fa7f8e88c0ffa32467c89b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:28:12 +0100 Subject: [PATCH 0187/2308] Let's not ensure the db? --- nixos/queen/nextcloud.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 8a52012..d694eaa 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -73,13 +73,13 @@ #Directory for the database is /var/lib/mysql # Ensure the database, user, and permissions always exist - ensureDatabases = ["NC"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE NC" = "ALL PRIVILEGES"; - } - ]; + # ensureDatabases = ["NC"]; + # ensureUsers = [ + # { + # name = "nextcloud"; + # ensurePermissions."DATABASE NC" = "ALL PRIVILEGES"; + # } + # ]; }; systemd.services."nextcloud-setup" = { From 38fffabd60b264ab1fb660c22a0779971daf25ac Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:28:12 +0100 Subject: [PATCH 0188/2308] Let's not ensure the db? --- nixos/queen/nextcloud.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 8a52012..d694eaa 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -73,13 +73,13 @@ #Directory for the database is /var/lib/mysql # Ensure the database, user, and permissions always exist - ensureDatabases = ["NC"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE NC" = "ALL PRIVILEGES"; - } - ]; + # ensureDatabases = ["NC"]; + # ensureUsers = [ + # { + # name = "nextcloud"; + # ensurePermissions."DATABASE NC" = "ALL PRIVILEGES"; + # } + # ]; }; systemd.services."nextcloud-setup" = { From bfc836cd0cabfc6df996921ad7537c5cd04879ec Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:37:29 +0100 Subject: [PATCH 0189/2308] Permissions for nextcloud for keys? --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index e212489..68ecdf0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -54,7 +54,9 @@ sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; + sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; sops.secrets."nextclouddb".mode = "0400"; + sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; nix = { gc = { From bf39bb0ef2ea227fcc02dac48504d3a0320f22a1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:37:29 +0100 Subject: [PATCH 0190/2308] Permissions for nextcloud for keys? --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index e212489..68ecdf0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -54,7 +54,9 @@ sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; sops.secrets."nextcloudadmin".mode = "0400"; + sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; sops.secrets."nextclouddb".mode = "0400"; + sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; nix = { gc = { From 4476f30a65092313b8104ed4745b08501dce5e80 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:42:05 +0100 Subject: [PATCH 0191/2308] admin user is me --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index d694eaa..f873757 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -61,7 +61,7 @@ #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration adminpassFile = config.sops.secrets."nextcloudadmin".path; - adminuser = "admin"; + adminuser = "gladtherescake"; }; }; From ca777336fb39a9cdcbea8471afb85f1c16f873b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Nov 2023 19:42:05 +0100 Subject: [PATCH 0192/2308] admin user is me --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index d694eaa..f873757 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -61,7 +61,7 @@ #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration adminpassFile = config.sops.secrets."nextcloudadmin".path; - adminuser = "admin"; + adminuser = "gladtherescake"; }; }; From 7b419672700a074268f975302ff9e5d4f5b7dad3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 12:21:23 +0100 Subject: [PATCH 0193/2308] Add docker + flake update --- flake.lock | 18 +++++++++--------- home-manager/desktop-shared.nix | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 85c6871..7efa93c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700419052, - "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", + "lastModified": 1700553346, + "narHash": "sha256-kW7uWsCv/lxuA824Ng6EYD9hlVYRyjuFn0xBbYltAeQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "993fb02d20760067b8ee19c713d94cee07037759", + "rev": "1aabb0a31b25ad83cfaa37c3fe29053417cd9a0f", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "lastModified": 1700390070, + "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "lastModified": 1700390070, + "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "type": "github" }, "original": { diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index e32c583..fdefda7 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -56,6 +56,7 @@ home.packages = with pkgs; [ # Coding: + docker git kate From 0007129fc17e88b451672c7749e74fb63bb9eb73 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 12:21:23 +0100 Subject: [PATCH 0194/2308] Add docker + flake update --- flake.lock | 18 +++++++++--------- home-manager/desktop-shared.nix | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 85c6871..7efa93c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700419052, - "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", + "lastModified": 1700553346, + "narHash": "sha256-kW7uWsCv/lxuA824Ng6EYD9hlVYRyjuFn0xBbYltAeQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "993fb02d20760067b8ee19c713d94cee07037759", + "rev": "1aabb0a31b25ad83cfaa37c3fe29053417cd9a0f", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "lastModified": 1700390070, + "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "lastModified": 1700390070, + "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "type": "github" }, "original": { diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index e32c583..fdefda7 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -56,6 +56,7 @@ home.packages = with pkgs; [ # Coding: + docker git kate From 3af0d40c7921a8536c7f78475fe5a92672eea9dc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 12:50:29 +0100 Subject: [PATCH 0195/2308] Add user to docker group --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index f51403b..49a65c2 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -162,7 +162,7 @@ users.users = { lillian = { isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; shell = pkgs.zsh; }; }; From b5eae356e08ee39d55e072e1c6d29c30b82a8251 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 12:50:29 +0100 Subject: [PATCH 0196/2308] Add user to docker group --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index f51403b..49a65c2 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -162,7 +162,7 @@ users.users = { lillian = { isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; shell = pkgs.zsh; }; }; From 88d49c594094b633a5ac2139f82717ac96e6d023 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 12:52:38 +0100 Subject: [PATCH 0197/2308] Add docker compose --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index fdefda7..7175ffc 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -57,6 +57,7 @@ home.packages = with pkgs; [ # Coding: docker + docker-compose git kate From e356b12b67a050116319a02ff5c92ed4e826e6df Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 12:52:38 +0100 Subject: [PATCH 0198/2308] Add docker compose --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index fdefda7..7175ffc 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -57,6 +57,7 @@ home.packages = with pkgs; [ # Coding: docker + docker-compose git kate From 6cef1b8ad74936e547b21c39c76b931cdbc13b07 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:14:27 +0100 Subject: [PATCH 0199/2308] mssql test? --- home-manager/desktop-shared.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 7175ffc..f480ef3 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -128,6 +128,20 @@ userEmail = "git@gladtherescake.eu"; userName = "Lillian-Violet"; }; + + config.docker-containers = { + mssql = { + image = "mcr.microsoft.com/mssql/server:latest"; + ports = ["127.0.0.1:1433:1433"]; + volumes = [ + "/var/lib/mssql" + ]; + cmd = [ + "--base-url" + "\"/mssql\"" + ]; + }; + }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; } From 3d4750f0c9b2bdc90e2e07f61504a3eaa24ed39d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:14:27 +0100 Subject: [PATCH 0200/2308] mssql test? --- home-manager/desktop-shared.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 7175ffc..f480ef3 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -128,6 +128,20 @@ userEmail = "git@gladtherescake.eu"; userName = "Lillian-Violet"; }; + + config.docker-containers = { + mssql = { + image = "mcr.microsoft.com/mssql/server:latest"; + ports = ["127.0.0.1:1433:1433"]; + volumes = [ + "/var/lib/mssql" + ]; + cmd = [ + "--base-url" + "\"/mssql\"" + ]; + }; + }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; } From d76c837c13f252eee250c6ebcc4a468b37eac307 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:16:36 +0100 Subject: [PATCH 0201/2308] Little fix --- home-manager/desktop-shared.nix | 16 +--------------- nixos/shared-desktop/configuration.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index f480ef3..e668e4b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -56,8 +56,7 @@ home.packages = with pkgs; [ # Coding: - docker - docker-compose + azuredatastudio git kate @@ -129,19 +128,6 @@ userName = "Lillian-Violet"; }; - config.docker-containers = { - mssql = { - image = "mcr.microsoft.com/mssql/server:latest"; - ports = ["127.0.0.1:1433:1433"]; - volumes = [ - "/var/lib/mssql" - ]; - cmd = [ - "--base-url" - "\"/mssql\"" - ]; - }; - }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; } diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 49a65c2..f9d6340 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -58,6 +58,8 @@ environment.systemPackages = with pkgs; [ age alejandra + docker + docker-compose git-filter-repo home-manager input-leap @@ -167,6 +169,20 @@ }; }; + config.docker-containers = { + mssql = { + image = "mcr.microsoft.com/mssql/server:latest"; + ports = ["127.0.0.1:1433:1433"]; + volumes = [ + "/var/lib/mssql" + ]; + cmd = [ + "--base-url" + "\"/mssql\"" + ]; + }; + }; + # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; } From 7f0670b0448b0790784ad282071919df6cbaa6ea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:16:36 +0100 Subject: [PATCH 0202/2308] Little fix --- home-manager/desktop-shared.nix | 16 +--------------- nixos/shared-desktop/configuration.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index f480ef3..e668e4b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -56,8 +56,7 @@ home.packages = with pkgs; [ # Coding: - docker - docker-compose + azuredatastudio git kate @@ -129,19 +128,6 @@ userName = "Lillian-Violet"; }; - config.docker-containers = { - mssql = { - image = "mcr.microsoft.com/mssql/server:latest"; - ports = ["127.0.0.1:1433:1433"]; - volumes = [ - "/var/lib/mssql" - ]; - cmd = [ - "--base-url" - "\"/mssql\"" - ]; - }; - }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; } diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 49a65c2..f9d6340 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -58,6 +58,8 @@ environment.systemPackages = with pkgs; [ age alejandra + docker + docker-compose git-filter-repo home-manager input-leap @@ -167,6 +169,20 @@ }; }; + config.docker-containers = { + mssql = { + image = "mcr.microsoft.com/mssql/server:latest"; + ports = ["127.0.0.1:1433:1433"]; + volumes = [ + "/var/lib/mssql" + ]; + cmd = [ + "--base-url" + "\"/mssql\"" + ]; + }; + }; + # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; } From bce821532f329d045d8117caa03915182e414607 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:18:52 +0100 Subject: [PATCH 0203/2308] No config attribute? --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index f9d6340..5904e75 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -169,7 +169,7 @@ }; }; - config.docker-containers = { + docker-containers = { mssql = { image = "mcr.microsoft.com/mssql/server:latest"; ports = ["127.0.0.1:1433:1433"]; From f3e84889595af12daf21085689e322c09b93cd99 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:18:52 +0100 Subject: [PATCH 0204/2308] No config attribute? --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index f9d6340..5904e75 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -169,7 +169,7 @@ }; }; - config.docker-containers = { + docker-containers = { mssql = { image = "mcr.microsoft.com/mssql/server:latest"; ports = ["127.0.0.1:1433:1433"]; From a5c6a190d188e5c79a979d3a174ebd52df034fbc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:21:01 +0100 Subject: [PATCH 0205/2308] New syntax --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 5904e75..325f074 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -169,7 +169,7 @@ }; }; - docker-containers = { + virtualisation.oci-containers.containers = { mssql = { image = "mcr.microsoft.com/mssql/server:latest"; ports = ["127.0.0.1:1433:1433"]; From eae9dfb2e072f7ad0020be8d4c39feb29233e3e8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:21:01 +0100 Subject: [PATCH 0206/2308] New syntax --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 5904e75..325f074 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -169,7 +169,7 @@ }; }; - docker-containers = { + virtualisation.oci-containers.containers = { mssql = { image = "mcr.microsoft.com/mssql/server:latest"; ports = ["127.0.0.1:1433:1433"]; From c4d9dfd2199493cf2d78ee09b526fd6b91c28054 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:27:44 +0100 Subject: [PATCH 0207/2308] Will this work with commands? --- nixos/shared-desktop/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 325f074..1c5b9a9 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -177,8 +177,7 @@ "/var/lib/mssql" ]; cmd = [ - "--base-url" - "\"/mssql\"" + "-e \"ACCEPT_EULA=Y\" -e \"MSSQL_SA_PASSWORD=password\"" ]; }; }; From 8ee79fd8eae07f02f4dce8763d1b6aadd6d9f09d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:27:44 +0100 Subject: [PATCH 0208/2308] Will this work with commands? --- nixos/shared-desktop/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 325f074..1c5b9a9 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -177,8 +177,7 @@ "/var/lib/mssql" ]; cmd = [ - "--base-url" - "\"/mssql\"" + "-e \"ACCEPT_EULA=Y\" -e \"MSSQL_SA_PASSWORD=password\"" ]; }; }; From 000191e2c1a4ca14a37b4976a2b650ab653328e5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:33:18 +0100 Subject: [PATCH 0209/2308] Environment? --- nixos/shared-desktop/configuration.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 1c5b9a9..17fc851 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -176,9 +176,10 @@ volumes = [ "/var/lib/mssql" ]; - cmd = [ - "-e \"ACCEPT_EULA=Y\" -e \"MSSQL_SA_PASSWORD=password\"" - ]; + environment = { + "ACCEPT_EULA" = "y"; + "MSSQL_SA_PASSWORD" = "password"; + }; }; }; From 5fb72bae0e46bfd34bc735c182b5123bcdafe253 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:33:18 +0100 Subject: [PATCH 0210/2308] Environment? --- nixos/shared-desktop/configuration.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 1c5b9a9..17fc851 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -176,9 +176,10 @@ volumes = [ "/var/lib/mssql" ]; - cmd = [ - "-e \"ACCEPT_EULA=Y\" -e \"MSSQL_SA_PASSWORD=password\"" - ]; + environment = { + "ACCEPT_EULA" = "y"; + "MSSQL_SA_PASSWORD" = "password"; + }; }; }; From e39ce3122121d44a71430213c24411f021a02012 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:35:42 +0100 Subject: [PATCH 0211/2308] 2022 latest --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 17fc851..1eeb569 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -171,7 +171,7 @@ virtualisation.oci-containers.containers = { mssql = { - image = "mcr.microsoft.com/mssql/server:latest"; + image = "mcr.microsoft.com/mssql/server:2022-latest"; ports = ["127.0.0.1:1433:1433"]; volumes = [ "/var/lib/mssql" From 59ab5131ffdad00f32f512e06a0df83f3cd33202 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:35:42 +0100 Subject: [PATCH 0212/2308] 2022 latest --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 17fc851..1eeb569 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -171,7 +171,7 @@ virtualisation.oci-containers.containers = { mssql = { - image = "mcr.microsoft.com/mssql/server:latest"; + image = "mcr.microsoft.com/mssql/server:2022-latest"; ports = ["127.0.0.1:1433:1433"]; volumes = [ "/var/lib/mssql" From df6bd3f415e6fd90483c1da22744102e93bb7b5e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:39:20 +0100 Subject: [PATCH 0213/2308] Let's just remove the volume --- nixos/shared-desktop/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 1eeb569..2cd8a5e 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -173,9 +173,6 @@ mssql = { image = "mcr.microsoft.com/mssql/server:2022-latest"; ports = ["127.0.0.1:1433:1433"]; - volumes = [ - "/var/lib/mssql" - ]; environment = { "ACCEPT_EULA" = "y"; "MSSQL_SA_PASSWORD" = "password"; From bcd09cd623fc6d5ce8a71bfe03ad9d2b052c93f5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:39:20 +0100 Subject: [PATCH 0214/2308] Let's just remove the volume --- nixos/shared-desktop/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 1eeb569..2cd8a5e 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -173,9 +173,6 @@ mssql = { image = "mcr.microsoft.com/mssql/server:2022-latest"; ports = ["127.0.0.1:1433:1433"]; - volumes = [ - "/var/lib/mssql" - ]; environment = { "ACCEPT_EULA" = "y"; "MSSQL_SA_PASSWORD" = "password"; From c75c3120b2ce3510561420480964b0a1aeca9137 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:48:51 +0100 Subject: [PATCH 0215/2308] volume added --- nixos/shared-desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 2cd8a5e..5ec0f50 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -177,6 +177,7 @@ "ACCEPT_EULA" = "y"; "MSSQL_SA_PASSWORD" = "password"; }; + volumes = ["/home/delegator/filerun/db:/var/lib/myssql"]; }; }; From 35fe682af7dd693715a2dc419e9bcf37e168be86 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:48:51 +0100 Subject: [PATCH 0216/2308] volume added --- nixos/shared-desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 2cd8a5e..5ec0f50 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -177,6 +177,7 @@ "ACCEPT_EULA" = "y"; "MSSQL_SA_PASSWORD" = "password"; }; + volumes = ["/home/delegator/filerun/db:/var/lib/myssql"]; }; }; From cd174a04062067f1016fcb3683ff553c13659a40 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:52:41 +0100 Subject: [PATCH 0217/2308] Maybe mssql volume back --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 5ec0f50..235c08f 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -177,7 +177,7 @@ "ACCEPT_EULA" = "y"; "MSSQL_SA_PASSWORD" = "password"; }; - volumes = ["/home/delegator/filerun/db:/var/lib/myssql"]; + volumes = ["/var/lib/myssql"]; }; }; From 448821301afedf8943441916850b035ea9e43880 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:52:41 +0100 Subject: [PATCH 0218/2308] Maybe mssql volume back --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 5ec0f50..235c08f 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -177,7 +177,7 @@ "ACCEPT_EULA" = "y"; "MSSQL_SA_PASSWORD" = "password"; }; - volumes = ["/home/delegator/filerun/db:/var/lib/myssql"]; + volumes = ["/var/lib/myssql"]; }; }; From 6e86eb4ab3c556962e5c10800d1473dbbb84c3d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:55:13 +0100 Subject: [PATCH 0219/2308] add mssql user --- nixos/shared-desktop/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 235c08f..95002a2 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -167,6 +167,9 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; shell = pkgs.zsh; }; + mssql = { + isNormalUser = false; + }; }; virtualisation.oci-containers.containers = { From 6acf0e9ae3c9cc018fc5b195334641717fddaf79 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:55:13 +0100 Subject: [PATCH 0220/2308] add mssql user --- nixos/shared-desktop/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 235c08f..95002a2 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -167,6 +167,9 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; shell = pkgs.zsh; }; + mssql = { + isNormalUser = false; + }; }; virtualisation.oci-containers.containers = { From b97385041c5a5ab5482857d676b34eaeb1d7fa71 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:56:27 +0100 Subject: [PATCH 0221/2308] Is system user --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 95002a2..4f95f02 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -168,7 +168,7 @@ shell = pkgs.zsh; }; mssql = { - isNormalUser = false; + isSystemUser = true; }; }; From c3ae2f1166989802b133c9549b72d8c613a70ecb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:56:27 +0100 Subject: [PATCH 0222/2308] Is system user --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 95002a2..4f95f02 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -168,7 +168,7 @@ shell = pkgs.zsh; }; mssql = { - isNormalUser = false; + isSystemUser = true; }; }; From 479cfc87b81402b00149ac255e5efd4498956222 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:57:14 +0100 Subject: [PATCH 0223/2308] Add to group --- nixos/shared-desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 4f95f02..b34a2e4 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -169,6 +169,7 @@ }; mssql = { isSystemUser = true; + group = "mssql"; }; }; From 12f1372854e179ec925de847cb53a46fc72e2d6a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:57:14 +0100 Subject: [PATCH 0224/2308] Add to group --- nixos/shared-desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 4f95f02..b34a2e4 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -169,6 +169,7 @@ }; mssql = { isSystemUser = true; + group = "mssql"; }; }; From f3f2a833bc6f33e60fc639042321b60bb5d5b071 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:58:13 +0100 Subject: [PATCH 0225/2308] Add the group --- nixos/shared-desktop/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index b34a2e4..8970760 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -161,6 +161,8 @@ boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; + users.groups.mssql = {}; + users.users = { lillian = { isNormalUser = true; From a03897a18eb68300f64c7096e9f346d9ad775f7e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:58:13 +0100 Subject: [PATCH 0226/2308] Add the group --- nixos/shared-desktop/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index b34a2e4..8970760 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -161,6 +161,8 @@ boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; + users.groups.mssql = {}; + users.users = { lillian = { isNormalUser = true; From 9d492f5211455a61405fb4020ff8334b5832cb52 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 14:05:44 +0100 Subject: [PATCH 0227/2308] Change some small stuff --- nixos/shared-desktop/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 8970760..9f45eeb 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -178,12 +178,12 @@ virtualisation.oci-containers.containers = { mssql = { image = "mcr.microsoft.com/mssql/server:2022-latest"; - ports = ["127.0.0.1:1433:1433"]; + ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "y"; "MSSQL_SA_PASSWORD" = "password"; }; - volumes = ["/var/lib/myssql"]; + volumes = ["/home/lillian/docker/mssql:/data"]; }; }; From b91ad875672271ac166c1ac8353ae9c22ad4e621 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 14:05:44 +0100 Subject: [PATCH 0228/2308] Change some small stuff --- nixos/shared-desktop/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 8970760..9f45eeb 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -178,12 +178,12 @@ virtualisation.oci-containers.containers = { mssql = { image = "mcr.microsoft.com/mssql/server:2022-latest"; - ports = ["127.0.0.1:1433:1433"]; + ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "y"; "MSSQL_SA_PASSWORD" = "password"; }; - volumes = ["/var/lib/myssql"]; + volumes = ["/home/lillian/docker/mssql:/data"]; }; }; From 20b4491f48166c9da92333ae6a48b5d2b7967da1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 14:14:34 +0100 Subject: [PATCH 0229/2308] Quotes --- nixos/shared-desktop/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 9f45eeb..73a354f 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -180,8 +180,8 @@ image = "mcr.microsoft.com/mssql/server:2022-latest"; ports = ["1433:1433"]; environment = { - "ACCEPT_EULA" = "y"; - "MSSQL_SA_PASSWORD" = "password"; + "\"ACCEPT_EULA" = "Y\""; + "\"MSSQL_SA_PASSWORD" = "password\""; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From 9fce29a2f094dc59f8e5588854c8bfb1d5530c88 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 14:14:34 +0100 Subject: [PATCH 0230/2308] Quotes --- nixos/shared-desktop/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 9f45eeb..73a354f 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -180,8 +180,8 @@ image = "mcr.microsoft.com/mssql/server:2022-latest"; ports = ["1433:1433"]; environment = { - "ACCEPT_EULA" = "y"; - "MSSQL_SA_PASSWORD" = "password"; + "\"ACCEPT_EULA" = "Y\""; + "\"MSSQL_SA_PASSWORD" = "password\""; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From 1e8e483f26ce513d77134593b0c22c113847a359 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 14:16:25 +0100 Subject: [PATCH 0231/2308] Nope --- nixos/shared-desktop/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 73a354f..ec27c25 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -180,8 +180,8 @@ image = "mcr.microsoft.com/mssql/server:2022-latest"; ports = ["1433:1433"]; environment = { - "\"ACCEPT_EULA" = "Y\""; - "\"MSSQL_SA_PASSWORD" = "password\""; + "ACCEPT_EULA" = "Y"; + "MSSQL_SA_PASSWORD" = "password"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From d0ac09f9aa39687246a6d42ea7aff7705c0ef6d5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 14:16:25 +0100 Subject: [PATCH 0232/2308] Nope --- nixos/shared-desktop/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 73a354f..ec27c25 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -180,8 +180,8 @@ image = "mcr.microsoft.com/mssql/server:2022-latest"; ports = ["1433:1433"]; environment = { - "\"ACCEPT_EULA" = "Y\""; - "\"MSSQL_SA_PASSWORD" = "password\""; + "ACCEPT_EULA" = "Y"; + "MSSQL_SA_PASSWORD" = "password"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From e434b108188d8c09fd4cbb71260e05ddee5c2f6d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 14:27:23 +0100 Subject: [PATCH 0233/2308] password more secure the issue? --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index ec27c25..c89ebdc 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -181,7 +181,7 @@ ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "password"; + "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From 27af9a016357dae017eb9a9cb4c09976f116dcaa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 14:27:23 +0100 Subject: [PATCH 0234/2308] password more secure the issue? --- nixos/shared-desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index ec27c25..c89ebdc 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -181,7 +181,7 @@ ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "password"; + "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From 8c6ee6423bca0c043f01a2f81beae049ad821c4c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 15:26:04 +0100 Subject: [PATCH 0235/2308] Let's try and update this package --- pkgs/azuredatastudio/default.nix | 195 +++++++++++++++++++++++++++++++ pkgs/default.nix | 1 + 2 files changed, 196 insertions(+) create mode 100644 pkgs/azuredatastudio/default.nix diff --git a/pkgs/azuredatastudio/default.nix b/pkgs/azuredatastudio/default.nix new file mode 100644 index 0000000..880fa8f --- /dev/null +++ b/pkgs/azuredatastudio/default.nix @@ -0,0 +1,195 @@ +{ + stdenv, + lib, + fetchurl, + copyDesktopItems, + makeDesktopItem, + makeWrapper, + alsa-lib, + at-spi2-atk, + at-spi2-core, + cairo, + cups, + curl, + dbus, + expat, + gdk-pixbuf, + glib, + gnutar, + gtk3, + icu, + libdrm, + libunwind, + libuuid, + libxkbcommon, + mesa, + nspr, + nss, + openssl, + pango, + systemd, + xorg, + zlib, +}: +# from justinwoo/azuredatastudio-nix +# https://github.com/justinwoo/azuredatastudio-nix/blob/537c48aa3981cd1a82d5d6e508ab7e7393b3d7c8/default.nix +let + desktopItem = makeDesktopItem { + name = "azuredatastudio"; + desktopName = "Azure Data Studio"; + comment = "Data Management Tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux."; + genericName = "Text Editor"; + exec = "azuredatastudio --no-sandbox --unity-launch %F"; + icon = "azuredatastudio"; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = ["Utility" "TextEditor" "Development" "IDE"]; + mimeTypes = ["text/plain" "inode/directory" "application/x-azuredatastudio-workspace"]; + keywords = ["azuredatastudio"]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "azuredatastudio --no-sandbox --new-window %F"; + icon = "azuredatastudio"; + }; + }; + + urlHandlerDesktopItem = makeDesktopItem { + name = "azuredatastudio-url-handler"; + desktopName = "Azure Data Studio - URL Handler"; + comment = "Azure Data Studio"; + genericName = "Text Editor"; + exec = "azuredatastudio --no-sandbox --open-url %U"; + icon = "azuredatastudio"; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = ["Utility" "TextEditor" "Development" "IDE"]; + mimeTypes = ["x-scheme-handler/azuredatastudio"]; + keywords = ["azuredatastudio"]; + noDisplay = true; + }; +in + stdenv.mkDerivation rec { + pname = "azuredatastudio"; + version = "1.47.0"; + + desktopItems = [desktopItem urlHandlerDesktopItem]; + + src = fetchurl { + name = "${pname}-${version}.tar.gz"; + url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; + sha256 = "0e094179ffb883d0da8fdbe9721a32402303bf68f411445f2d="; + }; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + libuuid + at-spi2-core + at-spi2-atk + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/pixmaps + cp ${targetPath}/resources/app/resources/linux/code.png $out/share/pixmaps/azuredatastudio.png + + runHook postInstall + ''; + + # change this to azuredatastudio-insiders for insiders releases + edition = "azuredatastudio"; + targetPath = "$out/${edition}"; + + unpackPhase = '' + mkdir -p ${targetPath} + ${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath} + ''; + + sqltoolsserviceRpath = lib.makeLibraryPath [ + stdenv.cc.cc + libunwind + libuuid + icu + openssl + zlib + curl + ]; + + # this will most likely need to be updated when azuredatastudio's version changes + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; + + rpath = lib.concatStringsSep ":" [ + (lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + mesa + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxshmfence + libxkbcommon + xorg.libxkbfile + pango + stdenv.cc.cc.lib + systemd + ]) + targetPath + sqltoolsserviceRpath + ]; + + fixupPhase = '' + fix_sqltoolsservice() + { + mv ${sqltoolsservicePath}/$1 ${sqltoolsservicePath}/$1_old + patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + ${sqltoolsservicePath}/$1_old + + makeWrapper \ + ${sqltoolsservicePath}/$1_old \ + ${sqltoolsservicePath}/$1 \ + --set LD_LIBRARY_PATH ${sqltoolsserviceRpath} + } + + fix_sqltoolsservice MicrosoftSqlToolsServiceLayer + fix_sqltoolsservice MicrosoftSqlToolsCredentials + fix_sqltoolsservice SqlToolsResourceProviderService + + patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + ${targetPath}/${edition} + + mkdir -p $out/bin + makeWrapper \ + ${targetPath}/bin/${edition} \ + $out/bin/azuredatastudio \ + --set LD_LIBRARY_PATH ${rpath} + ''; + + meta = { + maintainers = with lib.maintainers; [xavierzwirtz]; + description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; + homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; + sourceProvenance = with lib.sourceTypes; [binaryNativeCode]; + license = lib.licenses.unfreeRedistributable; + platforms = ["x86_64-linux"]; + }; + } diff --git a/pkgs/default.nix b/pkgs/default.nix index 3d9e23c..cc4f33d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,4 +2,5 @@ # You can build them using 'nix build .#example' pkgs: { # example = pkgs.callPackage ./example { }; + azuredatastudio = pkgs.callPackage ./azuredatastudio {}; } From 37118cd355ab65b7a8353237e3bf6eb00d753149 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 15:26:04 +0100 Subject: [PATCH 0236/2308] Let's try and update this package --- pkgs/azuredatastudio/default.nix | 195 +++++++++++++++++++++++++++++++ pkgs/default.nix | 1 + 2 files changed, 196 insertions(+) create mode 100644 pkgs/azuredatastudio/default.nix diff --git a/pkgs/azuredatastudio/default.nix b/pkgs/azuredatastudio/default.nix new file mode 100644 index 0000000..880fa8f --- /dev/null +++ b/pkgs/azuredatastudio/default.nix @@ -0,0 +1,195 @@ +{ + stdenv, + lib, + fetchurl, + copyDesktopItems, + makeDesktopItem, + makeWrapper, + alsa-lib, + at-spi2-atk, + at-spi2-core, + cairo, + cups, + curl, + dbus, + expat, + gdk-pixbuf, + glib, + gnutar, + gtk3, + icu, + libdrm, + libunwind, + libuuid, + libxkbcommon, + mesa, + nspr, + nss, + openssl, + pango, + systemd, + xorg, + zlib, +}: +# from justinwoo/azuredatastudio-nix +# https://github.com/justinwoo/azuredatastudio-nix/blob/537c48aa3981cd1a82d5d6e508ab7e7393b3d7c8/default.nix +let + desktopItem = makeDesktopItem { + name = "azuredatastudio"; + desktopName = "Azure Data Studio"; + comment = "Data Management Tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux."; + genericName = "Text Editor"; + exec = "azuredatastudio --no-sandbox --unity-launch %F"; + icon = "azuredatastudio"; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = ["Utility" "TextEditor" "Development" "IDE"]; + mimeTypes = ["text/plain" "inode/directory" "application/x-azuredatastudio-workspace"]; + keywords = ["azuredatastudio"]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "azuredatastudio --no-sandbox --new-window %F"; + icon = "azuredatastudio"; + }; + }; + + urlHandlerDesktopItem = makeDesktopItem { + name = "azuredatastudio-url-handler"; + desktopName = "Azure Data Studio - URL Handler"; + comment = "Azure Data Studio"; + genericName = "Text Editor"; + exec = "azuredatastudio --no-sandbox --open-url %U"; + icon = "azuredatastudio"; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = ["Utility" "TextEditor" "Development" "IDE"]; + mimeTypes = ["x-scheme-handler/azuredatastudio"]; + keywords = ["azuredatastudio"]; + noDisplay = true; + }; +in + stdenv.mkDerivation rec { + pname = "azuredatastudio"; + version = "1.47.0"; + + desktopItems = [desktopItem urlHandlerDesktopItem]; + + src = fetchurl { + name = "${pname}-${version}.tar.gz"; + url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; + sha256 = "0e094179ffb883d0da8fdbe9721a32402303bf68f411445f2d="; + }; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + libuuid + at-spi2-core + at-spi2-atk + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/pixmaps + cp ${targetPath}/resources/app/resources/linux/code.png $out/share/pixmaps/azuredatastudio.png + + runHook postInstall + ''; + + # change this to azuredatastudio-insiders for insiders releases + edition = "azuredatastudio"; + targetPath = "$out/${edition}"; + + unpackPhase = '' + mkdir -p ${targetPath} + ${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath} + ''; + + sqltoolsserviceRpath = lib.makeLibraryPath [ + stdenv.cc.cc + libunwind + libuuid + icu + openssl + zlib + curl + ]; + + # this will most likely need to be updated when azuredatastudio's version changes + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; + + rpath = lib.concatStringsSep ":" [ + (lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + mesa + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxshmfence + libxkbcommon + xorg.libxkbfile + pango + stdenv.cc.cc.lib + systemd + ]) + targetPath + sqltoolsserviceRpath + ]; + + fixupPhase = '' + fix_sqltoolsservice() + { + mv ${sqltoolsservicePath}/$1 ${sqltoolsservicePath}/$1_old + patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + ${sqltoolsservicePath}/$1_old + + makeWrapper \ + ${sqltoolsservicePath}/$1_old \ + ${sqltoolsservicePath}/$1 \ + --set LD_LIBRARY_PATH ${sqltoolsserviceRpath} + } + + fix_sqltoolsservice MicrosoftSqlToolsServiceLayer + fix_sqltoolsservice MicrosoftSqlToolsCredentials + fix_sqltoolsservice SqlToolsResourceProviderService + + patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + ${targetPath}/${edition} + + mkdir -p $out/bin + makeWrapper \ + ${targetPath}/bin/${edition} \ + $out/bin/azuredatastudio \ + --set LD_LIBRARY_PATH ${rpath} + ''; + + meta = { + maintainers = with lib.maintainers; [xavierzwirtz]; + description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; + homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; + sourceProvenance = with lib.sourceTypes; [binaryNativeCode]; + license = lib.licenses.unfreeRedistributable; + platforms = ["x86_64-linux"]; + }; + } diff --git a/pkgs/default.nix b/pkgs/default.nix index 3d9e23c..cc4f33d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,4 +2,5 @@ # You can build them using 'nix build .#example' pkgs: { # example = pkgs.callPackage ./example { }; + azuredatastudio = pkgs.callPackage ./azuredatastudio {}; } From ccc10dfc26d7b08a7e0967cae9ed8456257d07ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 17:44:07 +0100 Subject: [PATCH 0237/2308] Ensure user and db mariadb --- nixos/queen/nextcloud.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index f873757..3254ce4 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -73,13 +73,15 @@ #Directory for the database is /var/lib/mysql # Ensure the database, user, and permissions always exist - # ensureDatabases = ["NC"]; - # ensureUsers = [ - # { - # name = "nextcloud"; - # ensurePermissions."DATABASE NC" = "ALL PRIVILEGES"; - # } - # ]; + ensureDatabases = ["NC"]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions = { + "NC.*" = "ALL PRIVILEGES"; + }; + } + ]; }; systemd.services."nextcloud-setup" = { From f598882a52a6dcc2cf6afecd47854f072ba96634 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 17:44:07 +0100 Subject: [PATCH 0238/2308] Ensure user and db mariadb --- nixos/queen/nextcloud.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index f873757..3254ce4 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -73,13 +73,15 @@ #Directory for the database is /var/lib/mysql # Ensure the database, user, and permissions always exist - # ensureDatabases = ["NC"]; - # ensureUsers = [ - # { - # name = "nextcloud"; - # ensurePermissions."DATABASE NC" = "ALL PRIVILEGES"; - # } - # ]; + ensureDatabases = ["NC"]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions = { + "NC.*" = "ALL PRIVILEGES"; + }; + } + ]; }; systemd.services."nextcloud-setup" = { From 4a48610a201f4bdfb82bdcc4426fce618fa79646 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 17:46:20 +0100 Subject: [PATCH 0239/2308] add git --- nixos/queen/configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 68ecdf0..d7d7729 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -82,6 +82,7 @@ environment.systemPackages = with pkgs; [ age + git alejandra git-filter-repo home-manager @@ -124,6 +125,12 @@ enable = true; }; + programs.git = { + enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; + }; + security.acme = { acceptTerms = true; # Replace the email here! From e3c3116e2a8d2e99314a811ebfc14c1903dd82f8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 17:46:20 +0100 Subject: [PATCH 0240/2308] add git --- nixos/queen/configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 68ecdf0..d7d7729 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -82,6 +82,7 @@ environment.systemPackages = with pkgs; [ age + git alejandra git-filter-repo home-manager @@ -124,6 +125,12 @@ enable = true; }; + programs.git = { + enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; + }; + security.acme = { acceptTerms = true; # Replace the email here! From a0c1f8f9557021dfdfd10c62c629d38a3a7b0a5e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 17:48:21 +0100 Subject: [PATCH 0241/2308] Those are home manager options --- home-manager/desktop-shared.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index e668e4b..e4a7898 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -124,8 +124,6 @@ programs.home-manager.enable = true; programs.git = { enable = true; - userEmail = "git@gladtherescake.eu"; - userName = "Lillian-Violet"; }; # Nicely reload system units when changing configs From d1c854562be3bb4716012e3de43b44df07d6a928 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 17:48:21 +0100 Subject: [PATCH 0242/2308] Those are home manager options --- home-manager/desktop-shared.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index e668e4b..e4a7898 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -124,8 +124,6 @@ programs.home-manager.enable = true; programs.git = { enable = true; - userEmail = "git@gladtherescake.eu"; - userName = "Lillian-Violet"; }; # Nicely reload system units when changing configs From 2ee748a3545ceafb68d08fb5f6e22156287b4e93 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 17:49:10 +0100 Subject: [PATCH 0243/2308] Oops wrong file --- nixos/queen/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index d7d7729..932c527 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -127,8 +127,6 @@ programs.git = { enable = true; - userEmail = "git@gladtherescake.eu"; - userName = "Lillian-Violet"; }; security.acme = { From 97aa91958fb67e349ccb84b0513c94fece2d77ae Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 17:49:10 +0100 Subject: [PATCH 0244/2308] Oops wrong file --- nixos/queen/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index d7d7729..932c527 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -127,8 +127,6 @@ programs.git = { enable = true; - userEmail = "git@gladtherescake.eu"; - userName = "Lillian-Violet"; }; security.acme = { From d5ab44ec0083586548d73adc51f4b71afa53caec Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 18:27:35 +0100 Subject: [PATCH 0245/2308] Some small tweaks to mariadb --- home-manager/desktop-shared.nix | 2 ++ nixos/queen/nextcloud.nix | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index e4a7898..e668e4b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -124,6 +124,8 @@ programs.home-manager.enable = true; programs.git = { enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; }; # Nicely reload system units when changing configs diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 3254ce4..bec18a8 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -57,6 +57,7 @@ dbuser = "nextcloud"; dbhost = "/run/mysql"; dbname = "NC"; + dbport = 3306; dbpassFile = config.sops.secrets."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration @@ -66,6 +67,13 @@ }; services.mysql = { + settings = { + mysqld = { + log-error = "/var/log/mysql_err.log"; + port = 3306; + }; + }; + enable = true; package = pkgs.mariadb_110; From 6ac981a064f60d0db2b2c9ffc5296e6b4087f9ca Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 18:27:35 +0100 Subject: [PATCH 0246/2308] Some small tweaks to mariadb --- home-manager/desktop-shared.nix | 2 ++ nixos/queen/nextcloud.nix | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index e4a7898..e668e4b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -124,6 +124,8 @@ programs.home-manager.enable = true; programs.git = { enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; }; # Nicely reload system units when changing configs diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 3254ce4..bec18a8 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -57,6 +57,7 @@ dbuser = "nextcloud"; dbhost = "/run/mysql"; dbname = "NC"; + dbport = 3306; dbpassFile = config.sops.secrets."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration @@ -66,6 +67,13 @@ }; services.mysql = { + settings = { + mysqld = { + log-error = "/var/log/mysql_err.log"; + port = 3306; + }; + }; + enable = true; package = pkgs.mariadb_110; From 9f1229e68ec34b0632bfc16dc3743455ab9121b7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 18:46:08 +0100 Subject: [PATCH 0247/2308] Databas config according to nextcloud docs --- nixos/queen/nextcloud.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index bec18a8..886fb62 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -68,9 +68,33 @@ services.mysql = { settings = { + server = { + skip_name_resolve = 1; + innodb_buffer_pool_size = "128M"; + innodb_buffer_pool_instances = 1; + innodb_flush_log_at_trx_commit = 2; + innodb_log_buffer_size = "32M"; + innodb_max_dirty_pages_pct = 90; + query_cache_type = 1; + query_cache_limit = "2M"; + query_cache_min_res_unit = "2k"; + query_cache_size = "64M"; + tmp_table_size = "64M"; + max_heap_table_size = "64M"; + slow_query_log = 1; + slow_query_log_file = /var/log/mysql/slow.log; + long_query_time = 1; + }; mysqld = { log-error = "/var/log/mysql_err.log"; port = 3306; + character_set_server = utf8mb4; + collation_server = utf8mb4_general_ci; + transaction_isolation = READ-COMMITTED; + binlog_format = ROW; + innodb_large_prefix = on; + innodb_file_format = barracuda; + innodb_file_per_table = 1; }; }; From a45a5d91e43bf167f6085f0c4688f5874ba118df Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 18:46:08 +0100 Subject: [PATCH 0248/2308] Databas config according to nextcloud docs --- nixos/queen/nextcloud.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index bec18a8..886fb62 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -68,9 +68,33 @@ services.mysql = { settings = { + server = { + skip_name_resolve = 1; + innodb_buffer_pool_size = "128M"; + innodb_buffer_pool_instances = 1; + innodb_flush_log_at_trx_commit = 2; + innodb_log_buffer_size = "32M"; + innodb_max_dirty_pages_pct = 90; + query_cache_type = 1; + query_cache_limit = "2M"; + query_cache_min_res_unit = "2k"; + query_cache_size = "64M"; + tmp_table_size = "64M"; + max_heap_table_size = "64M"; + slow_query_log = 1; + slow_query_log_file = /var/log/mysql/slow.log; + long_query_time = 1; + }; mysqld = { log-error = "/var/log/mysql_err.log"; port = 3306; + character_set_server = utf8mb4; + collation_server = utf8mb4_general_ci; + transaction_isolation = READ-COMMITTED; + binlog_format = ROW; + innodb_large_prefix = on; + innodb_file_format = barracuda; + innodb_file_per_table = 1; }; }; From 12150a8248d2800c10717257089c35ecf6c1496c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 18:47:35 +0100 Subject: [PATCH 0249/2308] Make it all quotes --- nixos/queen/nextcloud.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 886fb62..ccf664a 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -88,12 +88,12 @@ mysqld = { log-error = "/var/log/mysql_err.log"; port = 3306; - character_set_server = utf8mb4; - collation_server = utf8mb4_general_ci; - transaction_isolation = READ-COMMITTED; - binlog_format = ROW; - innodb_large_prefix = on; - innodb_file_format = barracuda; + character_set_server = "utf8mb4"; + collation_server = "utf8mb4_general_ci"; + transaction_isolation = "READ-COMMITTED"; + binlog_format = "ROW"; + innodb_large_prefix = "on"; + innodb_file_format = "barracuda"; innodb_file_per_table = 1; }; }; From b2e7e05aac3b744928e7f34c1d73fa0b44f169d3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 18:47:35 +0100 Subject: [PATCH 0250/2308] Make it all quotes --- nixos/queen/nextcloud.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 886fb62..ccf664a 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -88,12 +88,12 @@ mysqld = { log-error = "/var/log/mysql_err.log"; port = 3306; - character_set_server = utf8mb4; - collation_server = utf8mb4_general_ci; - transaction_isolation = READ-COMMITTED; - binlog_format = ROW; - innodb_large_prefix = on; - innodb_file_format = barracuda; + character_set_server = "utf8mb4"; + collation_server = "utf8mb4_general_ci"; + transaction_isolation = "READ-COMMITTED"; + binlog_format = "ROW"; + innodb_large_prefix = "on"; + innodb_file_format = "barracuda"; innodb_file_per_table = 1; }; }; From f7cce5f0acde89065c31247c4f58800dca258b34 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 18:48:46 +0100 Subject: [PATCH 0251/2308] Paths just don't bother --- nixos/queen/nextcloud.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index ccf664a..36b72c7 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -82,11 +82,9 @@ tmp_table_size = "64M"; max_heap_table_size = "64M"; slow_query_log = 1; - slow_query_log_file = /var/log/mysql/slow.log; long_query_time = 1; }; mysqld = { - log-error = "/var/log/mysql_err.log"; port = 3306; character_set_server = "utf8mb4"; collation_server = "utf8mb4_general_ci"; From c8dca6a6ccaf4463a32a29b57003c26e04b215fe Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 18:48:46 +0100 Subject: [PATCH 0252/2308] Paths just don't bother --- nixos/queen/nextcloud.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index ccf664a..36b72c7 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -82,11 +82,9 @@ tmp_table_size = "64M"; max_heap_table_size = "64M"; slow_query_log = 1; - slow_query_log_file = /var/log/mysql/slow.log; long_query_time = 1; }; mysqld = { - log-error = "/var/log/mysql_err.log"; port = 3306; character_set_server = "utf8mb4"; collation_server = "utf8mb4_general_ci"; From 914077ae5092972d734170d611206f1f1b0bf92a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 21:01:10 +0100 Subject: [PATCH 0253/2308] We don't need a port if we use the local mysql --- nixos/queen/nextcloud.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 36b72c7..04399af 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -55,9 +55,8 @@ # Nextcloud PostegreSQL database configuration, recommended over using SQLite dbtype = "mysql"; dbuser = "nextcloud"; - dbhost = "/run/mysql"; + dbhost = "mysql"; dbname = "NC"; - dbport = 3306; dbpassFile = config.sops.secrets."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration From 8f80988875f1e00406a737a77ab47612e3e704ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 21:01:10 +0100 Subject: [PATCH 0254/2308] We don't need a port if we use the local mysql --- nixos/queen/nextcloud.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 36b72c7..04399af 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -55,9 +55,8 @@ # Nextcloud PostegreSQL database configuration, recommended over using SQLite dbtype = "mysql"; dbuser = "nextcloud"; - dbhost = "/run/mysql"; + dbhost = "mysql"; dbname = "NC"; - dbport = 3306; dbpassFile = config.sops.secrets."nextclouddb".path; #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration From 709ec2f0d0b7578d8868095e17baa2f8fcd02be6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 21:32:50 +0100 Subject: [PATCH 0255/2308] Require sops for systemctl --- nixos/queen/nextcloud.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 04399af..4cf034b 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -59,7 +59,6 @@ dbname = "NC"; dbpassFile = config.sops.secrets."nextclouddb".path; - #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "gladtherescake"; }; @@ -114,7 +113,7 @@ }; systemd.services."nextcloud-setup" = { - requires = ["mysql.service"]; - after = ["mysql.service"]; + requires = ["mysql.service" "sops-nix.service"]; + after = ["mysql.service" "sops-nix.service"]; }; } From 88ea68b1cc45e7e57977bff0489d532275aabe54 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 21:32:50 +0100 Subject: [PATCH 0256/2308] Require sops for systemctl --- nixos/queen/nextcloud.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 04399af..4cf034b 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -59,7 +59,6 @@ dbname = "NC"; dbpassFile = config.sops.secrets."nextclouddb".path; - #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "gladtherescake"; }; @@ -114,7 +113,7 @@ }; systemd.services."nextcloud-setup" = { - requires = ["mysql.service"]; - after = ["mysql.service"]; + requires = ["mysql.service" "sops-nix.service"]; + after = ["mysql.service" "sops-nix.service"]; }; } From f968da2a88bcefba1b09512d1441f2937fb73571 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 21:36:49 +0100 Subject: [PATCH 0257/2308] Maybe actually read sops documentation? --- nixos/queen/nextcloud.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 4cf034b..de1f434 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -112,8 +112,10 @@ ]; }; + systemd.user.services.mbsync.Unit.After = ["sops-nix.service"]; + systemd.services."nextcloud-setup" = { - requires = ["mysql.service" "sops-nix.service"]; - after = ["mysql.service" "sops-nix.service"]; + requires = ["mysql.service"]; + after = ["mysql.service"]; }; } From 324308218a9f3d76c15831faa84cbe46216373e1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 21:36:49 +0100 Subject: [PATCH 0258/2308] Maybe actually read sops documentation? --- nixos/queen/nextcloud.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 4cf034b..de1f434 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -112,8 +112,10 @@ ]; }; + systemd.user.services.mbsync.Unit.After = ["sops-nix.service"]; + systemd.services."nextcloud-setup" = { - requires = ["mysql.service" "sops-nix.service"]; - after = ["mysql.service" "sops-nix.service"]; + requires = ["mysql.service"]; + after = ["mysql.service"]; }; } From 39e2ba8002e2f046d6c14756411392136d4057de Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 21:39:35 +0100 Subject: [PATCH 0259/2308] Maybe I needed to specify nextcloud? --- nixos/queen/nextcloud.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index de1f434..2f0e99b 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -112,10 +112,9 @@ ]; }; - systemd.user.services.mbsync.Unit.After = ["sops-nix.service"]; - systemd.services."nextcloud-setup" = { requires = ["mysql.service"]; after = ["mysql.service"]; }; + systemd.user.services."nextcloud-setup".Unit.After = ["sops-nix.service"]; } From eefec8f9071a197e52ac83b051a8e12be9c46cf2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 21:39:35 +0100 Subject: [PATCH 0260/2308] Maybe I needed to specify nextcloud? --- nixos/queen/nextcloud.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index de1f434..2f0e99b 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -112,10 +112,9 @@ ]; }; - systemd.user.services.mbsync.Unit.After = ["sops-nix.service"]; - systemd.services."nextcloud-setup" = { requires = ["mysql.service"]; after = ["mysql.service"]; }; + systemd.user.services."nextcloud-setup".Unit.After = ["sops-nix.service"]; } From 17a99b9bbff0b302e5f01f7970502128c06658a3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 13:11:03 +0100 Subject: [PATCH 0261/2308] Try and run sops first? --- nixos/queen/nextcloud.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 2f0e99b..af463d4 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -112,9 +112,12 @@ ]; }; + systemd.services."sops-nix.service" = { + before = ["nextcloud-setup" "mysql.service"]; + }; + systemd.services."nextcloud-setup" = { requires = ["mysql.service"]; after = ["mysql.service"]; }; - systemd.user.services."nextcloud-setup".Unit.After = ["sops-nix.service"]; } From 679ef2ac5eaf81c123199834ecb7cd6658dde914 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 13:11:03 +0100 Subject: [PATCH 0262/2308] Try and run sops first? --- nixos/queen/nextcloud.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 2f0e99b..af463d4 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -112,9 +112,12 @@ ]; }; + systemd.services."sops-nix.service" = { + before = ["nextcloud-setup" "mysql.service"]; + }; + systemd.services."nextcloud-setup" = { requires = ["mysql.service"]; after = ["mysql.service"]; }; - systemd.user.services."nextcloud-setup".Unit.After = ["sops-nix.service"]; } From a589470b109d302b0f08827a1b6460cb4b909ddf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 13:12:27 +0100 Subject: [PATCH 0263/2308] forgot the .service --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index af463d4..9adcd8d 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -113,7 +113,7 @@ }; systemd.services."sops-nix.service" = { - before = ["nextcloud-setup" "mysql.service"]; + before = ["nextcloud-setup.service" "mysql.service"]; }; systemd.services."nextcloud-setup" = { From 15b9a21a688fe8df181ed4cf35b277c4ea800b60 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 13:12:27 +0100 Subject: [PATCH 0264/2308] forgot the .service --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index af463d4..9adcd8d 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -113,7 +113,7 @@ }; systemd.services."sops-nix.service" = { - before = ["nextcloud-setup" "mysql.service"]; + before = ["nextcloud-setup.service" "mysql.service"]; }; systemd.services."nextcloud-setup" = { From 66720ab96aff18cdc67b2ef037faa546d2ab3647 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 13:33:28 +0100 Subject: [PATCH 0265/2308] Might not need this? --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 9adcd8d..1346505 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -57,7 +57,7 @@ dbuser = "nextcloud"; dbhost = "mysql"; dbname = "NC"; - dbpassFile = config.sops.secrets."nextclouddb".path; + #dbpassFile = config.sops.secrets."nextclouddb".path; adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "gladtherescake"; From 415f929a66d092c2da86f2f5a13da1d063f58392 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 13:33:28 +0100 Subject: [PATCH 0266/2308] Might not need this? --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 9adcd8d..1346505 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -57,7 +57,7 @@ dbuser = "nextcloud"; dbhost = "mysql"; dbname = "NC"; - dbpassFile = config.sops.secrets."nextclouddb".path; + #dbpassFile = config.sops.secrets."nextclouddb".path; adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "gladtherescake"; From 6455331c14ae657b2f9c5bf94790be92dcb30e26 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:24:44 +0100 Subject: [PATCH 0267/2308] Add fzf --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 932c527..6b9faf2 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -82,6 +82,7 @@ environment.systemPackages = with pkgs; [ age + fzf git alejandra git-filter-repo From fdc9d967c8683523a635534fa8938c2f33c1229e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:24:44 +0100 Subject: [PATCH 0268/2308] Add fzf --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 932c527..6b9faf2 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -82,6 +82,7 @@ environment.systemPackages = with pkgs; [ age + fzf git alejandra git-filter-repo From d932ba27a609235629ef13c0ec5acc7cbd6fd8d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:35:01 +0100 Subject: [PATCH 0269/2308] Let's try this found config --- nixos/queen/configuration.nix | 4 +- nixos/queen/nextcloud.nix | 191 ++++++++++++++++------------------ 2 files changed, 89 insertions(+), 106 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6b9faf2..93d5944 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -53,9 +53,7 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; - sops.secrets."nextcloudadmin".mode = "0400"; - sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; - sops.secrets."nextclouddb".mode = "0400"; + sops.secrets."nextclouddb".mode = "0440"; sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; nix = { diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 1346505..e7b6262 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -1,123 +1,108 @@ +# Nextcloud { - inputs, - outputs, - lib, config, + lib, pkgs, + sops, ... }: { - #this came from https://jacobneplokh.com/how-to-setup-nextcloud-on-nixos/ - services.nginx = { - enable = true; - - # Use recommended settings - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - - # Only allow PFS-enabled ciphers with AES256 - sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL"; - - # Setup Nextcloud virtual host to listen on ports - virtualHosts = { - "nextcloud.gladtherescake.eu" = { - ## Force HTTP redirect to HTTPS - forceSSL = true; - ## LetsEncrypt - enableACME = true; - }; - }; + sops.secrets.nextcloudadmin = { + mode = "0440"; + owner = config.users.users.nextcloud.name; + group = config.users.users.nextcloud.group; }; + users.users.nextcloud.extraGroups = ["render" "users"]; + + environment.systemPackages = with pkgs; [ + unstable.exiftool + ffmpeg + nodejs_18 + ]; + + # Allow using /dev/dri for Memories + systemd.services.phpfpm-nextcloud.serviceConfig = { + PrivateDevices = lib.mkForce false; + }; + + services.nginx.virtualHosts."nextcloud.gladtherescake.eu".listen = [ + { + addr = "127.0.0.1"; + port = 8180; + } + ]; + services.nextcloud = { enable = true; - hostName = "nextcloud.gladtherescake.eu"; - - # Use HTTPS for links - https = true; - - # Auto-update Nextcloud Apps - autoUpdateApps.enable = true; - # Set what time makes sense for you - autoUpdateApps.startAt = "05:00:00"; - - configureRedis = true; - package = pkgs.nextcloud27; - - #Directory for the data is /var/lib/nextcloud - + hostName = "nextcloud.gladtherescake.eu"; + database.createLocally = true; + configureRedis = true; + appstoreEnable = true; config = { - # Further forces Nextcloud to use HTTPS - overwriteProtocol = "https"; - - # Nextcloud PostegreSQL database configuration, recommended over using SQLite + adminuser = "nextcloud"; + adminpassFile = "${config.sops.secrets.nextcloudadmin.path}"; dbtype = "mysql"; - dbuser = "nextcloud"; - dbhost = "mysql"; - dbname = "NC"; - #dbpassFile = config.sops.secrets."nextclouddb".path; + defaultPhoneRegion = "US"; + trustedProxies = ["127.0.0.1"]; + }; - adminpassFile = config.sops.secrets."nextcloudadmin".path; - adminuser = "gladtherescake"; + extraOptions = { + mail_smtpmode = "sendmail"; + mail_sendmailmode = "pipe"; + mysql.utf8mb4 = true; + }; + + phpOptions = { + "opcache.interned_strings_buffer" = "16"; + "upload_max_filesize" = "10G"; + "post_max_size" = "10G"; + "memory_limit" = "8G"; }; }; - services.mysql = { - settings = { - server = { - skip_name_resolve = 1; - innodb_buffer_pool_size = "128M"; - innodb_buffer_pool_instances = 1; - innodb_flush_log_at_trx_commit = 2; - innodb_log_buffer_size = "32M"; - innodb_max_dirty_pages_pct = 90; - query_cache_type = 1; - query_cache_limit = "2M"; - query_cache_min_res_unit = "2k"; - query_cache_size = "64M"; - tmp_table_size = "64M"; - max_heap_table_size = "64M"; - slow_query_log = 1; - long_query_time = 1; - }; - mysqld = { - port = 3306; - character_set_server = "utf8mb4"; - collation_server = "utf8mb4_general_ci"; - transaction_isolation = "READ-COMMITTED"; - binlog_format = "ROW"; - innodb_large_prefix = "on"; - innodb_file_format = "barracuda"; - innodb_file_per_table = 1; - }; + services.traefik.dynamicConfigOptions.http.routers.nextcloud = { + rule = "Host(`nextcloud.gladtherescake.eu`)"; + service = "nextcloud"; + middlewares = ["headers"]; + entrypoints = ["websecure"]; + tls = { + certResolver = "le"; + }; + }; + + services.traefik.dynamicConfigOptions.http.services.nextcloud = { + loadBalancer = { + servers = [ + { + url = "http://localhost:8180"; + } + ]; + }; + }; + + systemd.timers."nextcloud-files-update" = { + wantedBy = ["timers.target"]; + timerConfig = { + OnBootSec = "2m"; + OnUnitActiveSec = "15m"; + Unit = "nextcloud-files-update.service"; + }; + }; + + systemd.services."nextcloud-files-update" = { + bindsTo = ["mysql.service" "phpfpm-nextcloud.service"]; + after = ["mysql.service" "phpfpm-nextcloud.service"]; + script = '' + + ${config.services.nextcloud.occ}/bin/nextcloud-occ files:scan -q --all + ${config.services.nextcloud.occ}/bin/nextcloud-occ preview:pre-generate + ''; + + serviceConfig = { + User = "nextcloud"; }; - enable = true; - - package = pkgs.mariadb_110; - - #Directory for the database is /var/lib/mysql - - # Ensure the database, user, and permissions always exist - ensureDatabases = ["NC"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions = { - "NC.*" = "ALL PRIVILEGES"; - }; - } - ]; - }; - - systemd.services."sops-nix.service" = { - before = ["nextcloud-setup.service" "mysql.service"]; - }; - - systemd.services."nextcloud-setup" = { - requires = ["mysql.service"]; - after = ["mysql.service"]; + path = ["config.services.nextcloud" pkgs.perl]; }; } From cfd200ca2f8f1dab217b055b23f1cc635830a18f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:35:01 +0100 Subject: [PATCH 0270/2308] Let's try this found config --- nixos/queen/configuration.nix | 4 +- nixos/queen/nextcloud.nix | 191 ++++++++++++++++------------------ 2 files changed, 89 insertions(+), 106 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6b9faf2..93d5944 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -53,9 +53,7 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; - sops.secrets."nextcloudadmin".mode = "0400"; - sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; - sops.secrets."nextclouddb".mode = "0400"; + sops.secrets."nextclouddb".mode = "0440"; sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; nix = { diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 1346505..e7b6262 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -1,123 +1,108 @@ +# Nextcloud { - inputs, - outputs, - lib, config, + lib, pkgs, + sops, ... }: { - #this came from https://jacobneplokh.com/how-to-setup-nextcloud-on-nixos/ - services.nginx = { - enable = true; - - # Use recommended settings - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - - # Only allow PFS-enabled ciphers with AES256 - sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL"; - - # Setup Nextcloud virtual host to listen on ports - virtualHosts = { - "nextcloud.gladtherescake.eu" = { - ## Force HTTP redirect to HTTPS - forceSSL = true; - ## LetsEncrypt - enableACME = true; - }; - }; + sops.secrets.nextcloudadmin = { + mode = "0440"; + owner = config.users.users.nextcloud.name; + group = config.users.users.nextcloud.group; }; + users.users.nextcloud.extraGroups = ["render" "users"]; + + environment.systemPackages = with pkgs; [ + unstable.exiftool + ffmpeg + nodejs_18 + ]; + + # Allow using /dev/dri for Memories + systemd.services.phpfpm-nextcloud.serviceConfig = { + PrivateDevices = lib.mkForce false; + }; + + services.nginx.virtualHosts."nextcloud.gladtherescake.eu".listen = [ + { + addr = "127.0.0.1"; + port = 8180; + } + ]; + services.nextcloud = { enable = true; - hostName = "nextcloud.gladtherescake.eu"; - - # Use HTTPS for links - https = true; - - # Auto-update Nextcloud Apps - autoUpdateApps.enable = true; - # Set what time makes sense for you - autoUpdateApps.startAt = "05:00:00"; - - configureRedis = true; - package = pkgs.nextcloud27; - - #Directory for the data is /var/lib/nextcloud - + hostName = "nextcloud.gladtherescake.eu"; + database.createLocally = true; + configureRedis = true; + appstoreEnable = true; config = { - # Further forces Nextcloud to use HTTPS - overwriteProtocol = "https"; - - # Nextcloud PostegreSQL database configuration, recommended over using SQLite + adminuser = "nextcloud"; + adminpassFile = "${config.sops.secrets.nextcloudadmin.path}"; dbtype = "mysql"; - dbuser = "nextcloud"; - dbhost = "mysql"; - dbname = "NC"; - #dbpassFile = config.sops.secrets."nextclouddb".path; + defaultPhoneRegion = "US"; + trustedProxies = ["127.0.0.1"]; + }; - adminpassFile = config.sops.secrets."nextcloudadmin".path; - adminuser = "gladtherescake"; + extraOptions = { + mail_smtpmode = "sendmail"; + mail_sendmailmode = "pipe"; + mysql.utf8mb4 = true; + }; + + phpOptions = { + "opcache.interned_strings_buffer" = "16"; + "upload_max_filesize" = "10G"; + "post_max_size" = "10G"; + "memory_limit" = "8G"; }; }; - services.mysql = { - settings = { - server = { - skip_name_resolve = 1; - innodb_buffer_pool_size = "128M"; - innodb_buffer_pool_instances = 1; - innodb_flush_log_at_trx_commit = 2; - innodb_log_buffer_size = "32M"; - innodb_max_dirty_pages_pct = 90; - query_cache_type = 1; - query_cache_limit = "2M"; - query_cache_min_res_unit = "2k"; - query_cache_size = "64M"; - tmp_table_size = "64M"; - max_heap_table_size = "64M"; - slow_query_log = 1; - long_query_time = 1; - }; - mysqld = { - port = 3306; - character_set_server = "utf8mb4"; - collation_server = "utf8mb4_general_ci"; - transaction_isolation = "READ-COMMITTED"; - binlog_format = "ROW"; - innodb_large_prefix = "on"; - innodb_file_format = "barracuda"; - innodb_file_per_table = 1; - }; + services.traefik.dynamicConfigOptions.http.routers.nextcloud = { + rule = "Host(`nextcloud.gladtherescake.eu`)"; + service = "nextcloud"; + middlewares = ["headers"]; + entrypoints = ["websecure"]; + tls = { + certResolver = "le"; + }; + }; + + services.traefik.dynamicConfigOptions.http.services.nextcloud = { + loadBalancer = { + servers = [ + { + url = "http://localhost:8180"; + } + ]; + }; + }; + + systemd.timers."nextcloud-files-update" = { + wantedBy = ["timers.target"]; + timerConfig = { + OnBootSec = "2m"; + OnUnitActiveSec = "15m"; + Unit = "nextcloud-files-update.service"; + }; + }; + + systemd.services."nextcloud-files-update" = { + bindsTo = ["mysql.service" "phpfpm-nextcloud.service"]; + after = ["mysql.service" "phpfpm-nextcloud.service"]; + script = '' + + ${config.services.nextcloud.occ}/bin/nextcloud-occ files:scan -q --all + ${config.services.nextcloud.occ}/bin/nextcloud-occ preview:pre-generate + ''; + + serviceConfig = { + User = "nextcloud"; }; - enable = true; - - package = pkgs.mariadb_110; - - #Directory for the database is /var/lib/mysql - - # Ensure the database, user, and permissions always exist - ensureDatabases = ["NC"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions = { - "NC.*" = "ALL PRIVILEGES"; - }; - } - ]; - }; - - systemd.services."sops-nix.service" = { - before = ["nextcloud-setup.service" "mysql.service"]; - }; - - systemd.services."nextcloud-setup" = { - requires = ["mysql.service"]; - after = ["mysql.service"]; + path = ["config.services.nextcloud" pkgs.perl]; }; } From 7ed171ac0dbf9c853f2dc0e68971a7b11d76360c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:37:28 +0100 Subject: [PATCH 0271/2308] Conflicting config options, let's not be difficult --- nixos/queen/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index e7b6262..a669626 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -57,7 +57,6 @@ "opcache.interned_strings_buffer" = "16"; "upload_max_filesize" = "10G"; "post_max_size" = "10G"; - "memory_limit" = "8G"; }; }; From 0ce4658e7d7cd7978d7f2edc7aa7f7693bbed416 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:37:28 +0100 Subject: [PATCH 0272/2308] Conflicting config options, let's not be difficult --- nixos/queen/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index e7b6262..a669626 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -57,7 +57,6 @@ "opcache.interned_strings_buffer" = "16"; "upload_max_filesize" = "10G"; "post_max_size" = "10G"; - "memory_limit" = "8G"; }; }; From 24ddf9b431fe227137d6764afc8e92254e386e5f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:41:02 +0100 Subject: [PATCH 0273/2308] Force config? --- nixos/queen/nextcloud.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index a669626..8118582 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,10 +53,11 @@ mysql.utf8mb4 = true; }; - phpOptions = { + phpOptions = pkgs.lib.mkForce { "opcache.interned_strings_buffer" = "16"; "upload_max_filesize" = "10G"; "post_max_size" = "10G"; + "memory_limit" = "8G"; }; }; From dc579e6c8727da34b68d5e33ae7b1fa1580aa639 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:41:02 +0100 Subject: [PATCH 0274/2308] Force config? --- nixos/queen/nextcloud.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index a669626..8118582 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -53,10 +53,11 @@ mysql.utf8mb4 = true; }; - phpOptions = { + phpOptions = pkgs.lib.mkForce { "opcache.interned_strings_buffer" = "16"; "upload_max_filesize" = "10G"; "post_max_size" = "10G"; + "memory_limit" = "8G"; }; }; From e6d3729d57b959befc391703d1201f333551ab0a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:55:06 +0100 Subject: [PATCH 0275/2308] Let's try postgres I guess --- nixos/queen/configuration.nix | 4 +- nixos/queen/nextcloud.nix | 150 ++++++++++++++-------------------- 2 files changed, 65 insertions(+), 89 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 93d5944..3aa0472 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -53,6 +53,8 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; + sops.secrets."nextcloudadmin".mode = "0440"; + sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; sops.secrets."nextclouddb".mode = "0440"; sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; @@ -91,7 +93,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - mariadb_110 + postgresql rsync wget zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 8118582..2e0e073 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -1,108 +1,82 @@ -# Nextcloud { config, - lib, pkgs, - sops, ... }: { - sops.secrets.nextcloudadmin = { - mode = "0440"; - owner = config.users.users.nextcloud.name; - group = config.users.users.nextcloud.group; + # Enable Nginx + services.nginx = { + enable = true; + + # Use recommended settings + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + + # Only allow PFS-enabled ciphers with AES256 + sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL"; + + # Setup Nextcloud virtual host to listen on ports + virtualHosts = { + "nextcloud.gladtherescake.eu" = { + ## Force HTTP redirect to HTTPS + forceSSL = true; + ## LetsEncrypt + enableACME = true; + }; + }; }; - users.users.nextcloud.extraGroups = ["render" "users"]; - - environment.systemPackages = with pkgs; [ - unstable.exiftool - ffmpeg - nodejs_18 - ]; - - # Allow using /dev/dri for Memories - systemd.services.phpfpm-nextcloud.serviceConfig = { - PrivateDevices = lib.mkForce false; - }; - - services.nginx.virtualHosts."nextcloud.gladtherescake.eu".listen = [ - { - addr = "127.0.0.1"; - port = 8180; - } - ]; - + # Actual Nextcloud Config services.nextcloud = { enable = true; - package = pkgs.nextcloud27; hostName = "nextcloud.gladtherescake.eu"; - database.createLocally = true; - configureRedis = true; - appstoreEnable = true; + # Enable built-in virtual host management + # Takes care of somewhat complicated setup + # See here: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/web-apps/nextcloud.nix#L529 + nginx.enable = true; + + # Use HTTPS for links + https = true; + + # Auto-update Nextcloud Apps + autoUpdateApps.enable = true; + # Set what time makes sense for you + autoUpdateApps.startAt = "05:00:00"; + config = { - adminuser = "nextcloud"; - adminpassFile = "${config.sops.secrets.nextcloudadmin.path}"; - dbtype = "mysql"; - defaultPhoneRegion = "US"; - trustedProxies = ["127.0.0.1"]; - }; + # Further forces Nextcloud to use HTTPS + overwriteProtocol = "https"; - extraOptions = { - mail_smtpmode = "sendmail"; - mail_sendmailmode = "pipe"; - mysql.utf8mb4 = true; - }; + # Nextcloud PostegreSQL database configuration, recommended over using SQLite + dbtype = "pgsql"; + dbuser = "nextcloud"; + dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself + dbname = "nextcloud"; + dbpassFile = "/var/nextcloud-db-pass"; - phpOptions = pkgs.lib.mkForce { - "opcache.interned_strings_buffer" = "16"; - "upload_max_filesize" = "10G"; - "post_max_size" = "10G"; - "memory_limit" = "8G"; + adminpassFile = "/var/nextcloud-admin-pass"; + adminuser = "admin"; }; }; - services.traefik.dynamicConfigOptions.http.routers.nextcloud = { - rule = "Host(`nextcloud.gladtherescake.eu`)"; - service = "nextcloud"; - middlewares = ["headers"]; - entrypoints = ["websecure"]; - tls = { - certResolver = "le"; - }; + # Enable PostgreSQL + services.postgresql = { + enable = true; + + # Ensure the database, user, and permissions always exist + ensureDatabases = ["nextcloud"]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + ]; }; - services.traefik.dynamicConfigOptions.http.services.nextcloud = { - loadBalancer = { - servers = [ - { - url = "http://localhost:8180"; - } - ]; - }; - }; - - systemd.timers."nextcloud-files-update" = { - wantedBy = ["timers.target"]; - timerConfig = { - OnBootSec = "2m"; - OnUnitActiveSec = "15m"; - Unit = "nextcloud-files-update.service"; - }; - }; - - systemd.services."nextcloud-files-update" = { - bindsTo = ["mysql.service" "phpfpm-nextcloud.service"]; - after = ["mysql.service" "phpfpm-nextcloud.service"]; - script = '' - - ${config.services.nextcloud.occ}/bin/nextcloud-occ files:scan -q --all - ${config.services.nextcloud.occ}/bin/nextcloud-occ preview:pre-generate - ''; - - serviceConfig = { - User = "nextcloud"; - }; - - path = ["config.services.nextcloud" pkgs.perl]; + # Ensure that postgres is running before running the setup + systemd.services."nextcloud-setup" = { + requires = ["postgresql.service"]; + after = ["postgresql.service"]; }; } From c858ce45d0fb235d210447cf363f84d106a13058 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:55:06 +0100 Subject: [PATCH 0276/2308] Let's try postgres I guess --- nixos/queen/configuration.nix | 4 +- nixos/queen/nextcloud.nix | 150 ++++++++++++++-------------------- 2 files changed, 65 insertions(+), 89 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 93d5944..3aa0472 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -53,6 +53,8 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; + sops.secrets."nextcloudadmin".mode = "0440"; + sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; sops.secrets."nextclouddb".mode = "0440"; sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; @@ -91,7 +93,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - mariadb_110 + postgresql rsync wget zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 8118582..2e0e073 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -1,108 +1,82 @@ -# Nextcloud { config, - lib, pkgs, - sops, ... }: { - sops.secrets.nextcloudadmin = { - mode = "0440"; - owner = config.users.users.nextcloud.name; - group = config.users.users.nextcloud.group; + # Enable Nginx + services.nginx = { + enable = true; + + # Use recommended settings + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + + # Only allow PFS-enabled ciphers with AES256 + sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL"; + + # Setup Nextcloud virtual host to listen on ports + virtualHosts = { + "nextcloud.gladtherescake.eu" = { + ## Force HTTP redirect to HTTPS + forceSSL = true; + ## LetsEncrypt + enableACME = true; + }; + }; }; - users.users.nextcloud.extraGroups = ["render" "users"]; - - environment.systemPackages = with pkgs; [ - unstable.exiftool - ffmpeg - nodejs_18 - ]; - - # Allow using /dev/dri for Memories - systemd.services.phpfpm-nextcloud.serviceConfig = { - PrivateDevices = lib.mkForce false; - }; - - services.nginx.virtualHosts."nextcloud.gladtherescake.eu".listen = [ - { - addr = "127.0.0.1"; - port = 8180; - } - ]; - + # Actual Nextcloud Config services.nextcloud = { enable = true; - package = pkgs.nextcloud27; hostName = "nextcloud.gladtherescake.eu"; - database.createLocally = true; - configureRedis = true; - appstoreEnable = true; + # Enable built-in virtual host management + # Takes care of somewhat complicated setup + # See here: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/web-apps/nextcloud.nix#L529 + nginx.enable = true; + + # Use HTTPS for links + https = true; + + # Auto-update Nextcloud Apps + autoUpdateApps.enable = true; + # Set what time makes sense for you + autoUpdateApps.startAt = "05:00:00"; + config = { - adminuser = "nextcloud"; - adminpassFile = "${config.sops.secrets.nextcloudadmin.path}"; - dbtype = "mysql"; - defaultPhoneRegion = "US"; - trustedProxies = ["127.0.0.1"]; - }; + # Further forces Nextcloud to use HTTPS + overwriteProtocol = "https"; - extraOptions = { - mail_smtpmode = "sendmail"; - mail_sendmailmode = "pipe"; - mysql.utf8mb4 = true; - }; + # Nextcloud PostegreSQL database configuration, recommended over using SQLite + dbtype = "pgsql"; + dbuser = "nextcloud"; + dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself + dbname = "nextcloud"; + dbpassFile = "/var/nextcloud-db-pass"; - phpOptions = pkgs.lib.mkForce { - "opcache.interned_strings_buffer" = "16"; - "upload_max_filesize" = "10G"; - "post_max_size" = "10G"; - "memory_limit" = "8G"; + adminpassFile = "/var/nextcloud-admin-pass"; + adminuser = "admin"; }; }; - services.traefik.dynamicConfigOptions.http.routers.nextcloud = { - rule = "Host(`nextcloud.gladtherescake.eu`)"; - service = "nextcloud"; - middlewares = ["headers"]; - entrypoints = ["websecure"]; - tls = { - certResolver = "le"; - }; + # Enable PostgreSQL + services.postgresql = { + enable = true; + + # Ensure the database, user, and permissions always exist + ensureDatabases = ["nextcloud"]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + ]; }; - services.traefik.dynamicConfigOptions.http.services.nextcloud = { - loadBalancer = { - servers = [ - { - url = "http://localhost:8180"; - } - ]; - }; - }; - - systemd.timers."nextcloud-files-update" = { - wantedBy = ["timers.target"]; - timerConfig = { - OnBootSec = "2m"; - OnUnitActiveSec = "15m"; - Unit = "nextcloud-files-update.service"; - }; - }; - - systemd.services."nextcloud-files-update" = { - bindsTo = ["mysql.service" "phpfpm-nextcloud.service"]; - after = ["mysql.service" "phpfpm-nextcloud.service"]; - script = '' - - ${config.services.nextcloud.occ}/bin/nextcloud-occ files:scan -q --all - ${config.services.nextcloud.occ}/bin/nextcloud-occ preview:pre-generate - ''; - - serviceConfig = { - User = "nextcloud"; - }; - - path = ["config.services.nextcloud" pkgs.perl]; + # Ensure that postgres is running before running the setup + systemd.services."nextcloud-setup" = { + requires = ["postgresql.service"]; + after = ["postgresql.service"]; }; } From eb8bd48c733b74cd2f1907af7baa4bfcf2288615 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:56:31 +0100 Subject: [PATCH 0277/2308] Remove nginx from this copy --- nixos/queen/nextcloud.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 2e0e073..36f3e6b 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -31,10 +31,6 @@ services.nextcloud = { enable = true; hostName = "nextcloud.gladtherescake.eu"; - # Enable built-in virtual host management - # Takes care of somewhat complicated setup - # See here: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/web-apps/nextcloud.nix#L529 - nginx.enable = true; # Use HTTPS for links https = true; From b40b5dcc236e9e1168391cef1049ee56dbc1b2e2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 14:56:31 +0100 Subject: [PATCH 0278/2308] Remove nginx from this copy --- nixos/queen/nextcloud.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 2e0e073..36f3e6b 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -31,10 +31,6 @@ services.nextcloud = { enable = true; hostName = "nextcloud.gladtherescake.eu"; - # Enable built-in virtual host management - # Takes care of somewhat complicated setup - # See here: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/web-apps/nextcloud.nix#L529 - nginx.enable = true; # Use HTTPS for links https = true; From 449291f339aaee625ec826ff6893f84861612784 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:02:52 +0100 Subject: [PATCH 0279/2308] sops --- nixos/queen/nextcloud.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 36f3e6b..f4b7012 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -49,9 +49,9 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = "/var/nextcloud-db-pass"; + dbpassFile = sops.secrets."nextclouddb".path; - adminpassFile = "/var/nextcloud-admin-pass"; + adminpassFile = sops.secrets."nextcloudadmin".path; adminuser = "admin"; }; }; @@ -65,7 +65,7 @@ ensureUsers = [ { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + ensureDBOwnership."DATABASE nextcloud" = "ALL PRIVILEGES"; } ]; }; From d712df9d9534696e5f8b2ff3ccbda9ba1880ac42 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:02:52 +0100 Subject: [PATCH 0280/2308] sops --- nixos/queen/nextcloud.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 36f3e6b..f4b7012 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -49,9 +49,9 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = "/var/nextcloud-db-pass"; + dbpassFile = sops.secrets."nextclouddb".path; - adminpassFile = "/var/nextcloud-admin-pass"; + adminpassFile = sops.secrets."nextcloudadmin".path; adminuser = "admin"; }; }; @@ -65,7 +65,7 @@ ensureUsers = [ { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + ensureDBOwnership."DATABASE nextcloud" = "ALL PRIVILEGES"; } ]; }; From cdec8f4ce2845d38ef9a4b0fb383e1b839aa1364 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:03:46 +0100 Subject: [PATCH 0281/2308] config.sops --- nixos/queen/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index f4b7012..bf71f3a 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -49,9 +49,9 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = sops.secrets."nextclouddb".path; + dbpassFile = config.sops.secrets."nextclouddb".path; - adminpassFile = sops.secrets."nextcloudadmin".path; + adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "admin"; }; }; From 4739efb4a81f9ed992ee994b633ac166d2467c83 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:03:46 +0100 Subject: [PATCH 0282/2308] config.sops --- nixos/queen/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index f4b7012..bf71f3a 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -49,9 +49,9 @@ dbuser = "nextcloud"; dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; - dbpassFile = sops.secrets."nextclouddb".path; + dbpassFile = config.sops.secrets."nextclouddb".path; - adminpassFile = sops.secrets."nextcloudadmin".path; + adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "admin"; }; }; From fe4856bb5384e80b7951a2a8229e0600c8ce0f1e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:07:11 +0100 Subject: [PATCH 0283/2308] Never mind the postgres thing, ignore the warning --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index bf71f3a..f354f7c 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -65,7 +65,7 @@ ensureUsers = [ { name = "nextcloud"; - ensureDBOwnership."DATABASE nextcloud" = "ALL PRIVILEGES"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; } ]; }; From 7c44f43525eafb7e4cc85351250ac2d936117b83 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:07:11 +0100 Subject: [PATCH 0284/2308] Never mind the postgres thing, ignore the warning --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index bf71f3a..f354f7c 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -65,7 +65,7 @@ ensureUsers = [ { name = "nextcloud"; - ensureDBOwnership."DATABASE nextcloud" = "ALL PRIVILEGES"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; } ]; }; From ba94d013fc9a6c8bc9467f260952fb72fdb7e60e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:10:34 +0100 Subject: [PATCH 0285/2308] Make admin user GLaDTheresCake --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index f354f7c..81fc0bc 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -52,7 +52,7 @@ dbpassFile = config.sops.secrets."nextclouddb".path; adminpassFile = config.sops.secrets."nextcloudadmin".path; - adminuser = "admin"; + adminuser = "GLaDTheresCake"; }; }; From b6f4eeb5df7b491b6c986ea22ed7cece1d7a1db2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:10:34 +0100 Subject: [PATCH 0286/2308] Make admin user GLaDTheresCake --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index f354f7c..81fc0bc 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -52,7 +52,7 @@ dbpassFile = config.sops.secrets."nextclouddb".path; adminpassFile = config.sops.secrets."nextcloudadmin".path; - adminuser = "admin"; + adminuser = "GLaDTheresCake"; }; }; From 75f86b89335447ce8f47d54beca3aa0f8732e4f3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:14:44 +0100 Subject: [PATCH 0287/2308] Run sops first --- nixos/queen/nextcloud.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 81fc0bc..0735bcd 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -70,6 +70,10 @@ ]; }; + systemd.services."sops-nix.service" = { + before = ["nextcloud-setup.service" "postgresql.service"]; + }; + # Ensure that postgres is running before running the setup systemd.services."nextcloud-setup" = { requires = ["postgresql.service"]; From a4bff0401d0f76ae13c9a39e21a054c43bd48026 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:14:44 +0100 Subject: [PATCH 0288/2308] Run sops first --- nixos/queen/nextcloud.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 81fc0bc..0735bcd 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -70,6 +70,10 @@ ]; }; + systemd.services."sops-nix.service" = { + before = ["nextcloud-setup.service" "postgresql.service"]; + }; + # Ensure that postgres is running before running the setup systemd.services."nextcloud-setup" = { requires = ["postgresql.service"]; From 16efbf5c80f968ab5382c91a667c2d1f0c0223aa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:21:03 +0100 Subject: [PATCH 0289/2308] Downgrading postgres might help? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 3aa0472..68fbc7f 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -93,7 +93,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - postgresql + postgresql_14 rsync wget zsh From a985442f29b8735c701b087f8557ba19c1d7af20 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:21:03 +0100 Subject: [PATCH 0290/2308] Downgrading postgres might help? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 3aa0472..68fbc7f 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -93,7 +93,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - postgresql + postgresql_14 rsync wget zsh From c499730ddf9cde78e0812a475c7cd96d57e4f931 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:23:59 +0100 Subject: [PATCH 0291/2308] Use nextcloud 27 --- nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 68fbc7f..3aa0472 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -93,7 +93,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - postgresql_14 + postgresql rsync wget zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 0735bcd..5abc260 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -32,6 +32,8 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; + package = pkgs.nextcloud27; + # Use HTTPS for links https = true; From 6d230fa8e345ed38b335639c31733e1de4d47029 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 15:23:59 +0100 Subject: [PATCH 0292/2308] Use nextcloud 27 --- nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 68fbc7f..3aa0472 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -93,7 +93,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - postgresql_14 + postgresql rsync wget zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 0735bcd..5abc260 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -32,6 +32,8 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; + package = pkgs.nextcloud27; + # Use HTTPS for links https = true; From 78549c8702bf3ff5bf0085c7a7d1f8e7bf0ff097 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 16:22:50 +0100 Subject: [PATCH 0293/2308] Only allow lillian to ssh, not root --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 3aa0472..2774019 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -23,7 +23,7 @@ zramSwap.enable = false; networking.domain = ""; services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; + users.users.lillian.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; nixpkgs = { # You can add overlays here From 7fa2800718dfdfe6fbb8841e484c47b633feb4f7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 16:22:50 +0100 Subject: [PATCH 0294/2308] Only allow lillian to ssh, not root --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 3aa0472..2774019 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -23,7 +23,7 @@ zramSwap.enable = false; networking.domain = ""; services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; + users.users.lillian.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; nixpkgs = { # You can add overlays here From 14a827690c5c9e4a4f45ef1151cb9b28d2482701 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 16:27:23 +0100 Subject: [PATCH 0295/2308] Should put that in the user I suppose --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 2774019..6efe9dc 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -23,7 +23,6 @@ zramSwap.enable = false; networking.domain = ""; services.openssh.enable = true; - users.users.lillian.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; nixpkgs = { # You can add overlays here @@ -138,6 +137,7 @@ users.users = { lillian = { + openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; isNormalUser = true; extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; From 07a2a4fcedfb80aab49134527ed633c506d3b339 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 16:27:23 +0100 Subject: [PATCH 0296/2308] Should put that in the user I suppose --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 2774019..6efe9dc 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -23,7 +23,6 @@ zramSwap.enable = false; networking.domain = ""; services.openssh.enable = true; - users.users.lillian.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; nixpkgs = { # You can add overlays here @@ -138,6 +137,7 @@ users.users = { lillian = { + openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; isNormalUser = true; extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; From d0b1addc1dc3c53311621553e04948bdd75a6713 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:00:05 +0100 Subject: [PATCH 0297/2308] install libraries for nextcloud --- nixos/queen/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6efe9dc..7bf4cb1 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -84,6 +84,8 @@ fzf git alejandra + ffmpeg + aria2 git-filter-repo home-manager nextcloud27 @@ -93,6 +95,7 @@ noto-fonts-emoji oh-my-zsh postgresql + python rsync wget zsh From 2de3f43fbb6a5207d7800f147e073432722734ba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:00:05 +0100 Subject: [PATCH 0298/2308] install libraries for nextcloud --- nixos/queen/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6efe9dc..7bf4cb1 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -84,6 +84,8 @@ fzf git alejandra + ffmpeg + aria2 git-filter-repo home-manager nextcloud27 @@ -93,6 +95,7 @@ noto-fonts-emoji oh-my-zsh postgresql + python rsync wget zsh From 294bbebdc15503ce4e5281858f3e91089d9ab8ea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:01:37 +0100 Subject: [PATCH 0299/2308] python is python 2, need python3 --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 7bf4cb1..d341c07 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -95,7 +95,7 @@ noto-fonts-emoji oh-my-zsh postgresql - python + python3 rsync wget zsh From 76985a405834f5959c98738d4ab827aecb90cf7f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:01:37 +0100 Subject: [PATCH 0300/2308] python is python 2, need python3 --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 7bf4cb1..d341c07 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -95,7 +95,7 @@ noto-fonts-emoji oh-my-zsh postgresql - python + python3 rsync wget zsh From 7df79c62d36213412821aea9a3719f9bd900b84a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:06:20 +0100 Subject: [PATCH 0301/2308] add youtube dl --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index d341c07..e9ddee0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -97,6 +97,7 @@ postgresql python3 rsync + youtube-dl wget zsh ]; From 9f5fe95b013251e2a43118f985ac7104e786f24c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:06:20 +0100 Subject: [PATCH 0302/2308] add youtube dl --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index d341c07..e9ddee0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -97,6 +97,7 @@ postgresql python3 rsync + youtube-dl wget zsh ]; From c0935d9d174ad8d8a05e2b2509c41ebba146821d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:13:26 +0100 Subject: [PATCH 0303/2308] enable aria2 --- nixos/queen/nextcloud.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5abc260..5443bec 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -72,6 +72,10 @@ ]; }; + services.aria2 = { + enable = true; + }; + systemd.services."sops-nix.service" = { before = ["nextcloud-setup.service" "postgresql.service"]; }; From e785db4471baec04241ee5074fcffd804e66e639 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:13:26 +0100 Subject: [PATCH 0304/2308] enable aria2 --- nixos/queen/nextcloud.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5abc260..5443bec 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -72,6 +72,10 @@ ]; }; + services.aria2 = { + enable = true; + }; + systemd.services."sops-nix.service" = { before = ["nextcloud-setup.service" "postgresql.service"]; }; From 43bbb82dab38eb7c5e9c3108e4ca3fadac54755d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:23:27 +0100 Subject: [PATCH 0305/2308] Change port aria2 --- nixos/queen/nextcloud.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5443bec..18c0265 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -74,6 +74,7 @@ services.aria2 = { enable = true; + rpcListenPort = 6969; }; systemd.services."sops-nix.service" = { From 9beaaffc928c384b7f34bc11edcf53335f769948 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:23:27 +0100 Subject: [PATCH 0306/2308] Change port aria2 --- nixos/queen/nextcloud.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5443bec..18c0265 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -74,6 +74,7 @@ services.aria2 = { enable = true; + rpcListenPort = 6969; }; systemd.services."sops-nix.service" = { From a25b09c03bbd143670f68e76a790be79a4c28c17 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:33:50 +0100 Subject: [PATCH 0307/2308] add nextcloud user to aria2 group --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index e9ddee0..aaf163a 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -146,7 +146,7 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; - nextcloud.extraGroups = [config.users.groups.keys.name]; + nextcloud.extraGroups = [config.users.groups.keys.name "aria2"]; }; # Enable completion of system packages by zsh From 579376c40349cf639e9bc6d449d3414ebc0f3dc8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 17:33:50 +0100 Subject: [PATCH 0308/2308] add nextcloud user to aria2 group --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index e9ddee0..aaf163a 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -146,7 +146,7 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; - nextcloud.extraGroups = [config.users.groups.keys.name]; + nextcloud.extraGroups = [config.users.groups.keys.name "aria2"]; }; # Enable completion of system packages by zsh From cab2b4f7a62d9af7c770fc944662c0d819e83d37 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:05:37 +0100 Subject: [PATCH 0309/2308] Add sops --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index e668e4b..8ae76b4 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -87,6 +87,7 @@ nextcloud-client nitrokey-app protonvpn-gui + sops virtualbox watchmate qbittorrent From fb3cb889a64ecf62d710d0325f82d95d2971a23b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:05:37 +0100 Subject: [PATCH 0310/2308] Add sops --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index e668e4b..8ae76b4 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -87,6 +87,7 @@ nextcloud-client nitrokey-app protonvpn-gui + sops virtualbox watchmate qbittorrent From 61f87d59b94bb20f979879b6cd2935bc661ff7bb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:07:18 +0100 Subject: [PATCH 0311/2308] Let's fix azure studio later --- pkgs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index cc4f33d..c9847b8 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,5 +2,5 @@ # You can build them using 'nix build .#example' pkgs: { # example = pkgs.callPackage ./example { }; - azuredatastudio = pkgs.callPackage ./azuredatastudio {}; + #azuredatastudio = pkgs.callPackage ./azuredatastudio {}; } From 38b071f0f534bf332c019d593b8def1936fa1fa4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:07:18 +0100 Subject: [PATCH 0312/2308] Let's fix azure studio later --- pkgs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index cc4f33d..c9847b8 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,5 +2,5 @@ # You can build them using 'nix build .#example' pkgs: { # example = pkgs.callPackage ./example { }; - azuredatastudio = pkgs.callPackage ./azuredatastudio {}; + #azuredatastudio = pkgs.callPackage ./azuredatastudio {}; } From 002a9676c52dd489e0f07be9325e97a63d6eaf45 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:24:27 +0100 Subject: [PATCH 0313/2308] Try this onlyoffice config --- nixos/queen/configuration.nix | 4 +++- nixos/queen/nextcloud.nix | 17 ++++++++++++++++- secrets/queen-Lillian.yaml | 20 ++++++++++++++++++-- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index aaf163a..f7dd9f2 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -56,6 +56,8 @@ sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; sops.secrets."nextclouddb".mode = "0440"; sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; + sops.secrets."local.json".mode = "0440"; + sops.secrets."local.json".owner = config.users.users.onlyoffice.name; nix = { gc = { @@ -146,7 +148,7 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; - nextcloud.extraGroups = [config.users.groups.keys.name "aria2"]; + nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; }; # Enable completion of system packages by zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 18c0265..5347f0a 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -24,6 +24,10 @@ ## LetsEncrypt enableACME = true; }; + "onlyoffice.example.com" = { + forceSSL = true; + enableACME = true; + }; }; }; @@ -41,11 +45,16 @@ autoUpdateApps.enable = true; # Set what time makes sense for you autoUpdateApps.startAt = "05:00:00"; + configureRedis = true; + maxUploadSize = "16G"; + enableBrokenCiphersForSSE = false; config = { # Further forces Nextcloud to use HTTPS overwriteProtocol = "https"; + defaultPhoneRegion = "NL"; + # Nextcloud PostegreSQL database configuration, recommended over using SQLite dbtype = "pgsql"; dbuser = "nextcloud"; @@ -58,6 +67,12 @@ }; }; + onlyoffice = { + enable = true; + hostname = "onlyoffice.example.com"; + jwtSecretFile = config.sops.secrets."local.json".path; + }; + # Enable PostgreSQL services.postgresql = { enable = true; @@ -78,7 +93,7 @@ }; systemd.services."sops-nix.service" = { - before = ["nextcloud-setup.service" "postgresql.service"]; + before = ["nextcloud-setup.service" "postgresql.service" "onlyoffice.service"]; }; # Ensure that postgres is running before running the setup diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index 450ca04..e8af10a 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -1,5 +1,21 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] +local.json: + services: + CoAuthoring: + token: + enable: + request: + inbox: ENC[AES256_GCM,data:lEB5UA==,iv:mvTrV1LIenxW/HUkEmpuSmU55oI4a4OxAyvnRzFoW5Y=,tag:pyT/QvpCf6Al9J7UHAHjFw==,type:bool] + outbox: ENC[AES256_GCM,data:LTKWdA==,iv:gNqHxkkYCWAxyUHixpN9dKhD96DykctuFsBtBcqqQLM=,tag:whh2tJ6VgQuT8aOiHoz8+w==,type:bool] + browser: ENC[AES256_GCM,data:FHnX8w==,iv:7mtRZiPQwtfIVbgsbGb/6wLX9VhAXXeAgQvIXgK7ldo=,tag:+74AKU2cjgXS16Iy+Z5T2Q==,type:bool] + secret: + inbox: + string: ENC[AES256_GCM,data:jvd3/hiLjwQPwdKSqGqoB7jYXxMlx+94gudsvCWPKdw=,iv:MPork/F2AMzRnmBVdN3S3YobAyxOJWdwZHYll/3rJ68=,tag:AwGMsFKCVZsdoLBHIYVBzg==,type:str] + outbox: + string: ENC[AES256_GCM,data:Rktq5FYhgrAcWKvlmmKBGf1ZW7r93o7nA9cGfwbZnoY=,iv:NsRodeTTkMFsLshdK5FrReCCXvtH4xuPFP0Cnsm4ito=,tag:AMSktqB+Ho6naOwWzIalIA==,type:str] + session: + string: ENC[AES256_GCM,data:fDVVoivTZswECVStgBKWKkOeXrW449fBUMNpESAbXks=,iv:UBiYgap28ZwvZJH/ETZZY1CvZfHzJ175FVPHwMhLlrw=,tag:Gtv9XjsGL6Svx5JHEIj9EA==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +31,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-20T16:04:50Z" - mac: ENC[AES256_GCM,data:eXTRcUy7s6NGN7ziA4CFz1Z3bhF0nNWtVI5o/WwMg7UFmW8AhJ2Hjzp0AJSkQxZOav2Fu/t9ENsu3OTdx3khxk9a1M8BV5VqJQ/DmXXfuZjjJ5cqYDBdQqDI+E6Ai6BJHHN0A4r5xkQ7fpdXsolshJKXi9sNiAjYY3zoJi3id9Y=,iv:d214ZHFIm/KmgzYBZrRm58yFZol/dfw6twZthFOAgvY=,tag:2Z4P0iCYNSNiIc2PwW733Q==,type:str] + lastmodified: "2023-11-23T18:20:20Z" + mac: ENC[AES256_GCM,data:c6CaVuNPHq1Qaiklxzszqnb1UoFU7uyHYXr1FGvLssMVA6qhmEgXwFBi7iHvkK9FG+zSIgPf3ZhY7rpd3ddp42Z2WL9dOEVBpJ6SZcbG+k8gg6oq/PX/9/F0NIEuBUXgSz8vnLtqaOTxF++3TZvHWK0drP4bqck546tpcTpXVtU=,iv:hwwYCaC2OZftJVFYxA39KPiH0lwFA8X4GrDm9vKNb0I=,tag:W9sCVNyOfNy7g33iTIc+gA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 875d67d6f4dee8b406ca11e4252d8625439ae123 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:24:27 +0100 Subject: [PATCH 0314/2308] Try this onlyoffice config --- nixos/queen/configuration.nix | 4 +++- nixos/queen/nextcloud.nix | 17 ++++++++++++++++- secrets/queen-Lillian.yaml | 20 ++++++++++++++++++-- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index aaf163a..f7dd9f2 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -56,6 +56,8 @@ sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; sops.secrets."nextclouddb".mode = "0440"; sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; + sops.secrets."local.json".mode = "0440"; + sops.secrets."local.json".owner = config.users.users.onlyoffice.name; nix = { gc = { @@ -146,7 +148,7 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; - nextcloud.extraGroups = [config.users.groups.keys.name "aria2"]; + nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; }; # Enable completion of system packages by zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 18c0265..5347f0a 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -24,6 +24,10 @@ ## LetsEncrypt enableACME = true; }; + "onlyoffice.example.com" = { + forceSSL = true; + enableACME = true; + }; }; }; @@ -41,11 +45,16 @@ autoUpdateApps.enable = true; # Set what time makes sense for you autoUpdateApps.startAt = "05:00:00"; + configureRedis = true; + maxUploadSize = "16G"; + enableBrokenCiphersForSSE = false; config = { # Further forces Nextcloud to use HTTPS overwriteProtocol = "https"; + defaultPhoneRegion = "NL"; + # Nextcloud PostegreSQL database configuration, recommended over using SQLite dbtype = "pgsql"; dbuser = "nextcloud"; @@ -58,6 +67,12 @@ }; }; + onlyoffice = { + enable = true; + hostname = "onlyoffice.example.com"; + jwtSecretFile = config.sops.secrets."local.json".path; + }; + # Enable PostgreSQL services.postgresql = { enable = true; @@ -78,7 +93,7 @@ }; systemd.services."sops-nix.service" = { - before = ["nextcloud-setup.service" "postgresql.service"]; + before = ["nextcloud-setup.service" "postgresql.service" "onlyoffice.service"]; }; # Ensure that postgres is running before running the setup diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index 450ca04..e8af10a 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -1,5 +1,21 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] +local.json: + services: + CoAuthoring: + token: + enable: + request: + inbox: ENC[AES256_GCM,data:lEB5UA==,iv:mvTrV1LIenxW/HUkEmpuSmU55oI4a4OxAyvnRzFoW5Y=,tag:pyT/QvpCf6Al9J7UHAHjFw==,type:bool] + outbox: ENC[AES256_GCM,data:LTKWdA==,iv:gNqHxkkYCWAxyUHixpN9dKhD96DykctuFsBtBcqqQLM=,tag:whh2tJ6VgQuT8aOiHoz8+w==,type:bool] + browser: ENC[AES256_GCM,data:FHnX8w==,iv:7mtRZiPQwtfIVbgsbGb/6wLX9VhAXXeAgQvIXgK7ldo=,tag:+74AKU2cjgXS16Iy+Z5T2Q==,type:bool] + secret: + inbox: + string: ENC[AES256_GCM,data:jvd3/hiLjwQPwdKSqGqoB7jYXxMlx+94gudsvCWPKdw=,iv:MPork/F2AMzRnmBVdN3S3YobAyxOJWdwZHYll/3rJ68=,tag:AwGMsFKCVZsdoLBHIYVBzg==,type:str] + outbox: + string: ENC[AES256_GCM,data:Rktq5FYhgrAcWKvlmmKBGf1ZW7r93o7nA9cGfwbZnoY=,iv:NsRodeTTkMFsLshdK5FrReCCXvtH4xuPFP0Cnsm4ito=,tag:AMSktqB+Ho6naOwWzIalIA==,type:str] + session: + string: ENC[AES256_GCM,data:fDVVoivTZswECVStgBKWKkOeXrW449fBUMNpESAbXks=,iv:UBiYgap28ZwvZJH/ETZZY1CvZfHzJ175FVPHwMhLlrw=,tag:Gtv9XjsGL6Svx5JHEIj9EA==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +31,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-20T16:04:50Z" - mac: ENC[AES256_GCM,data:eXTRcUy7s6NGN7ziA4CFz1Z3bhF0nNWtVI5o/WwMg7UFmW8AhJ2Hjzp0AJSkQxZOav2Fu/t9ENsu3OTdx3khxk9a1M8BV5VqJQ/DmXXfuZjjJ5cqYDBdQqDI+E6Ai6BJHHN0A4r5xkQ7fpdXsolshJKXi9sNiAjYY3zoJi3id9Y=,iv:d214ZHFIm/KmgzYBZrRm58yFZol/dfw6twZthFOAgvY=,tag:2Z4P0iCYNSNiIc2PwW733Q==,type:str] + lastmodified: "2023-11-23T18:20:20Z" + mac: ENC[AES256_GCM,data:c6CaVuNPHq1Qaiklxzszqnb1UoFU7uyHYXr1FGvLssMVA6qhmEgXwFBi7iHvkK9FG+zSIgPf3ZhY7rpd3ddp42Z2WL9dOEVBpJ6SZcbG+k8gg6oq/PX/9/F0NIEuBUXgSz8vnLtqaOTxF++3TZvHWK0drP4bqck546tpcTpXVtU=,iv:hwwYCaC2OZftJVFYxA39KPiH0lwFA8X4GrDm9vKNb0I=,tag:W9sCVNyOfNy7g33iTIc+gA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 361351395214b55397af3aba7d26043978ca0863 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:26:52 +0100 Subject: [PATCH 0315/2308] Add the package to the list d'oh --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index f7dd9f2..d799584 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -96,6 +96,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh + onlyoffice-documentserver postgresql python3 rsync From 30d4624c3d02185246e609727a0f9566c8382bf2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:26:52 +0100 Subject: [PATCH 0316/2308] Add the package to the list d'oh --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index f7dd9f2..d799584 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -96,6 +96,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh + onlyoffice-documentserver postgresql python3 rsync From a58398e72439bbe02e4be04cc37e2dda6ccdc686 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:28:07 +0100 Subject: [PATCH 0317/2308] It's a service you dopyhead --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5347f0a..69bab73 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -67,7 +67,7 @@ }; }; - onlyoffice = { + services.onlyoffice = { enable = true; hostname = "onlyoffice.example.com"; jwtSecretFile = config.sops.secrets."local.json".path; From 521f5c6349206ac6a9e61c15b4fe09406d79265e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:28:07 +0100 Subject: [PATCH 0318/2308] It's a service you dopyhead --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5347f0a..69bab73 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -67,7 +67,7 @@ }; }; - onlyoffice = { + services.onlyoffice = { enable = true; hostname = "onlyoffice.example.com"; jwtSecretFile = config.sops.secrets."local.json".path; From 25e7930c86184c29b8799cb0a5ac49b449c53dce Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:28:55 +0100 Subject: [PATCH 0319/2308] That's an old config option, delete --- nixos/queen/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 69bab73..9f37f07 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -47,7 +47,6 @@ autoUpdateApps.startAt = "05:00:00"; configureRedis = true; maxUploadSize = "16G"; - enableBrokenCiphersForSSE = false; config = { # Further forces Nextcloud to use HTTPS From bb29754c71d8373f3cf98e47e84c3cf4f5476c13 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:28:55 +0100 Subject: [PATCH 0320/2308] That's an old config option, delete --- nixos/queen/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 69bab73..9f37f07 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -47,7 +47,6 @@ autoUpdateApps.startAt = "05:00:00"; configureRedis = true; maxUploadSize = "16G"; - enableBrokenCiphersForSSE = false; config = { # Further forces Nextcloud to use HTTPS From 8da559c8c8e194670b4d870527c4ad15c420fd5b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:34:14 +0100 Subject: [PATCH 0321/2308] Try more escapes in the secret? --- secrets/queen-Lillian.yaml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index e8af10a..e0f7b46 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -1,21 +1,6 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] -local.json: - services: - CoAuthoring: - token: - enable: - request: - inbox: ENC[AES256_GCM,data:lEB5UA==,iv:mvTrV1LIenxW/HUkEmpuSmU55oI4a4OxAyvnRzFoW5Y=,tag:pyT/QvpCf6Al9J7UHAHjFw==,type:bool] - outbox: ENC[AES256_GCM,data:LTKWdA==,iv:gNqHxkkYCWAxyUHixpN9dKhD96DykctuFsBtBcqqQLM=,tag:whh2tJ6VgQuT8aOiHoz8+w==,type:bool] - browser: ENC[AES256_GCM,data:FHnX8w==,iv:7mtRZiPQwtfIVbgsbGb/6wLX9VhAXXeAgQvIXgK7ldo=,tag:+74AKU2cjgXS16Iy+Z5T2Q==,type:bool] - secret: - inbox: - string: ENC[AES256_GCM,data:jvd3/hiLjwQPwdKSqGqoB7jYXxMlx+94gudsvCWPKdw=,iv:MPork/F2AMzRnmBVdN3S3YobAyxOJWdwZHYll/3rJ68=,tag:AwGMsFKCVZsdoLBHIYVBzg==,type:str] - outbox: - string: ENC[AES256_GCM,data:Rktq5FYhgrAcWKvlmmKBGf1ZW7r93o7nA9cGfwbZnoY=,iv:NsRodeTTkMFsLshdK5FrReCCXvtH4xuPFP0Cnsm4ito=,tag:AMSktqB+Ho6naOwWzIalIA==,type:str] - session: - string: ENC[AES256_GCM,data:fDVVoivTZswECVStgBKWKkOeXrW449fBUMNpESAbXks=,iv:UBiYgap28ZwvZJH/ETZZY1CvZfHzJ175FVPHwMhLlrw=,tag:Gtv9XjsGL6Svx5JHEIj9EA==,type:str] +local.json: ENC[AES256_GCM,data:4wfts4yxTZB8gWiVNnOLkgFzz+l0zd4jL4HiFEmUyBhb1TLz+sCr3QP1Y00Fe4kP5aZ7Iqivai/7A6Yd2lDuxOJoygBmdukOEcunMKDpoR5tgtTJe1Xkez8Pvwvcapm+nNd5mTMI98FWz98uQy88Voyef0qlH7SskknInUZuG9vO6fHbUsEDsY2SMVAwpgXXpLy8rl1vG87XtbKL4dW4yMrUdvEFwTZ6wePxaKsLrF5sGmtSz+5qWCgAZPaVbzuZ9zOkYsBKxlrWYTLAwNX2FcN5kSM/YDwma9pyijXsSytQ1hy/LbN4RrJ4uwlJeyBgbOvSDgUsXFcU2YHItqAanSiGnHiM5oTWJx7K1v5S5W+4q8Qsb7gqoCqiHAaYJljNxtNbCGkqOxI=,iv:izosVpaUoEq22lMc0QjpbZQZMIoqHaYOmjtifhJYRTw=,tag:avInfjOY0Fbn0l9B4S9PeQ==,type:str] sops: kms: [] gcp_kms: [] @@ -31,8 +16,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-23T18:20:20Z" - mac: ENC[AES256_GCM,data:c6CaVuNPHq1Qaiklxzszqnb1UoFU7uyHYXr1FGvLssMVA6qhmEgXwFBi7iHvkK9FG+zSIgPf3ZhY7rpd3ddp42Z2WL9dOEVBpJ6SZcbG+k8gg6oq/PX/9/F0NIEuBUXgSz8vnLtqaOTxF++3TZvHWK0drP4bqck546tpcTpXVtU=,iv:hwwYCaC2OZftJVFYxA39KPiH0lwFA8X4GrDm9vKNb0I=,tag:W9sCVNyOfNy7g33iTIc+gA==,type:str] + lastmodified: "2023-11-23T18:33:37Z" + mac: ENC[AES256_GCM,data:WCKMsHIlhpBOKugNWrIhJgVfHZbmyTHe5gMK0YD7TzhAhk4M1dDkZ3y+m+HYajTv5s6X3KbKbkYbwfQY0SxMcp39GBBQBvQ3ObHfLWxwI0nPivITjsUCCoci5nLUcWpS70y4L8DVigBwU4UpNttuV0C1pFeyqX+Ua4ZuC27lJe0=,iv:+GfDJczBK4ZKhsQK/4RL94/lCf9Gj2qKHumfsZOPh9g=,tag:IPy/H0yf8LpnBaL7hk1Ugw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From fc71aee982da57937eb80f23f5528308619377ae Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:34:14 +0100 Subject: [PATCH 0322/2308] Try more escapes in the secret? --- secrets/queen-Lillian.yaml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index e8af10a..e0f7b46 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -1,21 +1,6 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] -local.json: - services: - CoAuthoring: - token: - enable: - request: - inbox: ENC[AES256_GCM,data:lEB5UA==,iv:mvTrV1LIenxW/HUkEmpuSmU55oI4a4OxAyvnRzFoW5Y=,tag:pyT/QvpCf6Al9J7UHAHjFw==,type:bool] - outbox: ENC[AES256_GCM,data:LTKWdA==,iv:gNqHxkkYCWAxyUHixpN9dKhD96DykctuFsBtBcqqQLM=,tag:whh2tJ6VgQuT8aOiHoz8+w==,type:bool] - browser: ENC[AES256_GCM,data:FHnX8w==,iv:7mtRZiPQwtfIVbgsbGb/6wLX9VhAXXeAgQvIXgK7ldo=,tag:+74AKU2cjgXS16Iy+Z5T2Q==,type:bool] - secret: - inbox: - string: ENC[AES256_GCM,data:jvd3/hiLjwQPwdKSqGqoB7jYXxMlx+94gudsvCWPKdw=,iv:MPork/F2AMzRnmBVdN3S3YobAyxOJWdwZHYll/3rJ68=,tag:AwGMsFKCVZsdoLBHIYVBzg==,type:str] - outbox: - string: ENC[AES256_GCM,data:Rktq5FYhgrAcWKvlmmKBGf1ZW7r93o7nA9cGfwbZnoY=,iv:NsRodeTTkMFsLshdK5FrReCCXvtH4xuPFP0Cnsm4ito=,tag:AMSktqB+Ho6naOwWzIalIA==,type:str] - session: - string: ENC[AES256_GCM,data:fDVVoivTZswECVStgBKWKkOeXrW449fBUMNpESAbXks=,iv:UBiYgap28ZwvZJH/ETZZY1CvZfHzJ175FVPHwMhLlrw=,tag:Gtv9XjsGL6Svx5JHEIj9EA==,type:str] +local.json: ENC[AES256_GCM,data:4wfts4yxTZB8gWiVNnOLkgFzz+l0zd4jL4HiFEmUyBhb1TLz+sCr3QP1Y00Fe4kP5aZ7Iqivai/7A6Yd2lDuxOJoygBmdukOEcunMKDpoR5tgtTJe1Xkez8Pvwvcapm+nNd5mTMI98FWz98uQy88Voyef0qlH7SskknInUZuG9vO6fHbUsEDsY2SMVAwpgXXpLy8rl1vG87XtbKL4dW4yMrUdvEFwTZ6wePxaKsLrF5sGmtSz+5qWCgAZPaVbzuZ9zOkYsBKxlrWYTLAwNX2FcN5kSM/YDwma9pyijXsSytQ1hy/LbN4RrJ4uwlJeyBgbOvSDgUsXFcU2YHItqAanSiGnHiM5oTWJx7K1v5S5W+4q8Qsb7gqoCqiHAaYJljNxtNbCGkqOxI=,iv:izosVpaUoEq22lMc0QjpbZQZMIoqHaYOmjtifhJYRTw=,tag:avInfjOY0Fbn0l9B4S9PeQ==,type:str] sops: kms: [] gcp_kms: [] @@ -31,8 +16,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-23T18:20:20Z" - mac: ENC[AES256_GCM,data:c6CaVuNPHq1Qaiklxzszqnb1UoFU7uyHYXr1FGvLssMVA6qhmEgXwFBi7iHvkK9FG+zSIgPf3ZhY7rpd3ddp42Z2WL9dOEVBpJ6SZcbG+k8gg6oq/PX/9/F0NIEuBUXgSz8vnLtqaOTxF++3TZvHWK0drP4bqck546tpcTpXVtU=,iv:hwwYCaC2OZftJVFYxA39KPiH0lwFA8X4GrDm9vKNb0I=,tag:W9sCVNyOfNy7g33iTIc+gA==,type:str] + lastmodified: "2023-11-23T18:33:37Z" + mac: ENC[AES256_GCM,data:WCKMsHIlhpBOKugNWrIhJgVfHZbmyTHe5gMK0YD7TzhAhk4M1dDkZ3y+m+HYajTv5s6X3KbKbkYbwfQY0SxMcp39GBBQBvQ3ObHfLWxwI0nPivITjsUCCoci5nLUcWpS70y4L8DVigBwU4UpNttuV0C1pFeyqX+Ua4ZuC27lJe0=,iv:+GfDJczBK4ZKhsQK/4RL94/lCf9Gj2qKHumfsZOPh9g=,tag:IPy/H0yf8LpnBaL7hk1Ugw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 9a34deba36746b4a92c99060995c2a042469d8eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:37:52 +0100 Subject: [PATCH 0323/2308] Oops, let's not run at example.com shall we --- nixos/queen/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 9f37f07..ba940e9 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -24,7 +24,7 @@ ## LetsEncrypt enableACME = true; }; - "onlyoffice.example.com" = { + "onlyoffice.gladtherescake.eu" = { forceSSL = true; enableACME = true; }; @@ -68,7 +68,7 @@ services.onlyoffice = { enable = true; - hostname = "onlyoffice.example.com"; + hostname = "onlyoffice.gladtherescake.eu"; jwtSecretFile = config.sops.secrets."local.json".path; }; From 866832a6c3539f1f665bd53b3d95b08155d5faa3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:37:52 +0100 Subject: [PATCH 0324/2308] Oops, let's not run at example.com shall we --- nixos/queen/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 9f37f07..ba940e9 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -24,7 +24,7 @@ ## LetsEncrypt enableACME = true; }; - "onlyoffice.example.com" = { + "onlyoffice.gladtherescake.eu" = { forceSSL = true; enableACME = true; }; @@ -68,7 +68,7 @@ services.onlyoffice = { enable = true; - hostname = "onlyoffice.example.com"; + hostname = "onlyoffice.gladtherescake.eu"; jwtSecretFile = config.sops.secrets."local.json".path; }; From 3793ac175d04bc03eeef76332db685dce0f4408e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:51:12 +0100 Subject: [PATCH 0325/2308] install some apps by default --- nixos/queen/nextcloud.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index ba940e9..82de25b 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -54,6 +54,13 @@ defaultPhoneRegion = "NL"; + extraAppsEnable = true; + extraApps = with config.services.nextcloud.package.packages.apps; { + # List of apps we want to install and are already packaged in + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json + inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification twofactor_totp twofactor_webauthn unsplash; + }; + # Nextcloud PostegreSQL database configuration, recommended over using SQLite dbtype = "pgsql"; dbuser = "nextcloud"; From cd902b624b463f2b2448fa82cf1362773b173a5b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:51:12 +0100 Subject: [PATCH 0326/2308] install some apps by default --- nixos/queen/nextcloud.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index ba940e9..82de25b 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -54,6 +54,13 @@ defaultPhoneRegion = "NL"; + extraAppsEnable = true; + extraApps = with config.services.nextcloud.package.packages.apps; { + # List of apps we want to install and are already packaged in + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json + inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification twofactor_totp twofactor_webauthn unsplash; + }; + # Nextcloud PostegreSQL database configuration, recommended over using SQLite dbtype = "pgsql"; dbuser = "nextcloud"; From ec8ea54407597e6f8f01e1b4dc92f31a80d1c433 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:55:48 +0100 Subject: [PATCH 0327/2308] Couldn't find these apps, oh well --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 82de25b..2da3431 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -58,7 +58,7 @@ extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification twofactor_totp twofactor_webauthn unsplash; + inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; # Nextcloud PostegreSQL database configuration, recommended over using SQLite From 1626988e82614a6ef91740e00d5f7b9b99b829ee Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:55:48 +0100 Subject: [PATCH 0328/2308] Couldn't find these apps, oh well --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 82de25b..2da3431 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -58,7 +58,7 @@ extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification twofactor_totp twofactor_webauthn unsplash; + inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; # Nextcloud PostegreSQL database configuration, recommended over using SQLite From a8a87a6022c47da68b93efae45065bc151f52a8e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:57:25 +0100 Subject: [PATCH 0329/2308] Wrong place for extra apps --- nixos/queen/nextcloud.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 2da3431..8d59b5d 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -48,19 +48,19 @@ configureRedis = true; maxUploadSize = "16G"; + extraAppsEnable = true; + extraApps = with config.services.nextcloud.package.packages.apps; { + # List of apps we want to install and are already packaged in + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json + inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + }; + config = { # Further forces Nextcloud to use HTTPS overwriteProtocol = "https"; defaultPhoneRegion = "NL"; - extraAppsEnable = true; - extraApps = with config.services.nextcloud.package.packages.apps; { - # List of apps we want to install and are already packaged in - # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; - }; - # Nextcloud PostegreSQL database configuration, recommended over using SQLite dbtype = "pgsql"; dbuser = "nextcloud"; From 10623a16b1c97e194da12359d2fd202cd29ad638 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 19:57:25 +0100 Subject: [PATCH 0330/2308] Wrong place for extra apps --- nixos/queen/nextcloud.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 2da3431..8d59b5d 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -48,19 +48,19 @@ configureRedis = true; maxUploadSize = "16G"; + extraAppsEnable = true; + extraApps = with config.services.nextcloud.package.packages.apps; { + # List of apps we want to install and are already packaged in + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json + inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + }; + config = { # Further forces Nextcloud to use HTTPS overwriteProtocol = "https"; defaultPhoneRegion = "NL"; - extraAppsEnable = true; - extraApps = with config.services.nextcloud.package.packages.apps; { - # List of apps we want to install and are already packaged in - # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; - }; - # Nextcloud PostegreSQL database configuration, recommended over using SQLite dbtype = "pgsql"; dbuser = "nextcloud"; From d09f287c2e18c23b5b13bb027b3b1f730a300862 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 20:03:15 +0100 Subject: [PATCH 0331/2308] Make it all the same secret --- secrets/queen-Lillian.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index e0f7b46..cd1086e 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -1,6 +1,6 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] -local.json: ENC[AES256_GCM,data:4wfts4yxTZB8gWiVNnOLkgFzz+l0zd4jL4HiFEmUyBhb1TLz+sCr3QP1Y00Fe4kP5aZ7Iqivai/7A6Yd2lDuxOJoygBmdukOEcunMKDpoR5tgtTJe1Xkez8Pvwvcapm+nNd5mTMI98FWz98uQy88Voyef0qlH7SskknInUZuG9vO6fHbUsEDsY2SMVAwpgXXpLy8rl1vG87XtbKL4dW4yMrUdvEFwTZ6wePxaKsLrF5sGmtSz+5qWCgAZPaVbzuZ9zOkYsBKxlrWYTLAwNX2FcN5kSM/YDwma9pyijXsSytQ1hy/LbN4RrJ4uwlJeyBgbOvSDgUsXFcU2YHItqAanSiGnHiM5oTWJx7K1v5S5W+4q8Qsb7gqoCqiHAaYJljNxtNbCGkqOxI=,iv:izosVpaUoEq22lMc0QjpbZQZMIoqHaYOmjtifhJYRTw=,tag:avInfjOY0Fbn0l9B4S9PeQ==,type:str] +local.json: ENC[AES256_GCM,data:EWMZTvnP9DmJKZq3mejvlSc8e2BZxcREn+XB1tAM5NLS0G2fdWJThkkgRz2owdAiZV2BLc/yqr4DqJzDIXiOxWWBGAbqRFH5kPw2mAdkAcW76F8tUNQSBtQXM+Gu3W3EwjQwNiwVlb1jB0BNWU4TJfZGfdk2Vt0R7ggTJhRIAwQiXC1VtMWmlAOyRIaiMzaY4ktEMJT/nxF8koZV79kiCFcAGHzoYynW16y2QkaxFca/4bTvBJCAMBuK0lLF9xeipyGZUgxPV/OAQkrQGAqHcrHL+FmQiFEIuLUBzTDQp57kV1EKKCevRUcPCX/NhQGgLYVgDrsLTb1ftB30yHjWUap+JttKXBk2HElnQVEdS37zADyQ8tYrD+2l2CLrBGctVpg6K61OP44=,iv:VbJgmvIN1/FjQJl58KBsDNTyUWtIAYbBB0iPe6I0+hE=,tag:if16JgRVPeC+m8vFeYhKtA==,type:str] sops: kms: [] gcp_kms: [] @@ -16,8 +16,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-23T18:33:37Z" - mac: ENC[AES256_GCM,data:WCKMsHIlhpBOKugNWrIhJgVfHZbmyTHe5gMK0YD7TzhAhk4M1dDkZ3y+m+HYajTv5s6X3KbKbkYbwfQY0SxMcp39GBBQBvQ3ObHfLWxwI0nPivITjsUCCoci5nLUcWpS70y4L8DVigBwU4UpNttuV0C1pFeyqX+Ua4ZuC27lJe0=,iv:+GfDJczBK4ZKhsQK/4RL94/lCf9Gj2qKHumfsZOPh9g=,tag:IPy/H0yf8LpnBaL7hk1Ugw==,type:str] + lastmodified: "2023-11-23T19:03:04Z" + mac: ENC[AES256_GCM,data:SaC8fw76/O1C4ahiFmpDpF19X8jXUVAs+i86dDSkHLllRxUXsVujW4NUsX0aq2OOSAFZE5QVy/Aq7Os3MsEBNezd0YxCgVpzKOj/6YUUEoNDhZGvd2n1a3ULoqlWNBhmRd42MvEWVoTWPJHlv34fkoYD+NRD1jF3QLwANBGcVqA=,iv:x1AoAMdt6+M/+mLatWpLWBTPyaRS2/pYSj250DkZWdU=,tag:HHF/zb8VWIaj8Q9T4NFwAw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From a534f0f44db45210b966d39909ac57915063376b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 20:03:15 +0100 Subject: [PATCH 0332/2308] Make it all the same secret --- secrets/queen-Lillian.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index e0f7b46..cd1086e 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -1,6 +1,6 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] -local.json: ENC[AES256_GCM,data:4wfts4yxTZB8gWiVNnOLkgFzz+l0zd4jL4HiFEmUyBhb1TLz+sCr3QP1Y00Fe4kP5aZ7Iqivai/7A6Yd2lDuxOJoygBmdukOEcunMKDpoR5tgtTJe1Xkez8Pvwvcapm+nNd5mTMI98FWz98uQy88Voyef0qlH7SskknInUZuG9vO6fHbUsEDsY2SMVAwpgXXpLy8rl1vG87XtbKL4dW4yMrUdvEFwTZ6wePxaKsLrF5sGmtSz+5qWCgAZPaVbzuZ9zOkYsBKxlrWYTLAwNX2FcN5kSM/YDwma9pyijXsSytQ1hy/LbN4RrJ4uwlJeyBgbOvSDgUsXFcU2YHItqAanSiGnHiM5oTWJx7K1v5S5W+4q8Qsb7gqoCqiHAaYJljNxtNbCGkqOxI=,iv:izosVpaUoEq22lMc0QjpbZQZMIoqHaYOmjtifhJYRTw=,tag:avInfjOY0Fbn0l9B4S9PeQ==,type:str] +local.json: ENC[AES256_GCM,data:EWMZTvnP9DmJKZq3mejvlSc8e2BZxcREn+XB1tAM5NLS0G2fdWJThkkgRz2owdAiZV2BLc/yqr4DqJzDIXiOxWWBGAbqRFH5kPw2mAdkAcW76F8tUNQSBtQXM+Gu3W3EwjQwNiwVlb1jB0BNWU4TJfZGfdk2Vt0R7ggTJhRIAwQiXC1VtMWmlAOyRIaiMzaY4ktEMJT/nxF8koZV79kiCFcAGHzoYynW16y2QkaxFca/4bTvBJCAMBuK0lLF9xeipyGZUgxPV/OAQkrQGAqHcrHL+FmQiFEIuLUBzTDQp57kV1EKKCevRUcPCX/NhQGgLYVgDrsLTb1ftB30yHjWUap+JttKXBk2HElnQVEdS37zADyQ8tYrD+2l2CLrBGctVpg6K61OP44=,iv:VbJgmvIN1/FjQJl58KBsDNTyUWtIAYbBB0iPe6I0+hE=,tag:if16JgRVPeC+m8vFeYhKtA==,type:str] sops: kms: [] gcp_kms: [] @@ -16,8 +16,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-23T18:33:37Z" - mac: ENC[AES256_GCM,data:WCKMsHIlhpBOKugNWrIhJgVfHZbmyTHe5gMK0YD7TzhAhk4M1dDkZ3y+m+HYajTv5s6X3KbKbkYbwfQY0SxMcp39GBBQBvQ3ObHfLWxwI0nPivITjsUCCoci5nLUcWpS70y4L8DVigBwU4UpNttuV0C1pFeyqX+Ua4ZuC27lJe0=,iv:+GfDJczBK4ZKhsQK/4RL94/lCf9Gj2qKHumfsZOPh9g=,tag:IPy/H0yf8LpnBaL7hk1Ugw==,type:str] + lastmodified: "2023-11-23T19:03:04Z" + mac: ENC[AES256_GCM,data:SaC8fw76/O1C4ahiFmpDpF19X8jXUVAs+i86dDSkHLllRxUXsVujW4NUsX0aq2OOSAFZE5QVy/Aq7Os3MsEBNezd0YxCgVpzKOj/6YUUEoNDhZGvd2n1a3ULoqlWNBhmRd42MvEWVoTWPJHlv34fkoYD+NRD1jF3QLwANBGcVqA=,iv:x1AoAMdt6+M/+mLatWpLWBTPyaRS2/pYSj250DkZWdU=,tag:HHF/zb8VWIaj8Q9T4NFwAw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 2750e7a65b8666b5c87e0387e0f0de09e4f5db65 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 20:16:43 +0100 Subject: [PATCH 0333/2308] Try and set database for onlyoffice --- nixos/queen/nextcloud.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 8d59b5d..8807fe2 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -76,6 +76,9 @@ services.onlyoffice = { enable = true; hostname = "onlyoffice.gladtherescake.eu"; + postgresHost = "/run/postgesql"; + postgresUser = "onlyoffice"; + postgresName = "onlyoffice"; jwtSecretFile = config.sops.secrets."local.json".path; }; @@ -84,12 +87,16 @@ enable = true; # Ensure the database, user, and permissions always exist - ensureDatabases = ["nextcloud"]; + ensureDatabases = ["nextcloud" "onlyoffice"]; ensureUsers = [ { name = "nextcloud"; ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; } + { + name = "onlyoffice"; + ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + } ]; }; From 21b6285cd10157dd2d04e68e8929e0c7f5293b1e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 23 Nov 2023 20:16:43 +0100 Subject: [PATCH 0334/2308] Try and set database for onlyoffice --- nixos/queen/nextcloud.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 8d59b5d..8807fe2 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -76,6 +76,9 @@ services.onlyoffice = { enable = true; hostname = "onlyoffice.gladtherescake.eu"; + postgresHost = "/run/postgesql"; + postgresUser = "onlyoffice"; + postgresName = "onlyoffice"; jwtSecretFile = config.sops.secrets."local.json".path; }; @@ -84,12 +87,16 @@ enable = true; # Ensure the database, user, and permissions always exist - ensureDatabases = ["nextcloud"]; + ensureDatabases = ["nextcloud" "onlyoffice"]; ensureUsers = [ { name = "nextcloud"; ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; } + { + name = "onlyoffice"; + ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + } ]; }; From 5c3c72f39c27c41ac96d060c3116440627614303 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 12:37:55 +0100 Subject: [PATCH 0335/2308] Host mssql on server --- nixos/queen/configuration.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index d799584..3d496bf 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,7 +108,7 @@ # Enable networking networking.networkmanager.enable = true; - networking.firewall.allowedTCPPorts = [80 443]; + networking.firewall.allowedTCPPorts = [80 443 1443]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; @@ -152,6 +152,18 @@ nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; }; + virtualisation.oci-containers.containers = { + mssql = { + image = "mcr.microsoft.com/mssql/server:2022-latest"; + ports = ["1433:1433"]; + environment = { + "ACCEPT_EULA" = "Y"; + "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; + }; + volumes = ["/home/lillian/docker/mssql:/data"]; + }; + }; + # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; From caeedc1d233928e5f183c37adfa210fb25b2b08d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 12:37:55 +0100 Subject: [PATCH 0336/2308] Host mssql on server --- nixos/queen/configuration.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index d799584..3d496bf 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,7 +108,7 @@ # Enable networking networking.networkmanager.enable = true; - networking.firewall.allowedTCPPorts = [80 443]; + networking.firewall.allowedTCPPorts = [80 443 1443]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; @@ -152,6 +152,18 @@ nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; }; + virtualisation.oci-containers.containers = { + mssql = { + image = "mcr.microsoft.com/mssql/server:2022-latest"; + ports = ["1433:1433"]; + environment = { + "ACCEPT_EULA" = "Y"; + "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; + }; + volumes = ["/home/lillian/docker/mssql:/data"]; + }; + }; + # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; From 07f4a405a4445f77bc98942da1c37e71cc52d8a5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 12:54:03 +0100 Subject: [PATCH 0337/2308] Add the user configs --- nixos/queen/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 3d496bf..a971686 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -142,6 +142,8 @@ defaults.email = "letsencrypt@gladtherescake.eu"; }; + users.groups.mssql = {}; + users.users = { lillian = { openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; @@ -150,6 +152,10 @@ shell = pkgs.zsh; }; nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; + mssql = { + isSystemUser = true; + group = "mssql"; + }; }; virtualisation.oci-containers.containers = { From 423809e996cc21408f192c65081ef0af21ccf11e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 12:54:03 +0100 Subject: [PATCH 0338/2308] Add the user configs --- nixos/queen/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 3d496bf..a971686 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -142,6 +142,8 @@ defaults.email = "letsencrypt@gladtherescake.eu"; }; + users.groups.mssql = {}; + users.users = { lillian = { openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; @@ -150,6 +152,10 @@ shell = pkgs.zsh; }; nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; + mssql = { + isSystemUser = true; + group = "mssql"; + }; }; virtualisation.oci-containers.containers = { From 3048fddfe00c4b3bd248c1ee686b7dfcde5e6901 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 13:04:58 +0100 Subject: [PATCH 0339/2308] Add different storage space maybe? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index a971686..54e0e8b 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -166,7 +166,7 @@ "ACCEPT_EULA" = "Y"; "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; }; - volumes = ["/home/lillian/docker/mssql:/data"]; + volumes = ["/var/lib/container/mssql:/data"]; }; }; From c02e09358a28021236b9917db689eb146d3cfe69 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 13:04:58 +0100 Subject: [PATCH 0340/2308] Add different storage space maybe? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index a971686..54e0e8b 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -166,7 +166,7 @@ "ACCEPT_EULA" = "Y"; "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; }; - volumes = ["/home/lillian/docker/mssql:/data"]; + volumes = ["/var/lib/container/mssql:/data"]; }; }; From b503a17b3a5449ac634e35f98a325dfbbbf8c0d5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 13:07:39 +0100 Subject: [PATCH 0341/2308] Maybe I should add docker? --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 54e0e8b..7a3dcd4 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -84,6 +84,8 @@ environment.systemPackages = with pkgs; [ age fzf + docker + docker-compose git alejandra ffmpeg From a2d2ddcd579abde44e8065bf223196a05504e8d0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 13:07:39 +0100 Subject: [PATCH 0342/2308] Maybe I should add docker? --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 54e0e8b..7a3dcd4 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -84,6 +84,8 @@ environment.systemPackages = with pkgs; [ age fzf + docker + docker-compose git alejandra ffmpeg From 195987206b76884f708d05ae6b08c7556de5979a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 13:40:41 +0100 Subject: [PATCH 0343/2308] Remove azure data studio for now --- home-manager/desktop-shared.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 8ae76b4..d0c3732 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -56,7 +56,6 @@ home.packages = with pkgs; [ # Coding: - azuredatastudio git kate From 72a31ecec39901c0ee9408571be4ffbbed4640e9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 13:40:41 +0100 Subject: [PATCH 0344/2308] Remove azure data studio for now --- home-manager/desktop-shared.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 8ae76b4..d0c3732 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -56,7 +56,6 @@ home.packages = with pkgs; [ # Coding: - azuredatastudio git kate From 6e80075dee17d901300101ff4efadfb4574ba144 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 14:04:00 +0100 Subject: [PATCH 0345/2308] Revert the data directory --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 7a3dcd4..30ad1e7 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -168,7 +168,7 @@ "ACCEPT_EULA" = "Y"; "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; }; - volumes = ["/var/lib/container/mssql:/data"]; + volumes = ["/home/lillian/docker/mssql:/data"]; }; }; From d1d4db3d9eb96acb29e42e81c32f2477922c90aa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 14:04:00 +0100 Subject: [PATCH 0346/2308] Revert the data directory --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 7a3dcd4..30ad1e7 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -168,7 +168,7 @@ "ACCEPT_EULA" = "Y"; "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; }; - volumes = ["/var/lib/container/mssql:/data"]; + volumes = ["/home/lillian/docker/mssql:/data"]; }; }; From e3e4c565c7cfdd4cf0b80992db79d411ee840b84 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:35:17 +0100 Subject: [PATCH 0347/2308] Creating a mail server! --- nixos/queen/configuration.nix | 3 +++ nixos/queen/mail-server.nix | 35 +++++++++++++++++++++++++++++++++++ secrets/queen-Lillian.yaml | 5 +++-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 nixos/queen/mail-server.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 30ad1e7..511dc8e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -17,6 +17,7 @@ # ./nvim.nix ./hardware-configuration.nix ./nextcloud.nix + ./mail-server.nix ]; boot.tmp.cleanOnBoot = true; @@ -58,6 +59,8 @@ sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; sops.secrets."local.json".mode = "0440"; sops.secrets."local.json".owner = config.users.users.onlyoffice.name; + sops.secrets."mailpass".mode = "0440"; + sops.secrets."mailpass".owner = config.users.users."no-reply@nextcloud.gladtherescake.eu".name; nix = { gc = { diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix new file mode 100644 index 0000000..3da6644 --- /dev/null +++ b/nixos/queen/mail-server.nix @@ -0,0 +1,35 @@ +{ + inputs, + outputs, + config, + pkgs, + ... +}: { + imports = [ + (builtins.fetchTarball { + # Pick a release version you are interested in and set its hash, e.g. + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.3.0/nixos-mailserver-v2.3.0.tar.gz"; + # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: + # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack + sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919"; + }) + ]; + mailserver = { + enable = true; + fqdn = "mail.gladtherescake.eu"; + domains = ["nextcloud.gladtherescake.eu"]; + + loginAccounts = { + "no-reply@nextcloud.gladtherescake.eu" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + aliases = ["postmaster@nextcloud.gladtherescake.eu" "abuse@nextcloud.gladtherescake.eu" "security@nextcloud.gladtherescake.eu"]; + }; + + # Use Let's Encrypt certificates. Note that this needs to set up a stripped + # down nginx and opens port 80. + certificateScheme = "acme-nginx"; + }; + security.acme.acceptTerms = true; + security.acme.defaults.email = "security@nextcloud.gladtherescake.eu"; + }; +} diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index cd1086e..7e81193 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -1,6 +1,7 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] local.json: ENC[AES256_GCM,data:EWMZTvnP9DmJKZq3mejvlSc8e2BZxcREn+XB1tAM5NLS0G2fdWJThkkgRz2owdAiZV2BLc/yqr4DqJzDIXiOxWWBGAbqRFH5kPw2mAdkAcW76F8tUNQSBtQXM+Gu3W3EwjQwNiwVlb1jB0BNWU4TJfZGfdk2Vt0R7ggTJhRIAwQiXC1VtMWmlAOyRIaiMzaY4ktEMJT/nxF8koZV79kiCFcAGHzoYynW16y2QkaxFca/4bTvBJCAMBuK0lLF9xeipyGZUgxPV/OAQkrQGAqHcrHL+FmQiFEIuLUBzTDQp57kV1EKKCevRUcPCX/NhQGgLYVgDrsLTb1ftB30yHjWUap+JttKXBk2HElnQVEdS37zADyQ8tYrD+2l2CLrBGctVpg6K61OP44=,iv:VbJgmvIN1/FjQJl58KBsDNTyUWtIAYbBB0iPe6I0+hE=,tag:if16JgRVPeC+m8vFeYhKtA==,type:str] +mailpass: ENC[AES256_GCM,data:UVrc1RUV0xJFPiZ8J4refglR0p35gUd21EvvTSoeXHVE9/xC0biKmjdPu8cBmimNPmKJMvZRf8wOz+/x,iv:zIYI9JY/bfUc3nNPNopKMbh09B6KUotMUAmNDzVUBN8=,tag:53N8WlQ5CDlrp/KIEQiHgQ==,type:str] sops: kms: [] gcp_kms: [] @@ -16,8 +17,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-23T19:03:04Z" - mac: ENC[AES256_GCM,data:SaC8fw76/O1C4ahiFmpDpF19X8jXUVAs+i86dDSkHLllRxUXsVujW4NUsX0aq2OOSAFZE5QVy/Aq7Os3MsEBNezd0YxCgVpzKOj/6YUUEoNDhZGvd2n1a3ULoqlWNBhmRd42MvEWVoTWPJHlv34fkoYD+NRD1jF3QLwANBGcVqA=,iv:x1AoAMdt6+M/+mLatWpLWBTPyaRS2/pYSj250DkZWdU=,tag:HHF/zb8VWIaj8Q9T4NFwAw==,type:str] + lastmodified: "2023-11-24T14:30:34Z" + mac: ENC[AES256_GCM,data:Tl4eqh2SUEcgfOynbLoclpJKhMHkkaeV3bvkYB4dc3tv9hEWuX5HR1iI67+HVImdLcJ1zTyWkNSl+89MOWkSB85Rb643uCa5myDFQ30PHWN2ubPVoY3XzucW0nzBllZZsH6lPakNXwHTLkcf1etnWzL+/sXnYff2S/WPqTAdkwU=,iv:aWlA7jfBGStCELf/6ij2aT7EAwRp/RQP5Sw4WMPqbtE=,tag:bvSiyFrqPP0uB71zQTH08Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 0916250a9cfe976b6518fcbc173310882abfa9ae Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:35:17 +0100 Subject: [PATCH 0348/2308] Creating a mail server! --- nixos/queen/configuration.nix | 3 +++ nixos/queen/mail-server.nix | 35 +++++++++++++++++++++++++++++++++++ secrets/queen-Lillian.yaml | 5 +++-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 nixos/queen/mail-server.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 30ad1e7..511dc8e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -17,6 +17,7 @@ # ./nvim.nix ./hardware-configuration.nix ./nextcloud.nix + ./mail-server.nix ]; boot.tmp.cleanOnBoot = true; @@ -58,6 +59,8 @@ sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; sops.secrets."local.json".mode = "0440"; sops.secrets."local.json".owner = config.users.users.onlyoffice.name; + sops.secrets."mailpass".mode = "0440"; + sops.secrets."mailpass".owner = config.users.users."no-reply@nextcloud.gladtherescake.eu".name; nix = { gc = { diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix new file mode 100644 index 0000000..3da6644 --- /dev/null +++ b/nixos/queen/mail-server.nix @@ -0,0 +1,35 @@ +{ + inputs, + outputs, + config, + pkgs, + ... +}: { + imports = [ + (builtins.fetchTarball { + # Pick a release version you are interested in and set its hash, e.g. + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.3.0/nixos-mailserver-v2.3.0.tar.gz"; + # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: + # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack + sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919"; + }) + ]; + mailserver = { + enable = true; + fqdn = "mail.gladtherescake.eu"; + domains = ["nextcloud.gladtherescake.eu"]; + + loginAccounts = { + "no-reply@nextcloud.gladtherescake.eu" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + aliases = ["postmaster@nextcloud.gladtherescake.eu" "abuse@nextcloud.gladtherescake.eu" "security@nextcloud.gladtherescake.eu"]; + }; + + # Use Let's Encrypt certificates. Note that this needs to set up a stripped + # down nginx and opens port 80. + certificateScheme = "acme-nginx"; + }; + security.acme.acceptTerms = true; + security.acme.defaults.email = "security@nextcloud.gladtherescake.eu"; + }; +} diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index cd1086e..7e81193 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -1,6 +1,7 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] local.json: ENC[AES256_GCM,data:EWMZTvnP9DmJKZq3mejvlSc8e2BZxcREn+XB1tAM5NLS0G2fdWJThkkgRz2owdAiZV2BLc/yqr4DqJzDIXiOxWWBGAbqRFH5kPw2mAdkAcW76F8tUNQSBtQXM+Gu3W3EwjQwNiwVlb1jB0BNWU4TJfZGfdk2Vt0R7ggTJhRIAwQiXC1VtMWmlAOyRIaiMzaY4ktEMJT/nxF8koZV79kiCFcAGHzoYynW16y2QkaxFca/4bTvBJCAMBuK0lLF9xeipyGZUgxPV/OAQkrQGAqHcrHL+FmQiFEIuLUBzTDQp57kV1EKKCevRUcPCX/NhQGgLYVgDrsLTb1ftB30yHjWUap+JttKXBk2HElnQVEdS37zADyQ8tYrD+2l2CLrBGctVpg6K61OP44=,iv:VbJgmvIN1/FjQJl58KBsDNTyUWtIAYbBB0iPe6I0+hE=,tag:if16JgRVPeC+m8vFeYhKtA==,type:str] +mailpass: ENC[AES256_GCM,data:UVrc1RUV0xJFPiZ8J4refglR0p35gUd21EvvTSoeXHVE9/xC0biKmjdPu8cBmimNPmKJMvZRf8wOz+/x,iv:zIYI9JY/bfUc3nNPNopKMbh09B6KUotMUAmNDzVUBN8=,tag:53N8WlQ5CDlrp/KIEQiHgQ==,type:str] sops: kms: [] gcp_kms: [] @@ -16,8 +17,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-23T19:03:04Z" - mac: ENC[AES256_GCM,data:SaC8fw76/O1C4ahiFmpDpF19X8jXUVAs+i86dDSkHLllRxUXsVujW4NUsX0aq2OOSAFZE5QVy/Aq7Os3MsEBNezd0YxCgVpzKOj/6YUUEoNDhZGvd2n1a3ULoqlWNBhmRd42MvEWVoTWPJHlv34fkoYD+NRD1jF3QLwANBGcVqA=,iv:x1AoAMdt6+M/+mLatWpLWBTPyaRS2/pYSj250DkZWdU=,tag:HHF/zb8VWIaj8Q9T4NFwAw==,type:str] + lastmodified: "2023-11-24T14:30:34Z" + mac: ENC[AES256_GCM,data:Tl4eqh2SUEcgfOynbLoclpJKhMHkkaeV3bvkYB4dc3tv9hEWuX5HR1iI67+HVImdLcJ1zTyWkNSl+89MOWkSB85Rb643uCa5myDFQ30PHWN2ubPVoY3XzucW0nzBllZZsH6lPakNXwHTLkcf1etnWzL+/sXnYff2S/WPqTAdkwU=,iv:aWlA7jfBGStCELf/6ij2aT7EAwRp/RQP5Sw4WMPqbtE=,tag:bvSiyFrqPP0uB71zQTH08Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From d0a420d7767b9434df3a7bd0c7308f1428c0e3b2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:38:31 +0100 Subject: [PATCH 0349/2308] Let's hope the certificates already work? --- nixos/queen/mail-server.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 3da6644..12e7ee6 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -24,12 +24,6 @@ hashedPasswordFile = config.sops.secrets."mailpass".path; aliases = ["postmaster@nextcloud.gladtherescake.eu" "abuse@nextcloud.gladtherescake.eu" "security@nextcloud.gladtherescake.eu"]; }; - - # Use Let's Encrypt certificates. Note that this needs to set up a stripped - # down nginx and opens port 80. - certificateScheme = "acme-nginx"; }; - security.acme.acceptTerms = true; - security.acme.defaults.email = "security@nextcloud.gladtherescake.eu"; }; } From ef1f8d393b2a3f17565494c51cab85eb55ece405 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:38:31 +0100 Subject: [PATCH 0350/2308] Let's hope the certificates already work? --- nixos/queen/mail-server.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 3da6644..12e7ee6 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -24,12 +24,6 @@ hashedPasswordFile = config.sops.secrets."mailpass".path; aliases = ["postmaster@nextcloud.gladtherescake.eu" "abuse@nextcloud.gladtherescake.eu" "security@nextcloud.gladtherescake.eu"]; }; - - # Use Let's Encrypt certificates. Note that this needs to set up a stripped - # down nginx and opens port 80. - certificateScheme = "acme-nginx"; }; - security.acme.acceptTerms = true; - security.acme.defaults.email = "security@nextcloud.gladtherescake.eu"; }; } From 97db73622cdd30428026ddd9fbce72093bfc9f08 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:40:36 +0100 Subject: [PATCH 0351/2308] Virtual mail user --- nixos/queen/configuration.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 511dc8e..15c7966 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -60,7 +60,7 @@ sops.secrets."local.json".mode = "0440"; sops.secrets."local.json".owner = config.users.users.onlyoffice.name; sops.secrets."mailpass".mode = "0440"; - sops.secrets."mailpass".owner = config.users.users."no-reply@nextcloud.gladtherescake.eu".name; + sops.secrets."mailpass".owner = config.users.users.virtualMail.name; nix = { gc = { @@ -161,6 +161,10 @@ isSystemUser = true; group = "mssql"; }; + virtualMail = { + isSystemUser = true; + group = "virtualMail"; + }; }; virtualisation.oci-containers.containers = { From 069a6fd18708b7f1a991368684cb7c196c620bc2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:40:36 +0100 Subject: [PATCH 0352/2308] Virtual mail user --- nixos/queen/configuration.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 511dc8e..15c7966 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -60,7 +60,7 @@ sops.secrets."local.json".mode = "0440"; sops.secrets."local.json".owner = config.users.users.onlyoffice.name; sops.secrets."mailpass".mode = "0440"; - sops.secrets."mailpass".owner = config.users.users."no-reply@nextcloud.gladtherescake.eu".name; + sops.secrets."mailpass".owner = config.users.users.virtualMail.name; nix = { gc = { @@ -161,6 +161,10 @@ isSystemUser = true; group = "mssql"; }; + virtualMail = { + isSystemUser = true; + group = "virtualMail"; + }; }; virtualisation.oci-containers.containers = { From 1e8632554f59196e1eb53b65c05b35dd633697e8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:46:14 +0100 Subject: [PATCH 0353/2308] Maybe if it's here? --- nixos/queen/mail-server.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 12e7ee6..4d9ad1a 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -14,6 +14,13 @@ sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919"; }) ]; + + users.users = { + virtualMail = { + isSystemUser = true; + group = "virtualMail"; + }; + }; mailserver = { enable = true; fqdn = "mail.gladtherescake.eu"; From 05337739c252606ba3936310c7e43d72d9a86d18 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:46:14 +0100 Subject: [PATCH 0354/2308] Maybe if it's here? --- nixos/queen/mail-server.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 12e7ee6..4d9ad1a 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -14,6 +14,13 @@ sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919"; }) ]; + + users.users = { + virtualMail = { + isSystemUser = true; + group = "virtualMail"; + }; + }; mailserver = { enable = true; fqdn = "mail.gladtherescake.eu"; From 68a8d45aae689492f01bdeb9603ef68b07661438 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:47:08 +0100 Subject: [PATCH 0355/2308] Is not a normal user! --- nixos/queen/mail-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 4d9ad1a..6be157a 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -18,6 +18,7 @@ users.users = { virtualMail = { isSystemUser = true; + isNormalUser = false; group = "virtualMail"; }; }; From 2c3233ce3de680ef710b03df9b961280171c4165 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:47:08 +0100 Subject: [PATCH 0356/2308] Is not a normal user! --- nixos/queen/mail-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 4d9ad1a..6be157a 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -18,6 +18,7 @@ users.users = { virtualMail = { isSystemUser = true; + isNormalUser = false; group = "virtualMail"; }; }; From 9852e85929051074b5ec8b29c3d2c4d5a6b3b06c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:54:31 +0100 Subject: [PATCH 0357/2308] Never mind for now --- nixos/queen/configuration.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 15c7966..3fd218e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -17,7 +17,7 @@ # ./nvim.nix ./hardware-configuration.nix ./nextcloud.nix - ./mail-server.nix + #./mail-server.nix ]; boot.tmp.cleanOnBoot = true; @@ -161,10 +161,6 @@ isSystemUser = true; group = "mssql"; }; - virtualMail = { - isSystemUser = true; - group = "virtualMail"; - }; }; virtualisation.oci-containers.containers = { From ca109e7f7164a59c980bbea5a93594cb1f41e499 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 15:54:31 +0100 Subject: [PATCH 0358/2308] Never mind for now --- nixos/queen/configuration.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 15c7966..3fd218e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -17,7 +17,7 @@ # ./nvim.nix ./hardware-configuration.nix ./nextcloud.nix - ./mail-server.nix + #./mail-server.nix ]; boot.tmp.cleanOnBoot = true; @@ -161,10 +161,6 @@ isSystemUser = true; group = "mssql"; }; - virtualMail = { - isSystemUser = true; - group = "virtualMail"; - }; }; virtualisation.oci-containers.containers = { From 89c1fe022affd11fdaf4a1761be01d3b9f0d82dc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 17:46:22 +0100 Subject: [PATCH 0359/2308] Change opcache and update flake lock --- flake.lock | 18 +++++++++--------- nixos/queen/nextcloud.nix | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 7efa93c..55be82d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700553346, - "narHash": "sha256-kW7uWsCv/lxuA824Ng6EYD9hlVYRyjuFn0xBbYltAeQ=", + "lastModified": 1700814342, + "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "1aabb0a31b25ad83cfaa37c3fe29053417cd9a0f", + "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 8807fe2..e736db1 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -48,6 +48,9 @@ configureRedis = true; maxUploadSize = "16G"; + #Increase opcache string buffer + phpOptions."opcache.interned_strings_buffer" = "23"; + extraAppsEnable = true; extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in From c73b262e94cfb01f87bba56453861a8d3033484d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 17:46:22 +0100 Subject: [PATCH 0360/2308] Change opcache and update flake lock --- flake.lock | 18 +++++++++--------- nixos/queen/nextcloud.nix | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 7efa93c..55be82d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700553346, - "narHash": "sha256-kW7uWsCv/lxuA824Ng6EYD9hlVYRyjuFn0xBbYltAeQ=", + "lastModified": 1700814342, + "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "1aabb0a31b25ad83cfaa37c3fe29053417cd9a0f", + "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 8807fe2..e736db1 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -48,6 +48,9 @@ configureRedis = true; maxUploadSize = "16G"; + #Increase opcache string buffer + phpOptions."opcache.interned_strings_buffer" = "23"; + extraAppsEnable = true; extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in From 145733d3b6127259931818300f61306303232ede Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 17:49:06 +0100 Subject: [PATCH 0361/2308] Remove the mail secrets for now --- nixos/queen/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 3fd218e..f3f88f4 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -59,8 +59,8 @@ sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; sops.secrets."local.json".mode = "0440"; sops.secrets."local.json".owner = config.users.users.onlyoffice.name; - sops.secrets."mailpass".mode = "0440"; - sops.secrets."mailpass".owner = config.users.users.virtualMail.name; + #sops.secrets."mailpass".mode = "0440"; + #sops.secrets."mailpass".owner = config.users.users.virtualMail.name; nix = { gc = { From 6d795b917e7fee44a7afad7fe68ca0cbbd2127ea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 17:49:06 +0100 Subject: [PATCH 0362/2308] Remove the mail secrets for now --- nixos/queen/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 3fd218e..f3f88f4 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -59,8 +59,8 @@ sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; sops.secrets."local.json".mode = "0440"; sops.secrets."local.json".owner = config.users.users.onlyoffice.name; - sops.secrets."mailpass".mode = "0440"; - sops.secrets."mailpass".owner = config.users.users.virtualMail.name; + #sops.secrets."mailpass".mode = "0440"; + #sops.secrets."mailpass".owner = config.users.users.virtualMail.name; nix = { gc = { From 8bcef37db752789d5154f1bc43eae6e63a061961 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 21:44:59 +0100 Subject: [PATCH 0363/2308] add initial akkoma and init rabbitmq for office --- nixos/queen/akkoma.nix | 26 ++++++++++++++++++++++++++ nixos/queen/configuration.nix | 5 +++++ nixos/queen/nextcloud.nix | 4 ++++ 3 files changed, 35 insertions(+) create mode 100644 nixos/queen/akkoma.nix diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix new file mode 100644 index 0000000..caa11b3 --- /dev/null +++ b/nixos/queen/akkoma.nix @@ -0,0 +1,26 @@ +{ + config, + pkgs, + ... +}: { + users.groups.akkoma = {}; + + users.users = { + akkoma = { + isSystemUser = true; + group = "akkoma"; + }; + }; + + services.akkoma = { + enable = true; + package = pkgs.akkoma; + extraPackages = with pkgs; [ffmpeg exiftool imagemagick]; + nginx = { + addSSL = true; + enableACME = true; + forceSSL = true; + serverName = "akkoma.gladtherescake.eu"; + }; + }; +} diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index f3f88f4..4f5c1a9 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -18,6 +18,7 @@ ./hardware-configuration.nix ./nextcloud.nix #./mail-server.nix + #./akkoma.nix ]; boot.tmp.cleanOnBoot = true; @@ -85,12 +86,15 @@ }; environment.systemPackages = with pkgs; [ + akkoma age fzf docker docker-compose git alejandra + exiftool + imagemagick ffmpeg aria2 git-filter-repo @@ -105,6 +109,7 @@ postgresql python3 rsync + rabbitmq-server youtube-dl wget zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index e736db1..c7d2b2c 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -85,6 +85,10 @@ jwtSecretFile = config.sops.secrets."local.json".path; }; + services.rabbitmq = { + enable = true; + }; + # Enable PostgreSQL services.postgresql = { enable = true; From 8d81a1b434b06dc656ab9d1cefc005a6b967c83c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 21:44:59 +0100 Subject: [PATCH 0364/2308] add initial akkoma and init rabbitmq for office --- nixos/queen/akkoma.nix | 26 ++++++++++++++++++++++++++ nixos/queen/configuration.nix | 5 +++++ nixos/queen/nextcloud.nix | 4 ++++ 3 files changed, 35 insertions(+) create mode 100644 nixos/queen/akkoma.nix diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix new file mode 100644 index 0000000..caa11b3 --- /dev/null +++ b/nixos/queen/akkoma.nix @@ -0,0 +1,26 @@ +{ + config, + pkgs, + ... +}: { + users.groups.akkoma = {}; + + users.users = { + akkoma = { + isSystemUser = true; + group = "akkoma"; + }; + }; + + services.akkoma = { + enable = true; + package = pkgs.akkoma; + extraPackages = with pkgs; [ffmpeg exiftool imagemagick]; + nginx = { + addSSL = true; + enableACME = true; + forceSSL = true; + serverName = "akkoma.gladtherescake.eu"; + }; + }; +} diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index f3f88f4..4f5c1a9 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -18,6 +18,7 @@ ./hardware-configuration.nix ./nextcloud.nix #./mail-server.nix + #./akkoma.nix ]; boot.tmp.cleanOnBoot = true; @@ -85,12 +86,15 @@ }; environment.systemPackages = with pkgs; [ + akkoma age fzf docker docker-compose git alejandra + exiftool + imagemagick ffmpeg aria2 git-filter-repo @@ -105,6 +109,7 @@ postgresql python3 rsync + rabbitmq-server youtube-dl wget zsh diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index e736db1..c7d2b2c 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -85,6 +85,10 @@ jwtSecretFile = config.sops.secrets."local.json".path; }; + services.rabbitmq = { + enable = true; + }; + # Enable PostgreSQL services.postgresql = { enable = true; From 0dc295d6598fa964e6fc2e72278777f731f0efff Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:07:17 +0100 Subject: [PATCH 0365/2308] Try and run the example server? --- nixos/queen/nextcloud.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index c7d2b2c..bdc6f28 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,6 +78,7 @@ services.onlyoffice = { enable = true; + example = true; hostname = "onlyoffice.gladtherescake.eu"; postgresHost = "/run/postgesql"; postgresUser = "onlyoffice"; From fd958623bb76e83de64663474a58984235c99741 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:07:17 +0100 Subject: [PATCH 0366/2308] Try and run the example server? --- nixos/queen/nextcloud.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index c7d2b2c..bdc6f28 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,6 +78,7 @@ services.onlyoffice = { enable = true; + example = true; hostname = "onlyoffice.gladtherescake.eu"; postgresHost = "/run/postgesql"; postgresUser = "onlyoffice"; From 31a65e043558e649bfe2609e6119ea22cd8c249e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:08:11 +0100 Subject: [PATCH 0367/2308] That's not a real option --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index bdc6f28..ac85d02 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,7 +78,7 @@ services.onlyoffice = { enable = true; - example = true; + enableExampleServer = true; hostname = "onlyoffice.gladtherescake.eu"; postgresHost = "/run/postgesql"; postgresUser = "onlyoffice"; From 9e92c0c9003e5e52cbf55b241f187ef3c2ae5e07 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:08:11 +0100 Subject: [PATCH 0368/2308] That's not a real option --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index bdc6f28..ac85d02 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,7 +78,7 @@ services.onlyoffice = { enable = true; - example = true; + enableExampleServer = true; hostname = "onlyoffice.gladtherescake.eu"; postgresHost = "/run/postgesql"; postgresUser = "onlyoffice"; From c9fe5660bb92fd74ff53def9aaecd53033555e70 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:12:22 +0100 Subject: [PATCH 0369/2308] This can't be right if it needs a port --- nixos/queen/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index ac85d02..c7d2b2c 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,7 +78,6 @@ services.onlyoffice = { enable = true; - enableExampleServer = true; hostname = "onlyoffice.gladtherescake.eu"; postgresHost = "/run/postgesql"; postgresUser = "onlyoffice"; From 8aedb7ee9d38a77a05c4e6652db014caf81d279b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:12:22 +0100 Subject: [PATCH 0370/2308] This can't be right if it needs a port --- nixos/queen/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index ac85d02..c7d2b2c 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,7 +78,6 @@ services.onlyoffice = { enable = true; - enableExampleServer = true; hostname = "onlyoffice.gladtherescake.eu"; postgresHost = "/run/postgesql"; postgresUser = "onlyoffice"; From f231ffb548c4e4f27a5e7c861c0ee839df1c1978 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:21:42 +0100 Subject: [PATCH 0371/2308] Try running it on localhost? --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index c7d2b2c..0abb4ad 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,7 +78,7 @@ services.onlyoffice = { enable = true; - hostname = "onlyoffice.gladtherescake.eu"; + hostname = "localhost"; postgresHost = "/run/postgesql"; postgresUser = "onlyoffice"; postgresName = "onlyoffice"; From 38d70b373aaca00e2ab7d8134a7932a1ad6871de Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:21:42 +0100 Subject: [PATCH 0372/2308] Try running it on localhost? --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index c7d2b2c..0abb4ad 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,7 +78,7 @@ services.onlyoffice = { enable = true; - hostname = "onlyoffice.gladtherescake.eu"; + hostname = "localhost"; postgresHost = "/run/postgesql"; postgresUser = "onlyoffice"; postgresName = "onlyoffice"; From bb38f3ce2923b61945eb5690bbc9d6a02e294820 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:29:44 +0100 Subject: [PATCH 0373/2308] Try a very bare bones setup? --- nixos/queen/nextcloud.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 0abb4ad..68635b1 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,11 +78,11 @@ services.onlyoffice = { enable = true; - hostname = "localhost"; - postgresHost = "/run/postgesql"; - postgresUser = "onlyoffice"; - postgresName = "onlyoffice"; - jwtSecretFile = config.sops.secrets."local.json".path; + hostname = "office.gladtherescake.eu"; + #postgresHost = "/run/postgesql"; + #postgresUser = "onlyoffice"; + #postgresName = "onlyoffice"; + #jwtSecretFile = config.sops.secrets."local.json".path; }; services.rabbitmq = { From 28fdb6c5b24b43626b934b54a1950a5c0ea078d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:29:44 +0100 Subject: [PATCH 0374/2308] Try a very bare bones setup? --- nixos/queen/nextcloud.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 0abb4ad..68635b1 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,11 +78,11 @@ services.onlyoffice = { enable = true; - hostname = "localhost"; - postgresHost = "/run/postgesql"; - postgresUser = "onlyoffice"; - postgresName = "onlyoffice"; - jwtSecretFile = config.sops.secrets."local.json".path; + hostname = "office.gladtherescake.eu"; + #postgresHost = "/run/postgesql"; + #postgresUser = "onlyoffice"; + #postgresName = "onlyoffice"; + #jwtSecretFile = config.sops.secrets."local.json".path; }; services.rabbitmq = { From 612d76c202109e32da64abaec1e38b7bfb076396 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:33:06 +0100 Subject: [PATCH 0375/2308] Run all the things after sops pls --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 68635b1..c64bdd7 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -113,7 +113,7 @@ }; systemd.services."sops-nix.service" = { - before = ["nextcloud-setup.service" "postgresql.service" "onlyoffice.service"]; + before = ["nextcloud-setup.service" "postgresql.service" "onlyoffice-converter.service" "onlyoffice-docservice.service" "nginx.service" "phpfpm-nextcloud.service" "redis-nextcloud.service"]; }; # Ensure that postgres is running before running the setup From c46fbb808e0386ae9986102529ddc2a99d31981e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:33:06 +0100 Subject: [PATCH 0376/2308] Run all the things after sops pls --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 68635b1..c64bdd7 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -113,7 +113,7 @@ }; systemd.services."sops-nix.service" = { - before = ["nextcloud-setup.service" "postgresql.service" "onlyoffice.service"]; + before = ["nextcloud-setup.service" "postgresql.service" "onlyoffice-converter.service" "onlyoffice-docservice.service" "nginx.service" "phpfpm-nextcloud.service" "redis-nextcloud.service"]; }; # Ensure that postgres is running before running the setup From cfd0fcf082e19c0540b195ec070f22e9235b3d2c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:39:18 +0100 Subject: [PATCH 0377/2308] idk why this would remove ssl but it did --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index c64bdd7..9d18d31 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,7 +78,7 @@ services.onlyoffice = { enable = true; - hostname = "office.gladtherescake.eu"; + hostname = "onlyoffice.gladtherescake.eu"; #postgresHost = "/run/postgesql"; #postgresUser = "onlyoffice"; #postgresName = "onlyoffice"; From 7cc885316c7fe2292932363b06cc827f71f41b55 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Nov 2023 22:39:18 +0100 Subject: [PATCH 0378/2308] idk why this would remove ssl but it did --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index c64bdd7..9d18d31 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -78,7 +78,7 @@ services.onlyoffice = { enable = true; - hostname = "office.gladtherescake.eu"; + hostname = "onlyoffice.gladtherescake.eu"; #postgresHost = "/run/postgesql"; #postgresUser = "onlyoffice"; #postgresName = "onlyoffice"; From d2bff65f03ed2278a2fc75c31fdfc9b5441b5817 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:47:00 +0100 Subject: [PATCH 0379/2308] Some initial updates to the mail server --- nixos/queen/configuration.nix | 4 ++-- nixos/queen/mail-server.nix | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 4f5c1a9..a8f2bb2 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -60,8 +60,8 @@ sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; sops.secrets."local.json".mode = "0440"; sops.secrets."local.json".owner = config.users.users.onlyoffice.name; - #sops.secrets."mailpass".mode = "0440"; - #sops.secrets."mailpass".owner = config.users.users.virtualMail.name; + sops.secrets."mailpass".mode = "0440"; + sops.secrets."mailpass".owner = config.users.users.virtualMail.name; nix = { gc = { diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 6be157a..413f5ae 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -1,6 +1,7 @@ { inputs, outputs, + lib, config, pkgs, ... @@ -15,6 +16,8 @@ }) ]; + users.groups.virtualMail = {}; + users.users = { virtualMail = { isSystemUser = true; @@ -26,12 +29,21 @@ enable = true; fqdn = "mail.gladtherescake.eu"; domains = ["nextcloud.gladtherescake.eu"]; + mailserver.enableImapSsl = true; loginAccounts = { "no-reply@nextcloud.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; - aliases = ["postmaster@nextcloud.gladtherescake.eu" "abuse@nextcloud.gladtherescake.eu" "security@nextcloud.gladtherescake.eu"]; }; }; + forwards = { + "abuse@nextcloud.gladtherescake.eu" = "nextcloud@gladtherescake.eu"; + "postmaster@nextcloud.gladtherescake.eu" = "nextcloud@gladtherescake.eu"; + }; + openFirewall = true; + mailserver.rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; + certificateScheme = "acme-nginx"; }; + security.acme.acceptTerms = true; + security.acme.defaults.email = "letsencryp@gladtherescake.eu"; } From ea8c4b77cf9b163b7ade2ec3b4e175f95ddae606 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:47:00 +0100 Subject: [PATCH 0380/2308] Some initial updates to the mail server --- nixos/queen/configuration.nix | 4 ++-- nixos/queen/mail-server.nix | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 4f5c1a9..a8f2bb2 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -60,8 +60,8 @@ sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; sops.secrets."local.json".mode = "0440"; sops.secrets."local.json".owner = config.users.users.onlyoffice.name; - #sops.secrets."mailpass".mode = "0440"; - #sops.secrets."mailpass".owner = config.users.users.virtualMail.name; + sops.secrets."mailpass".mode = "0440"; + sops.secrets."mailpass".owner = config.users.users.virtualMail.name; nix = { gc = { diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 6be157a..413f5ae 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -1,6 +1,7 @@ { inputs, outputs, + lib, config, pkgs, ... @@ -15,6 +16,8 @@ }) ]; + users.groups.virtualMail = {}; + users.users = { virtualMail = { isSystemUser = true; @@ -26,12 +29,21 @@ enable = true; fqdn = "mail.gladtherescake.eu"; domains = ["nextcloud.gladtherescake.eu"]; + mailserver.enableImapSsl = true; loginAccounts = { "no-reply@nextcloud.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; - aliases = ["postmaster@nextcloud.gladtherescake.eu" "abuse@nextcloud.gladtherescake.eu" "security@nextcloud.gladtherescake.eu"]; }; }; + forwards = { + "abuse@nextcloud.gladtherescake.eu" = "nextcloud@gladtherescake.eu"; + "postmaster@nextcloud.gladtherescake.eu" = "nextcloud@gladtherescake.eu"; + }; + openFirewall = true; + mailserver.rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; + certificateScheme = "acme-nginx"; }; + security.acme.acceptTerms = true; + security.acme.defaults.email = "letsencryp@gladtherescake.eu"; } From ed84541cbac9c7cc2f80e5ccc7cfd5926f49b57d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:48:47 +0100 Subject: [PATCH 0381/2308] Should probably define all users here --- nixos/queen/configuration.nix | 9 +++++++++ nixos/queen/mail-server.nix | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index a8f2bb2..ff67ad2 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -154,6 +154,8 @@ users.groups.mssql = {}; + users.groups.virtualMail = {}; + users.users = { lillian = { openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; @@ -161,11 +163,18 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; + nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; mssql = { isSystemUser = true; group = "mssql"; }; + + virtualMail = { + isSystemUser = true; + isNormalUser = false; + group = "virtualMail"; + }; }; virtualisation.oci-containers.containers = { diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 413f5ae..f177896 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -16,15 +16,6 @@ }) ]; - users.groups.virtualMail = {}; - - users.users = { - virtualMail = { - isSystemUser = true; - isNormalUser = false; - group = "virtualMail"; - }; - }; mailserver = { enable = true; fqdn = "mail.gladtherescake.eu"; From 81dacb770c43e1d00f980254d1582f65d7f96c34 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:48:47 +0100 Subject: [PATCH 0382/2308] Should probably define all users here --- nixos/queen/configuration.nix | 9 +++++++++ nixos/queen/mail-server.nix | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index a8f2bb2..ff67ad2 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -154,6 +154,8 @@ users.groups.mssql = {}; + users.groups.virtualMail = {}; + users.users = { lillian = { openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; @@ -161,11 +163,18 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; + nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; mssql = { isSystemUser = true; group = "mssql"; }; + + virtualMail = { + isSystemUser = true; + isNormalUser = false; + group = "virtualMail"; + }; }; virtualisation.oci-containers.containers = { diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 413f5ae..f177896 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -16,15 +16,6 @@ }) ]; - users.groups.virtualMail = {}; - - users.users = { - virtualMail = { - isSystemUser = true; - isNormalUser = false; - group = "virtualMail"; - }; - }; mailserver = { enable = true; fqdn = "mail.gladtherescake.eu"; From 17aaa403d5beb8d0d9c1a30587f8a446be7ec917 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:50:11 +0100 Subject: [PATCH 0383/2308] Now start the mail server? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ff67ad2..312a96f 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -17,7 +17,7 @@ # ./nvim.nix ./hardware-configuration.nix ./nextcloud.nix - #./mail-server.nix + ./mail-server.nix #./akkoma.nix ]; From 84e708705892845ded20b9cedeabc2e7611eb0b7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:50:11 +0100 Subject: [PATCH 0384/2308] Now start the mail server? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ff67ad2..312a96f 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -17,7 +17,7 @@ # ./nvim.nix ./hardware-configuration.nix ./nextcloud.nix - #./mail-server.nix + ./mail-server.nix #./akkoma.nix ]; From 43fd0bcde25a5c067d3d96232e99a37e6b7f2286 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:51:21 +0100 Subject: [PATCH 0385/2308] Forwards doesn't exist huh --- nixos/queen/mail-server.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index f177896..634174e 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -27,10 +27,6 @@ hashedPasswordFile = config.sops.secrets."mailpass".path; }; }; - forwards = { - "abuse@nextcloud.gladtherescake.eu" = "nextcloud@gladtherescake.eu"; - "postmaster@nextcloud.gladtherescake.eu" = "nextcloud@gladtherescake.eu"; - }; openFirewall = true; mailserver.rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; certificateScheme = "acme-nginx"; From dbe7b79a6a8910a0a21279bc76f2677797546198 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:51:21 +0100 Subject: [PATCH 0386/2308] Forwards doesn't exist huh --- nixos/queen/mail-server.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index f177896..634174e 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -27,10 +27,6 @@ hashedPasswordFile = config.sops.secrets."mailpass".path; }; }; - forwards = { - "abuse@nextcloud.gladtherescake.eu" = "nextcloud@gladtherescake.eu"; - "postmaster@nextcloud.gladtherescake.eu" = "nextcloud@gladtherescake.eu"; - }; openFirewall = true; mailserver.rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; certificateScheme = "acme-nginx"; From c4655daff21eaae185aca0d57795ad3cc20040aa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:51:58 +0100 Subject: [PATCH 0387/2308] Oops, mailserver.mailserver doesn't exist --- nixos/queen/mail-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 634174e..88a0cf6 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -28,7 +28,7 @@ }; }; openFirewall = true; - mailserver.rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; + rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; certificateScheme = "acme-nginx"; }; security.acme.acceptTerms = true; From 0f4da7c157db2432819a91418abdb6d72fe81c64 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:51:58 +0100 Subject: [PATCH 0388/2308] Oops, mailserver.mailserver doesn't exist --- nixos/queen/mail-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 634174e..88a0cf6 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -28,7 +28,7 @@ }; }; openFirewall = true; - mailserver.rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; + rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; certificateScheme = "acme-nginx"; }; security.acme.acceptTerms = true; From 7db3c507e25108d2382e197a3da8f646f3cd869a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:52:26 +0100 Subject: [PATCH 0389/2308] Again the same... --- nixos/queen/mail-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 88a0cf6..aaebcc6 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -20,7 +20,7 @@ enable = true; fqdn = "mail.gladtherescake.eu"; domains = ["nextcloud.gladtherescake.eu"]; - mailserver.enableImapSsl = true; + enableImapSsl = true; loginAccounts = { "no-reply@nextcloud.gladtherescake.eu" = { From a4770e4adcfea6067da85a6e503115c5b833ae4c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:52:26 +0100 Subject: [PATCH 0390/2308] Again the same... --- nixos/queen/mail-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 88a0cf6..aaebcc6 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -20,7 +20,7 @@ enable = true; fqdn = "mail.gladtherescake.eu"; domains = ["nextcloud.gladtherescake.eu"]; - mailserver.enableImapSsl = true; + enableImapSsl = true; loginAccounts = { "no-reply@nextcloud.gladtherescake.eu" = { From 645aef8ccf014c2571c5a7cd9b8c4a8c518b253c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:52:54 +0100 Subject: [PATCH 0391/2308] Doesn't exist again... --- nixos/queen/mail-server.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index aaebcc6..d03cbe6 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -27,7 +27,6 @@ hashedPasswordFile = config.sops.secrets."mailpass".path; }; }; - openFirewall = true; rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; certificateScheme = "acme-nginx"; }; From b55be70e14ecdf475496860358acbe10b33a6872 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:52:54 +0100 Subject: [PATCH 0392/2308] Doesn't exist again... --- nixos/queen/mail-server.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index aaebcc6..d03cbe6 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -27,7 +27,6 @@ hashedPasswordFile = config.sops.secrets."mailpass".path; }; }; - openFirewall = true; rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; certificateScheme = "acme-nginx"; }; From 796fafa86cebdea229f5bdcc43a9d614c9a3bf46 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:58:59 +0100 Subject: [PATCH 0393/2308] AH I was using an outdated version... --- nixos/queen/mail-server.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index d03cbe6..1ec47ce 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -9,10 +9,10 @@ imports = [ (builtins.fetchTarball { # Pick a release version you are interested in and set its hash, e.g. - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.3.0/nixos-mailserver-v2.3.0.tar.gz"; + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/24128c3052090311688b09a400aa408ba61c6ee5/nixos-mailserver-A-COMMIT-ID.tar.gz"; # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: - # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack - sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919"; + # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/24128c3052090311688b09a400aa408ba61c6ee5/nixos-mailserver-A-COMMIT-ID.tar.gz" --unpack + sha256 = "1ngil2shzkf61qxiqw11awyl81cr7ks2kv3r3k243zz7v2xakm5c"; }) ]; From 3e25257985c59e33460bc83fab98ad37b95eaaaa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 00:58:59 +0100 Subject: [PATCH 0394/2308] AH I was using an outdated version... --- nixos/queen/mail-server.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index d03cbe6..1ec47ce 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -9,10 +9,10 @@ imports = [ (builtins.fetchTarball { # Pick a release version you are interested in and set its hash, e.g. - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.3.0/nixos-mailserver-v2.3.0.tar.gz"; + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/24128c3052090311688b09a400aa408ba61c6ee5/nixos-mailserver-A-COMMIT-ID.tar.gz"; # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: - # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack - sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919"; + # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/24128c3052090311688b09a400aa408ba61c6ee5/nixos-mailserver-A-COMMIT-ID.tar.gz" --unpack + sha256 = "1ngil2shzkf61qxiqw11awyl81cr7ks2kv3r3k243zz7v2xakm5c"; }) ]; From cd181cd3925017f7216a2c3b2b889f639b5a7666 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 01:00:00 +0100 Subject: [PATCH 0395/2308] Don't need this double! --- nixos/queen/mail-server.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 1ec47ce..824aaf6 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -30,6 +30,4 @@ rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; certificateScheme = "acme-nginx"; }; - security.acme.acceptTerms = true; - security.acme.defaults.email = "letsencryp@gladtherescake.eu"; } From 817f58dbd379066968554c612990efdb9c732570 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 01:00:00 +0100 Subject: [PATCH 0396/2308] Don't need this double! --- nixos/queen/mail-server.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 1ec47ce..824aaf6 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -30,6 +30,4 @@ rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; certificateScheme = "acme-nginx"; }; - security.acme.acceptTerms = true; - security.acme.defaults.email = "letsencryp@gladtherescake.eu"; } From f89f5a468c4801915d86a94e584ec216d84f68f2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 01:07:55 +0100 Subject: [PATCH 0397/2308] Let's remove this ssl setting that's not in guide --- nixos/queen/configuration.nix | 1 - nixos/queen/mail-server.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 312a96f..f009f66 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -148,7 +148,6 @@ security.acme = { acceptTerms = true; - # Replace the email here! defaults.email = "letsencrypt@gladtherescake.eu"; }; diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 824aaf6..2902db9 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -20,7 +20,6 @@ enable = true; fqdn = "mail.gladtherescake.eu"; domains = ["nextcloud.gladtherescake.eu"]; - enableImapSsl = true; loginAccounts = { "no-reply@nextcloud.gladtherescake.eu" = { From f9ba91454246a58b69082cc2a207191d6f5d148d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 01:07:55 +0100 Subject: [PATCH 0398/2308] Let's remove this ssl setting that's not in guide --- nixos/queen/configuration.nix | 1 - nixos/queen/mail-server.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 312a96f..f009f66 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -148,7 +148,6 @@ security.acme = { acceptTerms = true; - # Replace the email here! defaults.email = "letsencrypt@gladtherescake.eu"; }; diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 824aaf6..2902db9 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -20,7 +20,6 @@ enable = true; fqdn = "mail.gladtherescake.eu"; domains = ["nextcloud.gladtherescake.eu"]; - enableImapSsl = true; loginAccounts = { "no-reply@nextcloud.gladtherescake.eu" = { From 455a1e35038b8e1e9e3f5cbf26ce83780c025e57 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 01:15:34 +0100 Subject: [PATCH 0399/2308] Enable imap --- nixos/queen/mail-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 2902db9..9db9919 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -18,6 +18,7 @@ mailserver = { enable = true; + enableImap = true; fqdn = "mail.gladtherescake.eu"; domains = ["nextcloud.gladtherescake.eu"]; From 62e0492656a73f71b3cb1f6096da62c7ea45d311 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 01:15:34 +0100 Subject: [PATCH 0400/2308] Enable imap --- nixos/queen/mail-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 2902db9..9db9919 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -18,6 +18,7 @@ mailserver = { enable = true; + enableImap = true; fqdn = "mail.gladtherescake.eu"; domains = ["nextcloud.gladtherescake.eu"]; From 5b4a94028dcd909aee388ac56c2e0736b7fb88a0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 01:20:13 +0100 Subject: [PATCH 0401/2308] Enable smtp --- nixos/queen/mail-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 9db9919..72c3a08 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -19,6 +19,7 @@ mailserver = { enable = true; enableImap = true; + enableSubmission = true; fqdn = "mail.gladtherescake.eu"; domains = ["nextcloud.gladtherescake.eu"]; From 3f718af656ebfc1fdf6c854f32dde66dc3ac266d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 01:20:13 +0100 Subject: [PATCH 0402/2308] Enable smtp --- nixos/queen/mail-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 9db9919..72c3a08 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -19,6 +19,7 @@ mailserver = { enable = true; enableImap = true; + enableSubmission = true; fqdn = "mail.gladtherescake.eu"; domains = ["nextcloud.gladtherescake.eu"]; From 533a86e7c1606172b8c2d1721e4aad1ced8043ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 13:23:37 +0100 Subject: [PATCH 0403/2308] Enable akkoma --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index f009f66..35957e9 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -18,7 +18,7 @@ ./hardware-configuration.nix ./nextcloud.nix ./mail-server.nix - #./akkoma.nix + ./akkoma.nix ]; boot.tmp.cleanOnBoot = true; From 87e1eb66bc3a96d6752082ce45f894bf0294a9d3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 13:23:37 +0100 Subject: [PATCH 0404/2308] Enable akkoma --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index f009f66..35957e9 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -18,7 +18,7 @@ ./hardware-configuration.nix ./nextcloud.nix ./mail-server.nix - #./akkoma.nix + ./akkoma.nix ]; boot.tmp.cleanOnBoot = true; From c8349f2ed912c1d1318ec5ef10ac56babee6952f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 13:32:32 +0100 Subject: [PATCH 0405/2308] Try adding this --- nixos/queen/akkoma.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index caa11b3..defa6bd 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -1,4 +1,7 @@ { + inputs, + outputs, + lib, config, pkgs, ... From 93c4b9a90c11fad49dbdb0107ee1faa77cd045b8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 13:32:32 +0100 Subject: [PATCH 0406/2308] Try adding this --- nixos/queen/akkoma.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index caa11b3..defa6bd 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -1,4 +1,7 @@ { + inputs, + outputs, + lib, config, pkgs, ... From 608d96ae6ddaba7aacdd17743b51bbe2e573f396 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 13:53:13 +0100 Subject: [PATCH 0407/2308] Try and put some stuff in config --- nixos/queen/akkoma.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index defa6bd..04f7cc8 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,5 +25,16 @@ forceSSL = true; serverName = "akkoma.gladtherescake.eu"; }; + config = { + ":pleroma".":instance" = { + name = "GLaDTheresCake Akkoma"; + email = "akkoma@gladtherescake.eu"; + notify_email = "no-reply@akkoma.gladtherescake.eu"; + languages = ["en" "nl"]; + registrations_open = false; + max_pinned_statuses = 10; + cleanup_attachments = true; + }; + }; }; } From 44aca3fc2a3fddd823a6d14601b1dcb312960010 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 13:53:13 +0100 Subject: [PATCH 0408/2308] Try and put some stuff in config --- nixos/queen/akkoma.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index defa6bd..04f7cc8 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,5 +25,16 @@ forceSSL = true; serverName = "akkoma.gladtherescake.eu"; }; + config = { + ":pleroma".":instance" = { + name = "GLaDTheresCake Akkoma"; + email = "akkoma@gladtherescake.eu"; + notify_email = "no-reply@akkoma.gladtherescake.eu"; + languages = ["en" "nl"]; + registrations_open = false; + max_pinned_statuses = 10; + cleanup_attachments = true; + }; + }; }; } From 5ba171188a6e639e151423e4e7ed338401eeb3f2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 13:54:10 +0100 Subject: [PATCH 0409/2308] Oop mutually exclusive options --- nixos/queen/akkoma.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 04f7cc8..c8a9044 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -20,7 +20,6 @@ package = pkgs.akkoma; extraPackages = with pkgs; [ffmpeg exiftool imagemagick]; nginx = { - addSSL = true; enableACME = true; forceSSL = true; serverName = "akkoma.gladtherescake.eu"; From 27ec323bbef610a53ff3d24cc91af1898613fadc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 13:54:10 +0100 Subject: [PATCH 0410/2308] Oop mutually exclusive options --- nixos/queen/akkoma.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 04f7cc8..c8a9044 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -20,7 +20,6 @@ package = pkgs.akkoma; extraPackages = with pkgs; [ffmpeg exiftool imagemagick]; nginx = { - addSSL = true; enableACME = true; forceSSL = true; serverName = "akkoma.gladtherescake.eu"; From 47d3a0517ea11e9010e3a652b202a844ef4140c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 13:55:44 +0100 Subject: [PATCH 0411/2308] Need a description it says --- nixos/queen/akkoma.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index c8a9044..27d1466 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -29,6 +29,7 @@ name = "GLaDTheresCake Akkoma"; email = "akkoma@gladtherescake.eu"; notify_email = "no-reply@akkoma.gladtherescake.eu"; + description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; registrations_open = false; max_pinned_statuses = 10; From 9b789c6140b287fc3e5ddcfaa53e09b897e7bc2e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 13:55:44 +0100 Subject: [PATCH 0412/2308] Need a description it says --- nixos/queen/akkoma.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index c8a9044..27d1466 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -29,6 +29,7 @@ name = "GLaDTheresCake Akkoma"; email = "akkoma@gladtherescake.eu"; notify_email = "no-reply@akkoma.gladtherescake.eu"; + description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; registrations_open = false; max_pinned_statuses = 10; From 1735e9d40741977070aeff641ed0776d5fd42ea3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 14:09:05 +0100 Subject: [PATCH 0413/2308] Add akkoma mail server --- nixos/queen/mail-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 72c3a08..05a1272 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -21,7 +21,7 @@ enableImap = true; enableSubmission = true; fqdn = "mail.gladtherescake.eu"; - domains = ["nextcloud.gladtherescake.eu"]; + domains = ["nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu"]; loginAccounts = { "no-reply@nextcloud.gladtherescake.eu" = { From fd87cdd751871f0b4a574940a81628ca10e79b91 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 14:09:05 +0100 Subject: [PATCH 0414/2308] Add akkoma mail server --- nixos/queen/mail-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 72c3a08..05a1272 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -21,7 +21,7 @@ enableImap = true; enableSubmission = true; fqdn = "mail.gladtherescake.eu"; - domains = ["nextcloud.gladtherescake.eu"]; + domains = ["nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu"]; loginAccounts = { "no-reply@nextcloud.gladtherescake.eu" = { From be1873c8f9fee9e017c52573efe00891fd1e9a09 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 14:14:34 +0100 Subject: [PATCH 0415/2308] Set up the no-reply for akkoma --- nixos/queen/mail-server.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 05a1272..d498e8b 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -27,8 +27,11 @@ "no-reply@nextcloud.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; + "no-reply@akkoma.gladtherescake.eu" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + }; }; - rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; + rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu"]; certificateScheme = "acme-nginx"; }; } From 6046af07d40a6fb94cdec37f7d6a9c56ff3fc6a2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 14:14:34 +0100 Subject: [PATCH 0416/2308] Set up the no-reply for akkoma --- nixos/queen/mail-server.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 05a1272..d498e8b 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -27,8 +27,11 @@ "no-reply@nextcloud.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; + "no-reply@akkoma.gladtherescake.eu" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + }; }; - rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu"]; + rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu"]; certificateScheme = "acme-nginx"; }; } From 4ade46b204f054e8e08d1e3d6fd0ec366327cf6a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 14:16:57 +0100 Subject: [PATCH 0417/2308] Open registrations for me --- nixos/queen/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 27d1466..bb63518 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -31,7 +31,7 @@ notify_email = "no-reply@akkoma.gladtherescake.eu"; description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; - registrations_open = false; + registrations_open = true; max_pinned_statuses = 10; cleanup_attachments = true; }; From 119544da0d6f94dd0311e39d62b0b437cd4a2a78 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 14:16:57 +0100 Subject: [PATCH 0418/2308] Open registrations for me --- nixos/queen/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 27d1466..bb63518 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -31,7 +31,7 @@ notify_email = "no-reply@akkoma.gladtherescake.eu"; description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; - registrations_open = false; + registrations_open = true; max_pinned_statuses = 10; cleanup_attachments = true; }; From 7846dceb8ae35029734d8f5e908ca809552975c9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 14:49:56 +0100 Subject: [PATCH 0419/2308] Setup db --- nixos/queen/akkoma.nix | 9 ++++++++- nixos/queen/nextcloud.nix | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index bb63518..9a11bed 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -29,9 +29,16 @@ name = "GLaDTheresCake Akkoma"; email = "akkoma@gladtherescake.eu"; notify_email = "no-reply@akkoma.gladtherescake.eu"; + emails.mailer = { + enabled = true; + adapter = "Swoosh.Adapters.Sendmail"; + cmd_path = "/run/wrappers/bin/sendmail"; + cmd_args = "-N delay,failure,success"; + qmail = true; + }; description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; - registrations_open = true; + registrations_open = false; max_pinned_statuses = 10; cleanup_attachments = true; }; diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 9d18d31..189c269 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -94,7 +94,7 @@ enable = true; # Ensure the database, user, and permissions always exist - ensureDatabases = ["nextcloud" "onlyoffice"]; + ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; ensureUsers = [ { name = "nextcloud"; @@ -104,6 +104,10 @@ name = "onlyoffice"; ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; } + { + name = "akkoma"; + ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + } ]; }; From f7b176f048cd4ff677ad67a349b5bfcaa0f8df38 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 14:49:56 +0100 Subject: [PATCH 0420/2308] Setup db --- nixos/queen/akkoma.nix | 9 ++++++++- nixos/queen/nextcloud.nix | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index bb63518..9a11bed 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -29,9 +29,16 @@ name = "GLaDTheresCake Akkoma"; email = "akkoma@gladtherescake.eu"; notify_email = "no-reply@akkoma.gladtherescake.eu"; + emails.mailer = { + enabled = true; + adapter = "Swoosh.Adapters.Sendmail"; + cmd_path = "/run/wrappers/bin/sendmail"; + cmd_args = "-N delay,failure,success"; + qmail = true; + }; description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; - registrations_open = true; + registrations_open = false; max_pinned_statuses = 10; cleanup_attachments = true; }; diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 9d18d31..189c269 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -94,7 +94,7 @@ enable = true; # Ensure the database, user, and permissions always exist - ensureDatabases = ["nextcloud" "onlyoffice"]; + ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; ensureUsers = [ { name = "nextcloud"; @@ -104,6 +104,10 @@ name = "onlyoffice"; ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; } + { + name = "akkoma"; + ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + } ]; }; From 2409e60f7b4bec46a859ecc5cc13a7d28c974019 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 15:01:28 +0100 Subject: [PATCH 0421/2308] Let's see if I can register at least? --- nixos/queen/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 9a11bed..d748415 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -38,7 +38,7 @@ }; description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; - registrations_open = false; + registrations_open = true; max_pinned_statuses = 10; cleanup_attachments = true; }; From 99eaa7d1c9e706bd6ac7035024f8ff97c43fb08b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 15:01:28 +0100 Subject: [PATCH 0422/2308] Let's see if I can register at least? --- nixos/queen/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 9a11bed..d748415 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -38,7 +38,7 @@ }; description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; - registrations_open = false; + registrations_open = true; max_pinned_statuses = 10; cleanup_attachments = true; }; From 0e9927c3e40ce87f6126985d341b4f513740f3d7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 15:12:25 +0100 Subject: [PATCH 0423/2308] Temporary admin token --- nixos/queen/akkoma.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index d748415..00f1e44 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,6 +25,7 @@ serverName = "akkoma.gladtherescake.eu"; }; config = { + ":pleroma".":admin_token" = "3xBpYUqvTugQ*9E$b^5aPaGt3uNNzA9c"; ":pleroma".":instance" = { name = "GLaDTheresCake Akkoma"; email = "akkoma@gladtherescake.eu"; From 4da0f7503025de1c7d78ef72db942e7c91188f1a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 15:12:25 +0100 Subject: [PATCH 0424/2308] Temporary admin token --- nixos/queen/akkoma.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index d748415..00f1e44 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,6 +25,7 @@ serverName = "akkoma.gladtherescake.eu"; }; config = { + ":pleroma".":admin_token" = "3xBpYUqvTugQ*9E$b^5aPaGt3uNNzA9c"; ":pleroma".":instance" = { name = "GLaDTheresCake Akkoma"; email = "akkoma@gladtherescake.eu"; From 87fb8f87d2c14c49258d95594e368874617037eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 15:27:35 +0100 Subject: [PATCH 0425/2308] Only letters then --- nixos/queen/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 00f1e44..2a8e235 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,7 +25,7 @@ serverName = "akkoma.gladtherescake.eu"; }; config = { - ":pleroma".":admin_token" = "3xBpYUqvTugQ*9E$b^5aPaGt3uNNzA9c"; + ":pleroma".":admin_token" = "uknJWzFoYtEyZXXsCCtAMYzojXMQoHas"; ":pleroma".":instance" = { name = "GLaDTheresCake Akkoma"; email = "akkoma@gladtherescake.eu"; From e04f316a2d411dce9cee79fcfd2f9ce5abaf4300 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 15:27:35 +0100 Subject: [PATCH 0426/2308] Only letters then --- nixos/queen/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 00f1e44..2a8e235 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,7 +25,7 @@ serverName = "akkoma.gladtherescake.eu"; }; config = { - ":pleroma".":admin_token" = "3xBpYUqvTugQ*9E$b^5aPaGt3uNNzA9c"; + ":pleroma".":admin_token" = "uknJWzFoYtEyZXXsCCtAMYzojXMQoHas"; ":pleroma".":instance" = { name = "GLaDTheresCake Akkoma"; email = "akkoma@gladtherescake.eu"; From af18a994e2bbecbe5eff28a6cc5060495cc756f3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 16:44:55 +0100 Subject: [PATCH 0427/2308] Add secret erlang cookie --- nixos/queen/akkoma.nix | 2 ++ nixos/queen/configuration.nix | 2 ++ secrets/queen-Lillian.yaml | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 2a8e235..c150c83 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -24,6 +24,8 @@ forceSSL = true; serverName = "akkoma.gladtherescake.eu"; }; + dist.cookie._secret = config.sops.secrets."releaseCookie".path; + config = { ":pleroma".":admin_token" = "uknJWzFoYtEyZXXsCCtAMYzojXMQoHas"; ":pleroma".":instance" = { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 35957e9..974817d 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -62,6 +62,8 @@ sops.secrets."local.json".owner = config.users.users.onlyoffice.name; sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; + sops.secrets."releaseCookie".mode = "0440"; + sops.secrets."releaseCookie".owner = config.users.users.akkoma.name; nix = { gc = { diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index 7e81193..fc2c77e 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -2,6 +2,7 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfU nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] local.json: ENC[AES256_GCM,data:EWMZTvnP9DmJKZq3mejvlSc8e2BZxcREn+XB1tAM5NLS0G2fdWJThkkgRz2owdAiZV2BLc/yqr4DqJzDIXiOxWWBGAbqRFH5kPw2mAdkAcW76F8tUNQSBtQXM+Gu3W3EwjQwNiwVlb1jB0BNWU4TJfZGfdk2Vt0R7ggTJhRIAwQiXC1VtMWmlAOyRIaiMzaY4ktEMJT/nxF8koZV79kiCFcAGHzoYynW16y2QkaxFca/4bTvBJCAMBuK0lLF9xeipyGZUgxPV/OAQkrQGAqHcrHL+FmQiFEIuLUBzTDQp57kV1EKKCevRUcPCX/NhQGgLYVgDrsLTb1ftB30yHjWUap+JttKXBk2HElnQVEdS37zADyQ8tYrD+2l2CLrBGctVpg6K61OP44=,iv:VbJgmvIN1/FjQJl58KBsDNTyUWtIAYbBB0iPe6I0+hE=,tag:if16JgRVPeC+m8vFeYhKtA==,type:str] mailpass: ENC[AES256_GCM,data:UVrc1RUV0xJFPiZ8J4refglR0p35gUd21EvvTSoeXHVE9/xC0biKmjdPu8cBmimNPmKJMvZRf8wOz+/x,iv:zIYI9JY/bfUc3nNPNopKMbh09B6KUotMUAmNDzVUBN8=,tag:53N8WlQ5CDlrp/KIEQiHgQ==,type:str] +releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/J0AP0o3qw==,iv:zS12xjcNbLaLaLd3VQT8+o9hDqTo1cZdxoPjjhiExDU=,tag:nJFelasEUjebEBpvmfcDEA==,type:str] sops: kms: [] gcp_kms: [] @@ -17,8 +18,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-24T14:30:34Z" - mac: ENC[AES256_GCM,data:Tl4eqh2SUEcgfOynbLoclpJKhMHkkaeV3bvkYB4dc3tv9hEWuX5HR1iI67+HVImdLcJ1zTyWkNSl+89MOWkSB85Rb643uCa5myDFQ30PHWN2ubPVoY3XzucW0nzBllZZsH6lPakNXwHTLkcf1etnWzL+/sXnYff2S/WPqTAdkwU=,iv:aWlA7jfBGStCELf/6ij2aT7EAwRp/RQP5Sw4WMPqbtE=,tag:bvSiyFrqPP0uB71zQTH08Q==,type:str] + lastmodified: "2023-11-25T15:44:36Z" + mac: ENC[AES256_GCM,data:W8TbF2J1OmvWYB59ZzGW7NKmzlKNln4jsNwh6XAIh2X3fOAplmvDZj6MzyK/UNiVzS4b5GfaYas140yVh9YUNkI9QL4CCAgSph+axwtPibjqCUfdMw2xWsgRlm6X9nxsDw0DFCGdJaM12G7thYBGJmIlCmOE2a9qiRv0ZDEXiMY=,iv:EZpeOqxDke5MxqpKCHjECefWYQJYEz0X8k3ebPyhawk=,tag:QUxAtB1hzFAoU2Qd5xA3VQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 58d30c64273a754065c87ce7fd2bb4468e5a20b4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 Nov 2023 16:44:55 +0100 Subject: [PATCH 0428/2308] Add secret erlang cookie --- nixos/queen/akkoma.nix | 2 ++ nixos/queen/configuration.nix | 2 ++ secrets/queen-Lillian.yaml | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 2a8e235..c150c83 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -24,6 +24,8 @@ forceSSL = true; serverName = "akkoma.gladtherescake.eu"; }; + dist.cookie._secret = config.sops.secrets."releaseCookie".path; + config = { ":pleroma".":admin_token" = "uknJWzFoYtEyZXXsCCtAMYzojXMQoHas"; ":pleroma".":instance" = { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 35957e9..974817d 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -62,6 +62,8 @@ sops.secrets."local.json".owner = config.users.users.onlyoffice.name; sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; + sops.secrets."releaseCookie".mode = "0440"; + sops.secrets."releaseCookie".owner = config.users.users.akkoma.name; nix = { gc = { diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index 7e81193..fc2c77e 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -2,6 +2,7 @@ nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfU nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str] local.json: ENC[AES256_GCM,data:EWMZTvnP9DmJKZq3mejvlSc8e2BZxcREn+XB1tAM5NLS0G2fdWJThkkgRz2owdAiZV2BLc/yqr4DqJzDIXiOxWWBGAbqRFH5kPw2mAdkAcW76F8tUNQSBtQXM+Gu3W3EwjQwNiwVlb1jB0BNWU4TJfZGfdk2Vt0R7ggTJhRIAwQiXC1VtMWmlAOyRIaiMzaY4ktEMJT/nxF8koZV79kiCFcAGHzoYynW16y2QkaxFca/4bTvBJCAMBuK0lLF9xeipyGZUgxPV/OAQkrQGAqHcrHL+FmQiFEIuLUBzTDQp57kV1EKKCevRUcPCX/NhQGgLYVgDrsLTb1ftB30yHjWUap+JttKXBk2HElnQVEdS37zADyQ8tYrD+2l2CLrBGctVpg6K61OP44=,iv:VbJgmvIN1/FjQJl58KBsDNTyUWtIAYbBB0iPe6I0+hE=,tag:if16JgRVPeC+m8vFeYhKtA==,type:str] mailpass: ENC[AES256_GCM,data:UVrc1RUV0xJFPiZ8J4refglR0p35gUd21EvvTSoeXHVE9/xC0biKmjdPu8cBmimNPmKJMvZRf8wOz+/x,iv:zIYI9JY/bfUc3nNPNopKMbh09B6KUotMUAmNDzVUBN8=,tag:53N8WlQ5CDlrp/KIEQiHgQ==,type:str] +releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/J0AP0o3qw==,iv:zS12xjcNbLaLaLd3VQT8+o9hDqTo1cZdxoPjjhiExDU=,tag:nJFelasEUjebEBpvmfcDEA==,type:str] sops: kms: [] gcp_kms: [] @@ -17,8 +18,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-24T14:30:34Z" - mac: ENC[AES256_GCM,data:Tl4eqh2SUEcgfOynbLoclpJKhMHkkaeV3bvkYB4dc3tv9hEWuX5HR1iI67+HVImdLcJ1zTyWkNSl+89MOWkSB85Rb643uCa5myDFQ30PHWN2ubPVoY3XzucW0nzBllZZsH6lPakNXwHTLkcf1etnWzL+/sXnYff2S/WPqTAdkwU=,iv:aWlA7jfBGStCELf/6ij2aT7EAwRp/RQP5Sw4WMPqbtE=,tag:bvSiyFrqPP0uB71zQTH08Q==,type:str] + lastmodified: "2023-11-25T15:44:36Z" + mac: ENC[AES256_GCM,data:W8TbF2J1OmvWYB59ZzGW7NKmzlKNln4jsNwh6XAIh2X3fOAplmvDZj6MzyK/UNiVzS4b5GfaYas140yVh9YUNkI9QL4CCAgSph+axwtPibjqCUfdMw2xWsgRlm6X9nxsDw0DFCGdJaM12G7thYBGJmIlCmOE2a9qiRv0ZDEXiMY=,iv:EZpeOqxDke5MxqpKCHjECefWYQJYEz0X8k3ebPyhawk=,tag:QUxAtB1hzFAoU2Qd5xA3VQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 8b17cc071d4448f3c97e23e4009f11ffce9beee2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 17:51:57 +0100 Subject: [PATCH 0429/2308] addd frontends --- nixos/queen/akkoma.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index c150c83..0a4373c 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -27,7 +27,6 @@ dist.cookie._secret = config.sops.secrets."releaseCookie".path; config = { - ":pleroma".":admin_token" = "uknJWzFoYtEyZXXsCCtAMYzojXMQoHas"; ":pleroma".":instance" = { name = "GLaDTheresCake Akkoma"; email = "akkoma@gladtherescake.eu"; @@ -39,6 +38,18 @@ cmd_args = "-N delay,failure,success"; qmail = true; }; + frontends = { + primary = { + package = pkgs.akkoma-frontends.akkoma-fe; + name = "akkoma-fe"; + ref = "stable"; + }; + admin = { + package = pkgs.akkoma-frontends.admin-fe; + name = "admin-fe"; + ref = "stable"; + }; + }; description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; registrations_open = true; From 30d3bdfa10fdd622716d9d3be9480fc7a6ba5312 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 17:51:57 +0100 Subject: [PATCH 0430/2308] addd frontends --- nixos/queen/akkoma.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index c150c83..0a4373c 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -27,7 +27,6 @@ dist.cookie._secret = config.sops.secrets."releaseCookie".path; config = { - ":pleroma".":admin_token" = "uknJWzFoYtEyZXXsCCtAMYzojXMQoHas"; ":pleroma".":instance" = { name = "GLaDTheresCake Akkoma"; email = "akkoma@gladtherescake.eu"; @@ -39,6 +38,18 @@ cmd_args = "-N delay,failure,success"; qmail = true; }; + frontends = { + primary = { + package = pkgs.akkoma-frontends.akkoma-fe; + name = "akkoma-fe"; + ref = "stable"; + }; + admin = { + package = pkgs.akkoma-frontends.admin-fe; + name = "admin-fe"; + ref = "stable"; + }; + }; description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; registrations_open = true; From 32e29effc5d80a0508acc624e6303e297949b3e7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 17:56:14 +0100 Subject: [PATCH 0431/2308] Possible infinite recursion? --- nixos/queen/akkoma.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 0a4373c..9b66bb3 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -38,18 +38,6 @@ cmd_args = "-N delay,failure,success"; qmail = true; }; - frontends = { - primary = { - package = pkgs.akkoma-frontends.akkoma-fe; - name = "akkoma-fe"; - ref = "stable"; - }; - admin = { - package = pkgs.akkoma-frontends.admin-fe; - name = "admin-fe"; - ref = "stable"; - }; - }; description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; registrations_open = true; From 97275d1a50c38203c46526bf1e07b5d87381bea0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 17:56:14 +0100 Subject: [PATCH 0432/2308] Possible infinite recursion? --- nixos/queen/akkoma.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 0a4373c..9b66bb3 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -38,18 +38,6 @@ cmd_args = "-N delay,failure,success"; qmail = true; }; - frontends = { - primary = { - package = pkgs.akkoma-frontends.akkoma-fe; - name = "akkoma-fe"; - ref = "stable"; - }; - admin = { - package = pkgs.akkoma-frontends.admin-fe; - name = "admin-fe"; - ref = "stable"; - }; - }; description = "Lillian's Akkoma server!"; languages = ["en" "nl"]; registrations_open = true; From a090e59974145f14f79d098147072bee73048191 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 18:00:15 +0100 Subject: [PATCH 0433/2308] No secret cookie --- nixos/queen/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 9b66bb3..7e632b6 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -24,7 +24,7 @@ forceSSL = true; serverName = "akkoma.gladtherescake.eu"; }; - dist.cookie._secret = config.sops.secrets."releaseCookie".path; + #dist.cookie._secret = config.sops.secrets."releaseCookie".path; config = { ":pleroma".":instance" = { From 17e8174a59e920d4b2218385a658032e5c5c3929 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 18:00:15 +0100 Subject: [PATCH 0434/2308] No secret cookie --- nixos/queen/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 9b66bb3..7e632b6 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -24,7 +24,7 @@ forceSSL = true; serverName = "akkoma.gladtherescake.eu"; }; - dist.cookie._secret = config.sops.secrets."releaseCookie".path; + #dist.cookie._secret = config.sops.secrets."releaseCookie".path; config = { ":pleroma".":instance" = { From 33542b6eb190b975e39a042f21cccfa3eaf55498 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 18:25:14 +0100 Subject: [PATCH 0435/2308] Update to unstabel to see if that fixes things --- flake.lock | 36 +++++++++++++++++----------------- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 55be82d..e179486 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700814342, - "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=", + "lastModified": 1700900274, + "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61", + "rev": "a462e7315deaa8194b0821f726709bb7e51a850c", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700342017, - "narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=", + "lastModified": 1700905716, + "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "decdf666c833a325cb4417041a90681499e06a41", + "rev": "dfb95385d21475da10b63da74ae96d89ab352431", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700108881, - "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", + "lastModified": 1700856099, + "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", + "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700362823, - "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", + "lastModified": 1700967639, + "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", + "rev": "4be58d802693d7def8622ff34d36714f8db40371", "type": "github" }, "original": { diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 14cdb9d..3eed06c 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 974817d..c9fab1e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -208,5 +208,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } From 5d1dce4bea9201961e933d9768990db215eea11d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 18:25:14 +0100 Subject: [PATCH 0436/2308] Update to unstabel to see if that fixes things --- flake.lock | 36 +++++++++++++++++----------------- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 55be82d..e179486 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700814342, - "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=", + "lastModified": 1700900274, + "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61", + "rev": "a462e7315deaa8194b0821f726709bb7e51a850c", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700342017, - "narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=", + "lastModified": 1700905716, + "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "decdf666c833a325cb4417041a90681499e06a41", + "rev": "dfb95385d21475da10b63da74ae96d89ab352431", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700108881, - "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", + "lastModified": 1700856099, + "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", + "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700362823, - "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", + "lastModified": 1700967639, + "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", + "rev": "4be58d802693d7def8622ff34d36714f8db40371", "type": "github" }, "original": { diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 14cdb9d..3eed06c 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 974817d..c9fab1e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -208,5 +208,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } From df312efb50ab671d8fb271694cdde13b7ce685dd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:01:28 +0100 Subject: [PATCH 0437/2308] Postgress error when installing? --- nixos/queen/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c9fab1e..d03447e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,7 +108,8 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql + postgresql_16 + postgresql16Packages.rum python3 rsync rabbitmq-server From 5ebef1f58d86923e2cc8c5c0749b926187235edf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:01:28 +0100 Subject: [PATCH 0438/2308] Postgress error when installing? --- nixos/queen/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c9fab1e..d03447e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,7 +108,8 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql + postgresql_16 + postgresql16Packages.rum python3 rsync rabbitmq-server From 2ae029da099c8869179ee87919453102cb83ddd4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:10:42 +0100 Subject: [PATCH 0439/2308] Use postgresql_16 --- nixos/queen/nextcloud.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 189c269..023749d 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,6 +93,8 @@ services.postgresql = { enable = true; + package = pkgs.postgresql_16; + # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; ensureUsers = [ From 6b63de0f469750264c00852b9b491dba67d64aed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:10:42 +0100 Subject: [PATCH 0440/2308] Use postgresql_16 --- nixos/queen/nextcloud.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 189c269..023749d 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,6 +93,8 @@ services.postgresql = { enable = true; + package = pkgs.postgresql_16; + # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; ensureUsers = [ From 79688b0d58e73c93d0d2daf143fbdac486ef2e90 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:14:16 +0100 Subject: [PATCH 0441/2308] That doesn't work... --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index d03447e..84b7e9c 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -209,5 +209,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From 2ab387229edb4d2325932051ab8e8c8e639cb4ee Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:14:16 +0100 Subject: [PATCH 0442/2308] That doesn't work... --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index d03447e..84b7e9c 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -209,5 +209,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From 66d351707a928074ca0545408240903f97ed1d12 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:16:15 +0100 Subject: [PATCH 0443/2308] Doesn't seem to work with a new psql --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 6 +++--- nixos/queen/nextcloud.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 3eed06c..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 84b7e9c..c0b1cee 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,8 +108,8 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_16 - postgresql16Packages.rum + postgresql_15 + postgresql15Packages.rum python3 rsync rabbitmq-server @@ -209,5 +209,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 023749d..1cd65ad 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,7 +93,7 @@ services.postgresql = { enable = true; - package = pkgs.postgresql_16; + package = pkgs.postgresql_15; # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; From 5a6435ea86fcc05d0e622c196322eeef5e562829 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:16:15 +0100 Subject: [PATCH 0444/2308] Doesn't seem to work with a new psql --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 6 +++--- nixos/queen/nextcloud.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 3eed06c..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 84b7e9c..c0b1cee 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,8 +108,8 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_16 - postgresql16Packages.rum + postgresql_15 + postgresql15Packages.rum python3 rsync rabbitmq-server @@ -209,5 +209,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 023749d..1cd65ad 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,7 +93,7 @@ services.postgresql = { enable = true; - package = pkgs.postgresql_16; + package = pkgs.postgresql_15; # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; From 6091c13866b7b1d5e1ea2220829fc09e458def18 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:18:09 +0100 Subject: [PATCH 0445/2308] Try this? --- nixos/queen/configuration.nix | 3 +-- nixos/queen/nextcloud.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c0b1cee..c9fab1e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,8 +108,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_15 - postgresql15Packages.rum + postgresql python3 rsync rabbitmq-server diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 1cd65ad..6339c87 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,7 +93,7 @@ services.postgresql = { enable = true; - package = pkgs.postgresql_15; + package = pkgs.postgresql; # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; From 4f324b9bcb7ac3fce4f405589a82585ce4684656 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:18:09 +0100 Subject: [PATCH 0446/2308] Try this? --- nixos/queen/configuration.nix | 3 +-- nixos/queen/nextcloud.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c0b1cee..c9fab1e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,8 +108,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_15 - postgresql15Packages.rum + postgresql python3 rsync rabbitmq-server diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 1cd65ad..6339c87 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,7 +93,7 @@ services.postgresql = { enable = true; - package = pkgs.postgresql_15; + package = pkgs.postgresql; # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; From 873c3f7061e77ba0cac1ee894fc9ebd9fdd868dc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:18:36 +0100 Subject: [PATCH 0447/2308] Maybe also comment out the ensure bs --- nixos/queen/nextcloud.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6339c87..6da76f1 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -97,20 +97,20 @@ # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - { - name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - } - { - name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - } - ]; + # ensureUsers = [ + # { + # name = "nextcloud"; + # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + # } + # { + # name = "onlyoffice"; + # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + # } + # { + # name = "akkoma"; + # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + # } + # ]; }; services.aria2 = { From 542a13d5b1dd783c076c5d3f53e3f4d1f7fdedd7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:18:36 +0100 Subject: [PATCH 0448/2308] Maybe also comment out the ensure bs --- nixos/queen/nextcloud.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6339c87..6da76f1 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -97,20 +97,20 @@ # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - { - name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - } - { - name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - } - ]; + # ensureUsers = [ + # { + # name = "nextcloud"; + # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + # } + # { + # name = "onlyoffice"; + # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + # } + # { + # name = "akkoma"; + # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + # } + # ]; }; services.aria2 = { From c8a2a72ff4b26151bcb51f1284d18666bb91a3b9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:20:45 +0100 Subject: [PATCH 0449/2308] Downgrade, this doesn't work --- flake.lock | 36 +++++++++++++++++------------------ nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 30 +++++++++++++++-------------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 55be82d..e179486 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700814342, - "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=", + "lastModified": 1700900274, + "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61", + "rev": "a462e7315deaa8194b0821f726709bb7e51a850c", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700342017, - "narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=", + "lastModified": 1700905716, + "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "decdf666c833a325cb4417041a90681499e06a41", + "rev": "dfb95385d21475da10b63da74ae96d89ab352431", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700108881, - "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", + "lastModified": 1700856099, + "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", + "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700362823, - "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", + "lastModified": 1700967639, + "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", + "rev": "4be58d802693d7def8622ff34d36714f8db40371", "type": "github" }, "original": { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 974817d..c9fab1e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -208,5 +208,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 189c269..6da76f1 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,22 +93,24 @@ services.postgresql = { enable = true; + package = pkgs.postgresql; + # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - { - name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - } - { - name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - } - ]; + # ensureUsers = [ + # { + # name = "nextcloud"; + # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + # } + # { + # name = "onlyoffice"; + # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + # } + # { + # name = "akkoma"; + # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + # } + # ]; }; services.aria2 = { From 6c3eec057f55b6d7590eefa1d4558843086a3057 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:20:45 +0100 Subject: [PATCH 0450/2308] Downgrade, this doesn't work --- flake.lock | 36 +++++++++++++++++------------------ nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 30 +++++++++++++++-------------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 55be82d..e179486 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700814342, - "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=", + "lastModified": 1700900274, + "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61", + "rev": "a462e7315deaa8194b0821f726709bb7e51a850c", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700342017, - "narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=", + "lastModified": 1700905716, + "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "decdf666c833a325cb4417041a90681499e06a41", + "rev": "dfb95385d21475da10b63da74ae96d89ab352431", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700108881, - "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", + "lastModified": 1700856099, + "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", + "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700362823, - "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", + "lastModified": 1700967639, + "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", + "rev": "4be58d802693d7def8622ff34d36714f8db40371", "type": "github" }, "original": { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 974817d..c9fab1e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -208,5 +208,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 189c269..6da76f1 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,22 +93,24 @@ services.postgresql = { enable = true; + package = pkgs.postgresql; + # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - { - name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - } - { - name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - } - ]; + # ensureUsers = [ + # { + # name = "nextcloud"; + # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + # } + # { + # name = "onlyoffice"; + # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + # } + # { + # name = "akkoma"; + # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + # } + # ]; }; services.aria2 = { From 7efc470cf9fa892206e9add97c6e42fd6df722fe Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 18:25:14 +0100 Subject: [PATCH 0451/2308] Update to unstabel to see if that fixes things --- home-manager/queen-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 14cdb9d..3eed06c 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } From cf15e27ccfcea44a8e23139d3390d2ff400a9290 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 18:25:14 +0100 Subject: [PATCH 0452/2308] Update to unstabel to see if that fixes things --- home-manager/queen-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 14cdb9d..3eed06c 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } From 1bf1ad830428329270eb5733402c274c71a399f7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:01:28 +0100 Subject: [PATCH 0453/2308] Postgress error when installing? --- nixos/queen/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c9fab1e..d03447e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,7 +108,8 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql + postgresql_16 + postgresql16Packages.rum python3 rsync rabbitmq-server From 7e99b1fb1698e229f133faa8db799228000a5545 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:01:28 +0100 Subject: [PATCH 0454/2308] Postgress error when installing? --- nixos/queen/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c9fab1e..d03447e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,7 +108,8 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql + postgresql_16 + postgresql16Packages.rum python3 rsync rabbitmq-server From 14778e4a20563dd65f8e61cc5587e35cdcaf0a7e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:10:42 +0100 Subject: [PATCH 0455/2308] Use postgresql_16 --- nixos/queen/nextcloud.nix | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6da76f1..189c269 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,24 +93,22 @@ services.postgresql = { enable = true; - package = pkgs.postgresql; - # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - # ensureUsers = [ - # { - # name = "nextcloud"; - # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - # } - # { - # name = "onlyoffice"; - # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - # } - # { - # name = "akkoma"; - # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - # } - # ]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + { + name = "onlyoffice"; + ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + } + { + name = "akkoma"; + ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + } + ]; }; services.aria2 = { From c73e92672884dc062c15e71ac9a9bbf2e026df0d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:10:42 +0100 Subject: [PATCH 0456/2308] Use postgresql_16 --- nixos/queen/nextcloud.nix | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6da76f1..189c269 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -93,24 +93,22 @@ services.postgresql = { enable = true; - package = pkgs.postgresql; - # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - # ensureUsers = [ - # { - # name = "nextcloud"; - # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - # } - # { - # name = "onlyoffice"; - # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - # } - # { - # name = "akkoma"; - # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - # } - # ]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + { + name = "onlyoffice"; + ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + } + { + name = "akkoma"; + ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + } + ]; }; services.aria2 = { From 179cb2fb52326ecb6fe75c5a2179039d6ce40fd5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:14:16 +0100 Subject: [PATCH 0457/2308] That doesn't work... --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index d03447e..84b7e9c 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -209,5 +209,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From fd429119a68d494bec4fd502ea1046dbcfae65d0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:14:16 +0100 Subject: [PATCH 0458/2308] That doesn't work... --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index d03447e..84b7e9c 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -209,5 +209,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From c516a31675d131e2c25094d27c9a7869766382a1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:16:15 +0100 Subject: [PATCH 0459/2308] Doesn't seem to work with a new psql --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 3eed06c..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 84b7e9c..c0b1cee 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,8 +108,8 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_16 - postgresql16Packages.rum + postgresql_15 + postgresql15Packages.rum python3 rsync rabbitmq-server @@ -209,5 +209,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } From 4337d00d9ca07974b7985de8795dcdcdd269d127 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:16:15 +0100 Subject: [PATCH 0460/2308] Doesn't seem to work with a new psql --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 3eed06c..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 84b7e9c..c0b1cee 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,8 +108,8 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_16 - postgresql16Packages.rum + postgresql_15 + postgresql15Packages.rum python3 rsync rabbitmq-server @@ -209,5 +209,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } From ad81538e32d360d9aabe9c77aeeec9b3d78d6d55 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:18:09 +0100 Subject: [PATCH 0461/2308] Try this? --- nixos/queen/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c0b1cee..c9fab1e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,8 +108,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_15 - postgresql15Packages.rum + postgresql python3 rsync rabbitmq-server From 3555213507dd19f9847a0c9bc4773b110f78643d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:18:09 +0100 Subject: [PATCH 0462/2308] Try this? --- nixos/queen/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c0b1cee..c9fab1e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,8 +108,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_15 - postgresql15Packages.rum + postgresql python3 rsync rabbitmq-server From e680d3a088b9a84b2fe07c01f82ea389c2c298dd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:18:36 +0100 Subject: [PATCH 0463/2308] Maybe also comment out the ensure bs --- nixos/queen/nextcloud.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 189c269..4d9b5ef 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -95,20 +95,20 @@ # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - { - name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - } - { - name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - } - ]; + # ensureUsers = [ + # { + # name = "nextcloud"; + # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + # } + # { + # name = "onlyoffice"; + # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + # } + # { + # name = "akkoma"; + # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + # } + # ]; }; services.aria2 = { From 013291088a1f95315cb3d83b87ac9ffe7335904a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:18:36 +0100 Subject: [PATCH 0464/2308] Maybe also comment out the ensure bs --- nixos/queen/nextcloud.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 189c269..4d9b5ef 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -95,20 +95,20 @@ # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - { - name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - } - { - name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - } - ]; + # ensureUsers = [ + # { + # name = "nextcloud"; + # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + # } + # { + # name = "onlyoffice"; + # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + # } + # { + # name = "akkoma"; + # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + # } + # ]; }; services.aria2 = { From eeaafea333f16aed743ecabf7455604fc4126390 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:27:03 +0100 Subject: [PATCH 0465/2308] REVERT --- nixos/queen/nextcloud.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 4d9b5ef..189c269 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -95,20 +95,20 @@ # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - # ensureUsers = [ - # { - # name = "nextcloud"; - # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - # } - # { - # name = "onlyoffice"; - # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - # } - # { - # name = "akkoma"; - # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - # } - # ]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + { + name = "onlyoffice"; + ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + } + { + name = "akkoma"; + ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + } + ]; }; services.aria2 = { From 90b24af78e54e46988445d42b20cc3cf415acb4f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:27:03 +0100 Subject: [PATCH 0466/2308] REVERT --- nixos/queen/nextcloud.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 4d9b5ef..189c269 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -95,20 +95,20 @@ # Ensure the database, user, and permissions always exist ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - # ensureUsers = [ - # { - # name = "nextcloud"; - # ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - # } - # { - # name = "onlyoffice"; - # ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - # } - # { - # name = "akkoma"; - # ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - # } - # ]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + { + name = "onlyoffice"; + ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + } + { + name = "akkoma"; + ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + } + ]; }; services.aria2 = { From 47a68d148760067f031cffa90d1928d772cc34e5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:27:58 +0100 Subject: [PATCH 0467/2308] Oops --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c9fab1e..974817d 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -208,5 +208,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From 5e2534c11f35087b4909b4b3348a5b36a93dbbba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 19:27:58 +0100 Subject: [PATCH 0468/2308] Oops --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c9fab1e..974817d 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -208,5 +208,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From 30f695898d3c7c91b40f2028be9873425b3513ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 21:11:13 +0100 Subject: [PATCH 0469/2308] Add aria2 to nextcloud users --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 974817d..2295ffd 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -166,6 +166,7 @@ }; nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; + aria2.extraGroups = ["nextcloud"]; mssql = { isSystemUser = true; group = "mssql"; From a5e54a365862bd74ddb0ad374e718734361cc77d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 26 Nov 2023 21:11:13 +0100 Subject: [PATCH 0470/2308] Add aria2 to nextcloud users --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 974817d..2295ffd 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -166,6 +166,7 @@ }; nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; + aria2.extraGroups = ["nextcloud"]; mssql = { isSystemUser = true; group = "mssql"; From a20118c18a1b32f58a958901ffd4758de9bb5f47 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 12:10:44 +0100 Subject: [PATCH 0471/2308] Try and run akkoma default and edit with ctl --- nixos/queen/akkoma.nix | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 7e632b6..74882fe 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,25 +25,25 @@ serverName = "akkoma.gladtherescake.eu"; }; #dist.cookie._secret = config.sops.secrets."releaseCookie".path; - - config = { - ":pleroma".":instance" = { - name = "GLaDTheresCake Akkoma"; - email = "akkoma@gladtherescake.eu"; - notify_email = "no-reply@akkoma.gladtherescake.eu"; - emails.mailer = { - enabled = true; - adapter = "Swoosh.Adapters.Sendmail"; - cmd_path = "/run/wrappers/bin/sendmail"; - cmd_args = "-N delay,failure,success"; - qmail = true; - }; - description = "Lillian's Akkoma server!"; - languages = ["en" "nl"]; - registrations_open = true; - max_pinned_statuses = 10; - cleanup_attachments = true; - }; - }; + config = {}; + # config = { + # ":pleroma".":instance" = { + # name = "GLaDTheresCake Akkoma"; + # email = "akkoma@gladtherescake.eu"; + # notify_email = "no-reply@akkoma.gladtherescake.eu"; + # emails.mailer = { + # enabled = true; + # adapter = "Swoosh.Adapters.Sendmail"; + # cmd_path = "sendmail"; + # cmd_args = "-N delay,failure,success"; + # qmail = true; + # }; + # description = "Lillian's Akkoma server!"; + # languages = ["en" "nl"]; + # registrations_open = true; + # max_pinned_statuses = 10; + # cleanup_attachments = true; + # }; + # }; }; } From 1972d0c8804bd23a91863a2ba0db13b9acdca54a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 12:10:44 +0100 Subject: [PATCH 0472/2308] Try and run akkoma default and edit with ctl --- nixos/queen/akkoma.nix | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 7e632b6..74882fe 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,25 +25,25 @@ serverName = "akkoma.gladtherescake.eu"; }; #dist.cookie._secret = config.sops.secrets."releaseCookie".path; - - config = { - ":pleroma".":instance" = { - name = "GLaDTheresCake Akkoma"; - email = "akkoma@gladtherescake.eu"; - notify_email = "no-reply@akkoma.gladtherescake.eu"; - emails.mailer = { - enabled = true; - adapter = "Swoosh.Adapters.Sendmail"; - cmd_path = "/run/wrappers/bin/sendmail"; - cmd_args = "-N delay,failure,success"; - qmail = true; - }; - description = "Lillian's Akkoma server!"; - languages = ["en" "nl"]; - registrations_open = true; - max_pinned_statuses = 10; - cleanup_attachments = true; - }; - }; + config = {}; + # config = { + # ":pleroma".":instance" = { + # name = "GLaDTheresCake Akkoma"; + # email = "akkoma@gladtherescake.eu"; + # notify_email = "no-reply@akkoma.gladtherescake.eu"; + # emails.mailer = { + # enabled = true; + # adapter = "Swoosh.Adapters.Sendmail"; + # cmd_path = "sendmail"; + # cmd_args = "-N delay,failure,success"; + # qmail = true; + # }; + # description = "Lillian's Akkoma server!"; + # languages = ["en" "nl"]; + # registrations_open = true; + # max_pinned_statuses = 10; + # cleanup_attachments = true; + # }; + # }; }; } From 7168399e84395a394272c8620572f5b283601a97 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 14:03:06 +0100 Subject: [PATCH 0473/2308] Small tweaks, and trying to set up gotosocial --- nixos/queen/akkoma.nix | 41 +++++++++++++++++----------------- nixos/queen/gotosocial.nix | 44 +++++++++++++++++++++++++++++++++++++ nixos/queen/mail-server.nix | 15 +++++++++++-- nixos/queen/nextcloud.nix | 10 ++++++++- 4 files changed, 86 insertions(+), 24 deletions(-) create mode 100644 nixos/queen/gotosocial.nix diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 74882fe..affcb67 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -22,28 +22,27 @@ nginx = { enableACME = true; forceSSL = true; - serverName = "akkoma.gladtherescake.eu"; + serverName = "social.gladtherescake.eu"; }; #dist.cookie._secret = config.sops.secrets."releaseCookie".path; - config = {}; - # config = { - # ":pleroma".":instance" = { - # name = "GLaDTheresCake Akkoma"; - # email = "akkoma@gladtherescake.eu"; - # notify_email = "no-reply@akkoma.gladtherescake.eu"; - # emails.mailer = { - # enabled = true; - # adapter = "Swoosh.Adapters.Sendmail"; - # cmd_path = "sendmail"; - # cmd_args = "-N delay,failure,success"; - # qmail = true; - # }; - # description = "Lillian's Akkoma server!"; - # languages = ["en" "nl"]; - # registrations_open = true; - # max_pinned_statuses = 10; - # cleanup_attachments = true; - # }; - # }; + config = { + ":pleroma".":instance" = { + name = "GLaDTheresCake Akkoma"; + email = "akkoma@gladtherescake.eu"; + notify_email = "no-reply@akkoma.gladtherescake.eu"; + emails.mailer = { + enabled = true; + adapter = "Swoosh.Adapters.Sendmail"; + cmd_path = "sendmail"; + cmd_args = "-N delay,failure,success"; + qmail = true; + }; + description = "Lillian's Akkoma server!"; + languages = ["en" "nl"]; + registrations_open = true; + max_pinned_statuses = 10; + cleanup_attachments = true; + }; + }; }; } diff --git a/nixos/queen/gotosocial.nix b/nixos/queen/gotosocial.nix new file mode 100644 index 0000000..3dd4e63 --- /dev/null +++ b/nixos/queen/gotosocial.nix @@ -0,0 +1,44 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + users.users.gotosocial.extraGroups = ["virtualMail"]; + + services.nginx = { + virtualHosts = { + "social.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:4257"; + }; + }; + }; + }; + + services.gotosocial = { + enable = true; + setupPostgresqlDB = true; + settings = { + application-name = "gotosocial"; + host = "social.gladtherescake.eu"; + bind-address = "localhost"; + port = 4257; + protocol = "https"; + storage-local-base-path = "/var/lib/gotosocial/storage"; + instance-languages = ["en-gb" "nl"]; + media-image-max-size = 41943040; + media-video-max-size = 209715200; + media-description-max-chars = 2000; + smtp-host = "localhost"; + smtp-port = 587; + smtp-username = "no-reply@social.gladtherescake.eu"; + smtp-password = config.sops.secrets."releaseCookie".path; + smtp-from = "no-reply@social.gladtherescake.eu"; + }; + }; +} diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index d498e8b..ba2179c 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -21,7 +21,11 @@ enableImap = true; enableSubmission = true; fqdn = "mail.gladtherescake.eu"; - domains = ["nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu"]; + domains = [ + "nextcloud.gladtherescake.eu" + "akkoma.gladtherescake.eu" + "social.gladtherescake.eu" + ]; loginAccounts = { "no-reply@nextcloud.gladtherescake.eu" = { @@ -30,8 +34,15 @@ "no-reply@akkoma.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; + "no-reply@social.gladtherescake.eu" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + }; }; - rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu"]; + rejectRecipients = [ + "no-reply@nextcloud.gladtherescake.eu" + "no-reply@akkoma.gladtherescake.eu" + "no-reply@social.gladtherescake.eu" + ]; certificateScheme = "acme-nginx"; }; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 189c269..20cb0d9 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -117,7 +117,15 @@ }; systemd.services."sops-nix.service" = { - before = ["nextcloud-setup.service" "postgresql.service" "onlyoffice-converter.service" "onlyoffice-docservice.service" "nginx.service" "phpfpm-nextcloud.service" "redis-nextcloud.service"]; + before = [ + "nextcloud-setup.service" + "postgresql.service" + "onlyoffice-converter.service" + "onlyoffice-docservice.service" + "nginx.service" + "phpfpm-nextcloud.service" + "redis-nextcloud.service" + ]; }; # Ensure that postgres is running before running the setup From dfe82bfcc0661518f159beb8ac91e3cedf9e0152 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 14:03:06 +0100 Subject: [PATCH 0474/2308] Small tweaks, and trying to set up gotosocial --- nixos/queen/akkoma.nix | 41 +++++++++++++++++----------------- nixos/queen/gotosocial.nix | 44 +++++++++++++++++++++++++++++++++++++ nixos/queen/mail-server.nix | 15 +++++++++++-- nixos/queen/nextcloud.nix | 10 ++++++++- 4 files changed, 86 insertions(+), 24 deletions(-) create mode 100644 nixos/queen/gotosocial.nix diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index 74882fe..affcb67 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -22,28 +22,27 @@ nginx = { enableACME = true; forceSSL = true; - serverName = "akkoma.gladtherescake.eu"; + serverName = "social.gladtherescake.eu"; }; #dist.cookie._secret = config.sops.secrets."releaseCookie".path; - config = {}; - # config = { - # ":pleroma".":instance" = { - # name = "GLaDTheresCake Akkoma"; - # email = "akkoma@gladtherescake.eu"; - # notify_email = "no-reply@akkoma.gladtherescake.eu"; - # emails.mailer = { - # enabled = true; - # adapter = "Swoosh.Adapters.Sendmail"; - # cmd_path = "sendmail"; - # cmd_args = "-N delay,failure,success"; - # qmail = true; - # }; - # description = "Lillian's Akkoma server!"; - # languages = ["en" "nl"]; - # registrations_open = true; - # max_pinned_statuses = 10; - # cleanup_attachments = true; - # }; - # }; + config = { + ":pleroma".":instance" = { + name = "GLaDTheresCake Akkoma"; + email = "akkoma@gladtherescake.eu"; + notify_email = "no-reply@akkoma.gladtherescake.eu"; + emails.mailer = { + enabled = true; + adapter = "Swoosh.Adapters.Sendmail"; + cmd_path = "sendmail"; + cmd_args = "-N delay,failure,success"; + qmail = true; + }; + description = "Lillian's Akkoma server!"; + languages = ["en" "nl"]; + registrations_open = true; + max_pinned_statuses = 10; + cleanup_attachments = true; + }; + }; }; } diff --git a/nixos/queen/gotosocial.nix b/nixos/queen/gotosocial.nix new file mode 100644 index 0000000..3dd4e63 --- /dev/null +++ b/nixos/queen/gotosocial.nix @@ -0,0 +1,44 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + users.users.gotosocial.extraGroups = ["virtualMail"]; + + services.nginx = { + virtualHosts = { + "social.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:4257"; + }; + }; + }; + }; + + services.gotosocial = { + enable = true; + setupPostgresqlDB = true; + settings = { + application-name = "gotosocial"; + host = "social.gladtherescake.eu"; + bind-address = "localhost"; + port = 4257; + protocol = "https"; + storage-local-base-path = "/var/lib/gotosocial/storage"; + instance-languages = ["en-gb" "nl"]; + media-image-max-size = 41943040; + media-video-max-size = 209715200; + media-description-max-chars = 2000; + smtp-host = "localhost"; + smtp-port = 587; + smtp-username = "no-reply@social.gladtherescake.eu"; + smtp-password = config.sops.secrets."releaseCookie".path; + smtp-from = "no-reply@social.gladtherescake.eu"; + }; + }; +} diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index d498e8b..ba2179c 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -21,7 +21,11 @@ enableImap = true; enableSubmission = true; fqdn = "mail.gladtherescake.eu"; - domains = ["nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu"]; + domains = [ + "nextcloud.gladtherescake.eu" + "akkoma.gladtherescake.eu" + "social.gladtherescake.eu" + ]; loginAccounts = { "no-reply@nextcloud.gladtherescake.eu" = { @@ -30,8 +34,15 @@ "no-reply@akkoma.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; + "no-reply@social.gladtherescake.eu" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + }; }; - rejectRecipients = ["no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu"]; + rejectRecipients = [ + "no-reply@nextcloud.gladtherescake.eu" + "no-reply@akkoma.gladtherescake.eu" + "no-reply@social.gladtherescake.eu" + ]; certificateScheme = "acme-nginx"; }; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 189c269..20cb0d9 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -117,7 +117,15 @@ }; systemd.services."sops-nix.service" = { - before = ["nextcloud-setup.service" "postgresql.service" "onlyoffice-converter.service" "onlyoffice-docservice.service" "nginx.service" "phpfpm-nextcloud.service" "redis-nextcloud.service"]; + before = [ + "nextcloud-setup.service" + "postgresql.service" + "onlyoffice-converter.service" + "onlyoffice-docservice.service" + "nginx.service" + "phpfpm-nextcloud.service" + "redis-nextcloud.service" + ]; }; # Ensure that postgres is running before running the setup From b5728ba9a32e0fa7d701ecb6142aedd3a8948e79 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 14:08:32 +0100 Subject: [PATCH 0475/2308] Replace akkoma with gotosocial --- nixos/queen/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 2295ffd..1a556a9 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -18,7 +18,8 @@ ./hardware-configuration.nix ./nextcloud.nix ./mail-server.nix - ./akkoma.nix + ./gotosocial.nix + #./akkoma.nix ]; boot.tmp.cleanOnBoot = true; From 42e383283ad706577b749d7a176c779d6003c8cc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 14:08:32 +0100 Subject: [PATCH 0476/2308] Replace akkoma with gotosocial --- nixos/queen/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 2295ffd..1a556a9 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -18,7 +18,8 @@ ./hardware-configuration.nix ./nextcloud.nix ./mail-server.nix - ./akkoma.nix + ./gotosocial.nix + #./akkoma.nix ]; boot.tmp.cleanOnBoot = true; From c1ce31835fd91e59d713510d779dd959be6b1f94 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 14:12:18 +0100 Subject: [PATCH 0477/2308] Move stuff to more appropriate places --- nixos/queen/akkoma.nix | 3 +++ nixos/queen/configuration.nix | 23 ----------------------- nixos/queen/mail-server.nix | 11 +++++++++++ nixos/queen/nextcloud.nix | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index affcb67..fef0b69 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -6,6 +6,9 @@ pkgs, ... }: { + sops.secrets."releaseCookie".mode = "0440"; + sops.secrets."releaseCookie".owner = config.users.users.akkoma.name; + users.groups.akkoma = {}; users.users = { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 1a556a9..60f0255 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -55,16 +55,6 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; - sops.secrets."nextcloudadmin".mode = "0440"; - sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; - sops.secrets."nextclouddb".mode = "0440"; - sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; - sops.secrets."local.json".mode = "0440"; - sops.secrets."local.json".owner = config.users.users.onlyoffice.name; - sops.secrets."mailpass".mode = "0440"; - sops.secrets."mailpass".owner = config.users.users.virtualMail.name; - sops.secrets."releaseCookie".mode = "0440"; - sops.secrets."releaseCookie".owner = config.users.users.akkoma.name; nix = { gc = { @@ -165,19 +155,6 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; - - nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; - aria2.extraGroups = ["nextcloud"]; - mssql = { - isSystemUser = true; - group = "mssql"; - }; - - virtualMail = { - isSystemUser = true; - isNormalUser = false; - group = "virtualMail"; - }; }; virtualisation.oci-containers.containers = { diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index ba2179c..d591e5f 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -16,6 +16,17 @@ }) ]; + sops.secrets."mailpass".mode = "0440"; + sops.secrets."mailpass".owner = config.users.users.virtualMail.name; + + users.users = { + virtualMail = { + isSystemUser = true; + isNormalUser = false; + group = "virtualMail"; + }; + }; + mailserver = { enable = true; enableImap = true; diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 20cb0d9..77d399b 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -3,6 +3,22 @@ pkgs, ... }: { + sops.secrets."nextcloudadmin".mode = "0440"; + sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; + sops.secrets."nextclouddb".mode = "0440"; + sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; + sops.secrets."local.json".mode = "0440"; + sops.secrets."local.json".owner = config.users.users.onlyoffice.name; + + users.users = { + nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; + aria2.extraGroups = ["nextcloud"]; + mssql = { + isSystemUser = true; + group = "mssql"; + }; + }; + # Enable Nginx services.nginx = { enable = true; From f7f6882e71d6b603b71d515d0a3beb35ff233643 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 14:12:18 +0100 Subject: [PATCH 0478/2308] Move stuff to more appropriate places --- nixos/queen/akkoma.nix | 3 +++ nixos/queen/configuration.nix | 23 ----------------------- nixos/queen/mail-server.nix | 11 +++++++++++ nixos/queen/nextcloud.nix | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index affcb67..fef0b69 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -6,6 +6,9 @@ pkgs, ... }: { + sops.secrets."releaseCookie".mode = "0440"; + sops.secrets."releaseCookie".owner = config.users.users.akkoma.name; + users.groups.akkoma = {}; users.users = { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 1a556a9..60f0255 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -55,16 +55,6 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; - sops.secrets."nextcloudadmin".mode = "0440"; - sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; - sops.secrets."nextclouddb".mode = "0440"; - sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; - sops.secrets."local.json".mode = "0440"; - sops.secrets."local.json".owner = config.users.users.onlyoffice.name; - sops.secrets."mailpass".mode = "0440"; - sops.secrets."mailpass".owner = config.users.users.virtualMail.name; - sops.secrets."releaseCookie".mode = "0440"; - sops.secrets."releaseCookie".owner = config.users.users.akkoma.name; nix = { gc = { @@ -165,19 +155,6 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; - - nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; - aria2.extraGroups = ["nextcloud"]; - mssql = { - isSystemUser = true; - group = "mssql"; - }; - - virtualMail = { - isSystemUser = true; - isNormalUser = false; - group = "virtualMail"; - }; }; virtualisation.oci-containers.containers = { diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index ba2179c..d591e5f 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -16,6 +16,17 @@ }) ]; + sops.secrets."mailpass".mode = "0440"; + sops.secrets."mailpass".owner = config.users.users.virtualMail.name; + + users.users = { + virtualMail = { + isSystemUser = true; + isNormalUser = false; + group = "virtualMail"; + }; + }; + mailserver = { enable = true; enableImap = true; diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 20cb0d9..77d399b 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -3,6 +3,22 @@ pkgs, ... }: { + sops.secrets."nextcloudadmin".mode = "0440"; + sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; + sops.secrets."nextclouddb".mode = "0440"; + sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; + sops.secrets."local.json".mode = "0440"; + sops.secrets."local.json".owner = config.users.users.onlyoffice.name; + + users.users = { + nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; + aria2.extraGroups = ["nextcloud"]; + mssql = { + isSystemUser = true; + group = "mssql"; + }; + }; + # Enable Nginx services.nginx = { enable = true; From 4a99585a267ed5e8b1d0b5898f199b52813b881c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 14:13:46 +0100 Subject: [PATCH 0479/2308] Mailpass not secret cookie --- nixos/queen/gotosocial.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/gotosocial.nix b/nixos/queen/gotosocial.nix index 3dd4e63..4113748 100644 --- a/nixos/queen/gotosocial.nix +++ b/nixos/queen/gotosocial.nix @@ -37,7 +37,7 @@ smtp-host = "localhost"; smtp-port = 587; smtp-username = "no-reply@social.gladtherescake.eu"; - smtp-password = config.sops.secrets."releaseCookie".path; + smtp-password = config.sops.secrets."mailpass".path; smtp-from = "no-reply@social.gladtherescake.eu"; }; }; From 10bee396df1b28cd8388189a2f37a4cbbd38043c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 14:13:46 +0100 Subject: [PATCH 0480/2308] Mailpass not secret cookie --- nixos/queen/gotosocial.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/gotosocial.nix b/nixos/queen/gotosocial.nix index 3dd4e63..4113748 100644 --- a/nixos/queen/gotosocial.nix +++ b/nixos/queen/gotosocial.nix @@ -37,7 +37,7 @@ smtp-host = "localhost"; smtp-port = 587; smtp-username = "no-reply@social.gladtherescake.eu"; - smtp-password = config.sops.secrets."releaseCookie".path; + smtp-password = config.sops.secrets."mailpass".path; smtp-from = "no-reply@social.gladtherescake.eu"; }; }; From c2d0ff412e9e1e065910027aa97cfbb7cfb02da3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 14:42:44 +0100 Subject: [PATCH 0481/2308] Should maybe set a package for gotosocial --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 60f0255..ef1b84a 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -85,6 +85,7 @@ docker docker-compose git + gotosocial alejandra exiftool imagemagick From 962ff60d90f34d7f28fb837922b0b96e73c53ee4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 14:42:44 +0100 Subject: [PATCH 0482/2308] Should maybe set a package for gotosocial --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 60f0255..ef1b84a 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -85,6 +85,7 @@ docker docker-compose git + gotosocial alejandra exiftool imagemagick From 7fa997ec94533c5bbff088a084179c40e9bd948b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 15:06:57 +0100 Subject: [PATCH 0483/2308] Let's configure the db for gotosocial? --- nixos/queen/configuration.nix | 1 + nixos/queen/gotosocial.nix | 6 ++++++ nixos/queen/nextcloud.nix | 22 ---------------------- nixos/queen/postgres.nix | 30 ++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 nixos/queen/postgres.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ef1b84a..8a351e0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -16,6 +16,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix + ./postgres.nix ./nextcloud.nix ./mail-server.nix ./gotosocial.nix diff --git a/nixos/queen/gotosocial.nix b/nixos/queen/gotosocial.nix index 4113748..576f419 100644 --- a/nixos/queen/gotosocial.nix +++ b/nixos/queen/gotosocial.nix @@ -22,6 +22,7 @@ services.gotosocial = { enable = true; + package = pkgs.gotosocial; setupPostgresqlDB = true; settings = { application-name = "gotosocial"; @@ -41,4 +42,9 @@ smtp-from = "no-reply@social.gladtherescake.eu"; }; }; + + systemd.services."gotosocial" = { + requires = ["postgresql.service"]; + after = ["postgresql.service"]; + }; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 77d399b..9e5117f 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -105,28 +105,6 @@ enable = true; }; - # Enable PostgreSQL - services.postgresql = { - enable = true; - - # Ensure the database, user, and permissions always exist - ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - { - name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - } - { - name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - } - ]; - }; - services.aria2 = { enable = true; rpcListenPort = 6969; diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix new file mode 100644 index 0000000..535e85a --- /dev/null +++ b/nixos/queen/postgres.nix @@ -0,0 +1,30 @@ +{ + config, + pkgs, + ... +}: { + services.postgresql = { + enable = true; + + # Ensure the database, user, and permissions always exist + ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + { + name = "onlyoffice"; + ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + } + { + name = "akkoma"; + ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + } + { + name = "gotosocial"; + ensurePermissions."DATABASE gotosocial" = "ALL PRIVILEGES"; + } + ]; + }; +} From 039d3ead7ad8c4622ecf19143256de7df8bc1599 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 15:06:57 +0100 Subject: [PATCH 0484/2308] Let's configure the db for gotosocial? --- nixos/queen/configuration.nix | 1 + nixos/queen/gotosocial.nix | 6 ++++++ nixos/queen/nextcloud.nix | 22 ---------------------- nixos/queen/postgres.nix | 30 ++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 nixos/queen/postgres.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ef1b84a..8a351e0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -16,6 +16,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix + ./postgres.nix ./nextcloud.nix ./mail-server.nix ./gotosocial.nix diff --git a/nixos/queen/gotosocial.nix b/nixos/queen/gotosocial.nix index 4113748..576f419 100644 --- a/nixos/queen/gotosocial.nix +++ b/nixos/queen/gotosocial.nix @@ -22,6 +22,7 @@ services.gotosocial = { enable = true; + package = pkgs.gotosocial; setupPostgresqlDB = true; settings = { application-name = "gotosocial"; @@ -41,4 +42,9 @@ smtp-from = "no-reply@social.gladtherescake.eu"; }; }; + + systemd.services."gotosocial" = { + requires = ["postgresql.service"]; + after = ["postgresql.service"]; + }; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 77d399b..9e5117f 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -105,28 +105,6 @@ enable = true; }; - # Enable PostgreSQL - services.postgresql = { - enable = true; - - # Ensure the database, user, and permissions always exist - ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; - ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - { - name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; - } - { - name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; - } - ]; - }; - services.aria2 = { enable = true; rpcListenPort = 6969; diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix new file mode 100644 index 0000000..535e85a --- /dev/null +++ b/nixos/queen/postgres.nix @@ -0,0 +1,30 @@ +{ + config, + pkgs, + ... +}: { + services.postgresql = { + enable = true; + + # Ensure the database, user, and permissions always exist + ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; + ensureUsers = [ + { + name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + { + name = "onlyoffice"; + ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + } + { + name = "akkoma"; + ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + } + { + name = "gotosocial"; + ensurePermissions."DATABASE gotosocial" = "ALL PRIVILEGES"; + } + ]; + }; +} From 12f26c89aee3a73cfd5ae4d691f3b325ad7c4489 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 15:10:39 +0100 Subject: [PATCH 0485/2308] Ensure database gotosocial --- nixos/queen/postgres.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 535e85a..37d3cfd 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -7,7 +7,12 @@ enable = true; # Ensure the database, user, and permissions always exist - ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; + ensureDatabases = [ + "nextcloud" + "onlyoffice" + "akkoma" + "gotosocial" + ]; ensureUsers = [ { name = "nextcloud"; From 111bc463c2bee8f13f2383ee34a6125ab4079ee3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 15:10:39 +0100 Subject: [PATCH 0486/2308] Ensure database gotosocial --- nixos/queen/postgres.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 535e85a..37d3cfd 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -7,7 +7,12 @@ enable = true; # Ensure the database, user, and permissions always exist - ensureDatabases = ["nextcloud" "onlyoffice" "akkoma"]; + ensureDatabases = [ + "nextcloud" + "onlyoffice" + "akkoma" + "gotosocial" + ]; ensureUsers = [ { name = "nextcloud"; From 26e1f492df1814d4b5e37a81583878913f52f922 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 21:25:08 +0100 Subject: [PATCH 0487/2308] remove mssql on desktops --- nixos/shared-desktop/configuration.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index c89ebdc..2881a8a 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -169,22 +169,6 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; shell = pkgs.zsh; }; - mssql = { - isSystemUser = true; - group = "mssql"; - }; - }; - - virtualisation.oci-containers.containers = { - mssql = { - image = "mcr.microsoft.com/mssql/server:2022-latest"; - ports = ["1433:1433"]; - environment = { - "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; - }; - volumes = ["/home/lillian/docker/mssql:/data"]; - }; }; # Enable completion of system packages by zsh From 1b0acfb23bf6cf84d710d19578ffe771beb5eaaa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 21:25:08 +0100 Subject: [PATCH 0488/2308] remove mssql on desktops --- nixos/shared-desktop/configuration.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index c89ebdc..2881a8a 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -169,22 +169,6 @@ extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; shell = pkgs.zsh; }; - mssql = { - isSystemUser = true; - group = "mssql"; - }; - }; - - virtualisation.oci-containers.containers = { - mssql = { - image = "mcr.microsoft.com/mssql/server:2022-latest"; - ports = ["1433:1433"]; - environment = { - "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; - }; - volumes = ["/home/lillian/docker/mssql:/data"]; - }; }; # Enable completion of system packages by zsh From 7804c4ec9cacf7f33c026eda334e792e7fbf0831 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 22:39:59 +0100 Subject: [PATCH 0489/2308] Enable app store --- nixos/queen/nextcloud.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 9e5117f..14b3ae2 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -67,6 +67,7 @@ #Increase opcache string buffer phpOptions."opcache.interned_strings_buffer" = "23"; + appstoreEnable = true; extraAppsEnable = true; extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in From a46eb95be26b7c0857ccabea7665ac91cc79cadc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 22:39:59 +0100 Subject: [PATCH 0490/2308] Enable app store --- nixos/queen/nextcloud.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 9e5117f..14b3ae2 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -67,6 +67,7 @@ #Increase opcache string buffer phpOptions."opcache.interned_strings_buffer" = "23"; + appstoreEnable = true; extraAppsEnable = true; extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in From 13f4ae6e6f29b55f44afe93095bf0851b5a32c0c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:29:33 +0100 Subject: [PATCH 0491/2308] Remove mssql group vestige --- nixos/shared-desktop/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 2881a8a..5743b01 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -161,8 +161,6 @@ boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; - users.groups.mssql = {}; - users.users = { lillian = { isNormalUser = true; From 00653ec0c78456ca5bd4f19746523b515fc9a5de Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:29:33 +0100 Subject: [PATCH 0492/2308] Remove mssql group vestige --- nixos/shared-desktop/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 2881a8a..5743b01 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -161,8 +161,6 @@ boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; - users.groups.mssql = {}; - users.users = { lillian = { isNormalUser = true; From 577f18e3c96c7638a6cc99d4cf319d3561bf0fbe Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:46:13 +0100 Subject: [PATCH 0493/2308] Better secret management --- nixos/queen/configuration.nix | 2 +- secrets/queen-Lillian.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 8a351e0..b735391 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -165,7 +165,7 @@ ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; + "MSSQL_SA_PASSWORD" = "${config.sops.placeholder.mssqlpass}"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index fc2c77e..6ee2f99 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -3,6 +3,7 @@ nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv local.json: ENC[AES256_GCM,data:EWMZTvnP9DmJKZq3mejvlSc8e2BZxcREn+XB1tAM5NLS0G2fdWJThkkgRz2owdAiZV2BLc/yqr4DqJzDIXiOxWWBGAbqRFH5kPw2mAdkAcW76F8tUNQSBtQXM+Gu3W3EwjQwNiwVlb1jB0BNWU4TJfZGfdk2Vt0R7ggTJhRIAwQiXC1VtMWmlAOyRIaiMzaY4ktEMJT/nxF8koZV79kiCFcAGHzoYynW16y2QkaxFca/4bTvBJCAMBuK0lLF9xeipyGZUgxPV/OAQkrQGAqHcrHL+FmQiFEIuLUBzTDQp57kV1EKKCevRUcPCX/NhQGgLYVgDrsLTb1ftB30yHjWUap+JttKXBk2HElnQVEdS37zADyQ8tYrD+2l2CLrBGctVpg6K61OP44=,iv:VbJgmvIN1/FjQJl58KBsDNTyUWtIAYbBB0iPe6I0+hE=,tag:if16JgRVPeC+m8vFeYhKtA==,type:str] mailpass: ENC[AES256_GCM,data:UVrc1RUV0xJFPiZ8J4refglR0p35gUd21EvvTSoeXHVE9/xC0biKmjdPu8cBmimNPmKJMvZRf8wOz+/x,iv:zIYI9JY/bfUc3nNPNopKMbh09B6KUotMUAmNDzVUBN8=,tag:53N8WlQ5CDlrp/KIEQiHgQ==,type:str] releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/J0AP0o3qw==,iv:zS12xjcNbLaLaLd3VQT8+o9hDqTo1cZdxoPjjhiExDU=,tag:nJFelasEUjebEBpvmfcDEA==,type:str] +mssqlpass: ENC[AES256_GCM,data:XEu4bQC5qM5Cm8UDVX3qAzTuL/t3xbx+qcEbZM4h3Hg=,iv:jgpZ93THYBlUvJDC5+YZiIxu/14e7nFSy76J0vc8Hek=,tag:iKsEDp/KZ5juqzmUgtP8iA==,type:str] sops: kms: [] gcp_kms: [] @@ -18,8 +19,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-25T15:44:36Z" - mac: ENC[AES256_GCM,data:W8TbF2J1OmvWYB59ZzGW7NKmzlKNln4jsNwh6XAIh2X3fOAplmvDZj6MzyK/UNiVzS4b5GfaYas140yVh9YUNkI9QL4CCAgSph+axwtPibjqCUfdMw2xWsgRlm6X9nxsDw0DFCGdJaM12G7thYBGJmIlCmOE2a9qiRv0ZDEXiMY=,iv:EZpeOqxDke5MxqpKCHjECefWYQJYEz0X8k3ebPyhawk=,tag:QUxAtB1hzFAoU2Qd5xA3VQ==,type:str] + lastmodified: "2023-11-27T22:46:02Z" + mac: ENC[AES256_GCM,data:8aObcXuGWeb3XeOxEh+rvkGKGl9FXAB3jzAE0IbvoOpGFK0mpeOlIp+4BsGVo6LjecGfE80mBE49mCgC27KqYEq+jUC4onFiIgWB0VQSD367vd4BLZJqIYH7H+X3bShw7JGHq9Kq+CDwbCOzAQJHltYDg4jhJ5qbWqNINJ6t7tY=,iv:OWmROKYvN4nCwGNSFrue2icqNQ+QOp9xVlfLXUwuS1s=,tag:N3AHph2pnTSKwlO1Px/TwQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From dbe269da2cae1dcf93ffb4b01db47606437913b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:46:13 +0100 Subject: [PATCH 0494/2308] Better secret management --- nixos/queen/configuration.nix | 2 +- secrets/queen-Lillian.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 8a351e0..b735391 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -165,7 +165,7 @@ ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; + "MSSQL_SA_PASSWORD" = "${config.sops.placeholder.mssqlpass}"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index fc2c77e..6ee2f99 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -3,6 +3,7 @@ nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv local.json: ENC[AES256_GCM,data:EWMZTvnP9DmJKZq3mejvlSc8e2BZxcREn+XB1tAM5NLS0G2fdWJThkkgRz2owdAiZV2BLc/yqr4DqJzDIXiOxWWBGAbqRFH5kPw2mAdkAcW76F8tUNQSBtQXM+Gu3W3EwjQwNiwVlb1jB0BNWU4TJfZGfdk2Vt0R7ggTJhRIAwQiXC1VtMWmlAOyRIaiMzaY4ktEMJT/nxF8koZV79kiCFcAGHzoYynW16y2QkaxFca/4bTvBJCAMBuK0lLF9xeipyGZUgxPV/OAQkrQGAqHcrHL+FmQiFEIuLUBzTDQp57kV1EKKCevRUcPCX/NhQGgLYVgDrsLTb1ftB30yHjWUap+JttKXBk2HElnQVEdS37zADyQ8tYrD+2l2CLrBGctVpg6K61OP44=,iv:VbJgmvIN1/FjQJl58KBsDNTyUWtIAYbBB0iPe6I0+hE=,tag:if16JgRVPeC+m8vFeYhKtA==,type:str] mailpass: ENC[AES256_GCM,data:UVrc1RUV0xJFPiZ8J4refglR0p35gUd21EvvTSoeXHVE9/xC0biKmjdPu8cBmimNPmKJMvZRf8wOz+/x,iv:zIYI9JY/bfUc3nNPNopKMbh09B6KUotMUAmNDzVUBN8=,tag:53N8WlQ5CDlrp/KIEQiHgQ==,type:str] releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/J0AP0o3qw==,iv:zS12xjcNbLaLaLd3VQT8+o9hDqTo1cZdxoPjjhiExDU=,tag:nJFelasEUjebEBpvmfcDEA==,type:str] +mssqlpass: ENC[AES256_GCM,data:XEu4bQC5qM5Cm8UDVX3qAzTuL/t3xbx+qcEbZM4h3Hg=,iv:jgpZ93THYBlUvJDC5+YZiIxu/14e7nFSy76J0vc8Hek=,tag:iKsEDp/KZ5juqzmUgtP8iA==,type:str] sops: kms: [] gcp_kms: [] @@ -18,8 +19,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-25T15:44:36Z" - mac: ENC[AES256_GCM,data:W8TbF2J1OmvWYB59ZzGW7NKmzlKNln4jsNwh6XAIh2X3fOAplmvDZj6MzyK/UNiVzS4b5GfaYas140yVh9YUNkI9QL4CCAgSph+axwtPibjqCUfdMw2xWsgRlm6X9nxsDw0DFCGdJaM12G7thYBGJmIlCmOE2a9qiRv0ZDEXiMY=,iv:EZpeOqxDke5MxqpKCHjECefWYQJYEz0X8k3ebPyhawk=,tag:QUxAtB1hzFAoU2Qd5xA3VQ==,type:str] + lastmodified: "2023-11-27T22:46:02Z" + mac: ENC[AES256_GCM,data:8aObcXuGWeb3XeOxEh+rvkGKGl9FXAB3jzAE0IbvoOpGFK0mpeOlIp+4BsGVo6LjecGfE80mBE49mCgC27KqYEq+jUC4onFiIgWB0VQSD367vd4BLZJqIYH7H+X3bShw7JGHq9Kq+CDwbCOzAQJHltYDg4jhJ5qbWqNINJ6t7tY=,iv:OWmROKYvN4nCwGNSFrue2icqNQ+QOp9xVlfLXUwuS1s=,tag:N3AHph2pnTSKwlO1Px/TwQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From becb78966bc30a6fcd6f1da1f4ba40e0f8055d9c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:47:49 +0100 Subject: [PATCH 0495/2308] quoted? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index b735391..509910b 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -165,7 +165,7 @@ ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "${config.sops.placeholder.mssqlpass}"; + "MSSQL_SA_PASSWORD" = "${config.sops.placeholder."mssqlpass"}"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From e82aa87177198851a238f5abe1236a909bd2ec6f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:47:49 +0100 Subject: [PATCH 0496/2308] quoted? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index b735391..509910b 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -165,7 +165,7 @@ ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "${config.sops.placeholder.mssqlpass}"; + "MSSQL_SA_PASSWORD" = "${config.sops.placeholder."mssqlpass"}"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From 97161b302510dfc6477ad7abbf412cefbc2c6e3c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:49:54 +0100 Subject: [PATCH 0497/2308] Needs definition? --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 509910b..14f3750 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -56,6 +56,8 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; + sops.secrets."mssqlpass".mode = "0440"; + sops.secrets."mssqlpass".owner = config.users.users.mssql.name; nix = { gc = { From 502d0d025ed2dd7282aa44d98b40428bf8e01a52 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:49:54 +0100 Subject: [PATCH 0498/2308] Needs definition? --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 509910b..14f3750 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -56,6 +56,8 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; + sops.secrets."mssqlpass".mode = "0440"; + sops.secrets."mssqlpass".owner = config.users.users.mssql.name; nix = { gc = { From 8f85b5ae357587c231ec4a2d95fe9b51367d2fde Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:50:49 +0100 Subject: [PATCH 0499/2308] Ah wait it's because config is imported --- nixos/queen/configuration.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 14f3750..92544f8 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -56,8 +56,6 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; - sops.secrets."mssqlpass".mode = "0440"; - sops.secrets."mssqlpass".owner = config.users.users.mssql.name; nix = { gc = { @@ -167,7 +165,7 @@ ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "${config.sops.placeholder."mssqlpass"}"; + "MSSQL_SA_PASSWORD" = "${sops.placeholder."mssqlpass"}"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From e3c506762bec2d04739ae02336018d1635fce76e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:50:49 +0100 Subject: [PATCH 0500/2308] Ah wait it's because config is imported --- nixos/queen/configuration.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 14f3750..92544f8 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -56,8 +56,6 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; sops.age.keyFile = ./keys.txt; - sops.secrets."mssqlpass".mode = "0440"; - sops.secrets."mssqlpass".owner = config.users.users.mssql.name; nix = { gc = { @@ -167,7 +165,7 @@ ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "${config.sops.placeholder."mssqlpass"}"; + "MSSQL_SA_PASSWORD" = "${sops.placeholder."mssqlpass"}"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From a80b94e06d4b00f1f6c451e6778cab5a37d0e8ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:56:23 +0100 Subject: [PATCH 0501/2308] That doesn't work, never mind --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 92544f8..8a351e0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -165,7 +165,7 @@ ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "${sops.placeholder."mssqlpass"}"; + "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From a8c1988bb7d5663f7923f7cef62349183b87663a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 27 Nov 2023 23:56:23 +0100 Subject: [PATCH 0502/2308] That doesn't work, never mind --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 92544f8..8a351e0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -165,7 +165,7 @@ ports = ["1433:1433"]; environment = { "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "${sops.placeholder."mssqlpass"}"; + "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; }; volumes = ["/home/lillian/docker/mssql:/data"]; }; From 77bef65f96891f2d6712ed6b10aeae3d37ab510a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:06:04 +0100 Subject: [PATCH 0503/2308] Update flake lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e179486..6f15723 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700900274, - "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", + "lastModified": 1701071203, + "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a462e7315deaa8194b0821f726709bb7e51a850c", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700967639, - "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=", + "lastModified": 1701127353, + "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4be58d802693d7def8622ff34d36714f8db40371", + "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631", "type": "github" }, "original": { From 66d2a505939d3baccf76cfb3d8c195f889c134c3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:06:04 +0100 Subject: [PATCH 0504/2308] Update flake lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e179486..6f15723 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700900274, - "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", + "lastModified": 1701071203, + "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a462e7315deaa8194b0821f726709bb7e51a850c", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700967639, - "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=", + "lastModified": 1701127353, + "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4be58d802693d7def8622ff34d36714f8db40371", + "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631", "type": "github" }, "original": { From 386897c36e1e8cd611c164956a9875eb8bb2ce16 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:10:20 +0100 Subject: [PATCH 0505/2308] Downgrade to 23.05? --- home-manager/EDI-Lillian.nix | 2 +- nixos/EDI/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index fb6fcb7..67e3382 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -22,5 +22,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index c291657..5aade6a 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -39,5 +39,5 @@ networking.hostName = "EDI"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From 737f4f6c1a75ad2c5f92e6845a5f2f0e941d3270 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:10:20 +0100 Subject: [PATCH 0506/2308] Downgrade to 23.05? --- home-manager/EDI-Lillian.nix | 2 +- nixos/EDI/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index fb6fcb7..67e3382 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -22,5 +22,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index c291657..5aade6a 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -39,5 +39,5 @@ networking.hostName = "EDI"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From d3382eeb0c726d29e6b6b95a3370523d02130a1f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:10:56 +0100 Subject: [PATCH 0507/2308] Update flake --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 6f15723..5fe9fc7 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701053011, + "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 89d218e..35c5c4a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; sops-nix.url = "github:Mic92/sops-nix"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: From be670520afb66710588c4ac07fa610755305623c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:10:56 +0100 Subject: [PATCH 0508/2308] Update flake --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 6f15723..5fe9fc7 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701053011, + "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 89d218e..35c5c4a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; sops-nix.url = "github:Mic92/sops-nix"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: From a77277d889b69b56911a28949b49eab0f099626d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:12:11 +0100 Subject: [PATCH 0509/2308] Not found in 23.05 --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index d0c3732..a7efb2b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -102,7 +102,7 @@ package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ arrterian.nix-env-selector - ban.spellright + #ban.spellright dracula-theme.theme-dracula eamodio.gitlens github.vscode-pull-request-github From 52d6da4c44360a54a5bd4a750087c40ebb526470 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:12:11 +0100 Subject: [PATCH 0510/2308] Not found in 23.05 --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index d0c3732..a7efb2b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -102,7 +102,7 @@ package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ arrterian.nix-env-selector - ban.spellright + #ban.spellright dracula-theme.theme-dracula eamodio.gitlens github.vscode-pull-request-github From 67d1b18e2403e15dd3a97a68fd45c6bcc0f52519 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:12:46 +0100 Subject: [PATCH 0511/2308] Ditto --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index a7efb2b..d088f4b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -112,7 +112,7 @@ ms-pyright.pyright #ms-python.python ms-python.vscode-pylance - ms-vscode-remote.remote-containers + #ms-vscode-remote.remote-containers ms-vscode-remote.remote-ssh oderwat.indent-rainbow rust-lang.rust-analyzer From 077cec8770614a6444ad0ff6737a6f0f61f276bb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:12:46 +0100 Subject: [PATCH 0512/2308] Ditto --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index a7efb2b..d088f4b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -112,7 +112,7 @@ ms-pyright.pyright #ms-python.python ms-python.vscode-pylance - ms-vscode-remote.remote-containers + #ms-vscode-remote.remote-containers ms-vscode-remote.remote-ssh oderwat.indent-rainbow rust-lang.rust-analyzer From 6811ab7fdf89109618166d6617ab049b04660de5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:14:04 +0100 Subject: [PATCH 0513/2308] Permit electron 24 --- home-manager/desktop-shared.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index d088f4b..ad1e004 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -42,6 +42,10 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; + + permittedInsecurePackages = [ + "electron-24.8.6" + ]; }; }; From 3c9ddfdc9770a8339417deeff44e29ec51fb807f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:14:04 +0100 Subject: [PATCH 0514/2308] Permit electron 24 --- home-manager/desktop-shared.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index d088f4b..ad1e004 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -42,6 +42,10 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; + + permittedInsecurePackages = [ + "electron-24.8.6" + ]; }; }; From c87d6ab3c84c231c4fa8e0c13d980d2ddd49c3b9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:18:46 +0100 Subject: [PATCH 0515/2308] Isn't an option in this version --- home-manager/program-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/program-configs/zsh.nix b/home-manager/program-configs/zsh.nix index e61cb4b..f4da504 100644 --- a/home-manager/program-configs/zsh.nix +++ b/home-manager/program-configs/zsh.nix @@ -24,7 +24,7 @@ enableCompletion = true; historySubstringSearch.enable = true; syntaxHighlighting.enable = true; - zsh-abbr.enable = true; + #zsh-abbr.enable = true; oh-my-zsh = { enable = true; plugins = [ From cf6225b884ceaa55fccd31f4a15812ef0924064e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:18:46 +0100 Subject: [PATCH 0516/2308] Isn't an option in this version --- home-manager/program-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/program-configs/zsh.nix b/home-manager/program-configs/zsh.nix index e61cb4b..f4da504 100644 --- a/home-manager/program-configs/zsh.nix +++ b/home-manager/program-configs/zsh.nix @@ -24,7 +24,7 @@ enableCompletion = true; historySubstringSearch.enable = true; syntaxHighlighting.enable = true; - zsh-abbr.enable = true; + #zsh-abbr.enable = true; oh-my-zsh = { enable = true; plugins = [ From 01314042e2d45c31b8c45dad8230e98180c16d6a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:19:50 +0100 Subject: [PATCH 0517/2308] Remove input leap --- nixos/shared-desktop/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 5743b01..160d70a 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -62,7 +62,6 @@ docker-compose git-filter-repo home-manager - input-leap libsForQt5.discover libsForQt5.kcalc libsForQt5.kdepim-addons From 5f69883f5c996c290cebf512598eabd49aae4b09 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:19:50 +0100 Subject: [PATCH 0518/2308] Remove input leap --- nixos/shared-desktop/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 5743b01..160d70a 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -62,7 +62,6 @@ docker-compose git-filter-repo home-manager - input-leap libsForQt5.discover libsForQt5.kcalc libsForQt5.kdepim-addons From 8c69899f9afb22825f27bbd08df7179cdd0437e9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:31:41 +0100 Subject: [PATCH 0519/2308] Let's go unstable again (timewarp beat) --- home-manager/EDI-Lillian.nix | 2 +- nixos/EDI/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 67e3382..fb6fcb7 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -22,5 +22,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 5aade6a..c291657 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -39,5 +39,5 @@ networking.hostName = "EDI"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } From 0c5d774156a5c03024e83b76c3aed17918eef28b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:31:41 +0100 Subject: [PATCH 0520/2308] Let's go unstable again (timewarp beat) --- home-manager/EDI-Lillian.nix | 2 +- nixos/EDI/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 67e3382..fb6fcb7 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -22,5 +22,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 5aade6a..c291657 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -39,5 +39,5 @@ networking.hostName = "EDI"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } From 5d468c542df8099f64a9ffdc8d0ebab08767feb2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:32:44 +0100 Subject: [PATCH 0521/2308] This was the issue I think --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 35c5c4a..89d218e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: From 70599b28e93581f98dea15f4355bf00768ea463e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:32:44 +0100 Subject: [PATCH 0522/2308] This was the issue I think --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 35c5c4a..89d218e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: From 200dd415f09b92c9157566231b2c052479b41b49 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:33:01 +0100 Subject: [PATCH 0523/2308] Flake lock --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 5fe9fc7..6f15723 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701053011, - "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } From da4b8e2a8c2e0e9a560460f8b9d586f7c2aeb557 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:33:01 +0100 Subject: [PATCH 0524/2308] Flake lock --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 5fe9fc7..6f15723 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701053011, - "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } From fb01bf66afa64a757783419219c8464b1964d171 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:39:10 +0100 Subject: [PATCH 0525/2308] Try the other webcord? --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index ad1e004..a950fac 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -66,7 +66,7 @@ # Chat applications: element-desktop signal-desktop - webcord + webcord-vencord # Gaming: prismlauncher From db9e75d048ffcdf1bf6671e667ebe7a1fa86e790 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:39:10 +0100 Subject: [PATCH 0526/2308] Try the other webcord? --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index ad1e004..a950fac 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -66,7 +66,7 @@ # Chat applications: element-desktop signal-desktop - webcord + webcord-vencord # Gaming: prismlauncher From e3b1fe9161e389a3107279271541683f3ae86a56 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 29 Nov 2023 13:22:33 +0100 Subject: [PATCH 0527/2308] Add sqlfluff (that's its name I promise) --- nixos/shared-desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 160d70a..41a01d2 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -77,6 +77,7 @@ pciutils rsync steam + sqlfluff wget zsh ]; From 494077f0bb0eb06f6ff0c5d818cb8db447802a73 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 29 Nov 2023 13:22:33 +0100 Subject: [PATCH 0528/2308] Add sqlfluff (that's its name I promise) --- nixos/shared-desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 160d70a..41a01d2 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -77,6 +77,7 @@ pciutils rsync steam + sqlfluff wget zsh ]; From d5ac22bb1bfe3823b5c6adb1381153c384c83d04 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 10:41:54 +0100 Subject: [PATCH 0529/2308] flake lock update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 6f15723..c9923c2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1701071203, - "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", + "lastModified": 1701728041, + "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", + "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700905716, - "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", + "lastModified": 1701568804, + "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfb95385d21475da10b63da74ae96d89ab352431", + "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700856099, - "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", + "lastModified": 1701336116, + "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", + "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1701127353, - "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=", + "lastModified": 1701728052, + "narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631", + "rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d", "type": "github" }, "original": { From ebaa0d9d7df7b658f0f1bf29e8bb603a1d1d1e05 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 10:41:54 +0100 Subject: [PATCH 0530/2308] flake lock update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 6f15723..c9923c2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1701071203, - "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", + "lastModified": 1701728041, + "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", + "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700905716, - "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", + "lastModified": 1701568804, + "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfb95385d21475da10b63da74ae96d89ab352431", + "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700856099, - "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", + "lastModified": 1701336116, + "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", + "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1701127353, - "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=", + "lastModified": 1701728052, + "narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631", + "rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d", "type": "github" }, "original": { From cabefc2fa3d9a96f9142605d2ab5a75613e2b4e1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 11:27:27 +0100 Subject: [PATCH 0531/2308] Maybe open the right port for the db --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 8a351e0..11dd541 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -113,7 +113,7 @@ # Enable networking networking.networkmanager.enable = true; - networking.firewall.allowedTCPPorts = [80 443 1443]; + networking.firewall.allowedTCPPorts = [80 443 1433]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From f0c566776571bb1291dd8d656b6e70941c359ae8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 11:27:27 +0100 Subject: [PATCH 0532/2308] Maybe open the right port for the db --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 8a351e0..11dd541 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -113,7 +113,7 @@ # Enable networking networking.networkmanager.enable = true; - networking.firewall.allowedTCPPorts = [80 443 1443]; + networking.firewall.allowedTCPPorts = [80 443 1433]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 4656596b0a5bf900dfa243cc002e77bfb6c635df Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 13:16:48 +0100 Subject: [PATCH 0533/2308] Add krunner plugins --- nixos/shared-desktop/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 41a01d2..65782dd 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -62,11 +62,14 @@ docker-compose git-filter-repo home-manager + krunner-translator libsForQt5.discover libsForQt5.kcalc libsForQt5.kdepim-addons libsForQt5.kirigami2 libsForQt5.kdeconnect-kde + libsForQt5.krunner-ssh + libsForQt5.krunner-symbols libsForQt5.packagekit-qt libportal-qt5 noto-fonts From fe060f3d4c675d476e8d97e3a0f2a5bbe5e81118 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 13:16:48 +0100 Subject: [PATCH 0534/2308] Add krunner plugins --- nixos/shared-desktop/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 41a01d2..65782dd 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -62,11 +62,14 @@ docker-compose git-filter-repo home-manager + krunner-translator libsForQt5.discover libsForQt5.kcalc libsForQt5.kdepim-addons libsForQt5.kirigami2 libsForQt5.kdeconnect-kde + libsForQt5.krunner-ssh + libsForQt5.krunner-symbols libsForQt5.packagekit-qt libportal-qt5 noto-fonts From bf951766a71d81f5e00868a4d8c4ce8159c90420 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 14:30:54 +0100 Subject: [PATCH 0535/2308] Enable firewall? --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 11dd541..6e595c0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -113,6 +113,8 @@ # Enable networking networking.networkmanager.enable = true; + networking.firewall.enable = true; + networking.firewall.allowedTCPPorts = [80 443 1433]; # Set your time zone. From 4699abff0b8964710ed18bc57e7a82a626db0d1f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 14:30:54 +0100 Subject: [PATCH 0536/2308] Enable firewall? --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 11dd541..6e595c0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -113,6 +113,8 @@ # Enable networking networking.networkmanager.enable = true; + networking.firewall.enable = true; + networking.firewall.allowedTCPPorts = [80 443 1433]; # Set your time zone. From 8e07ec55c732e230d78ac22c429fcf18768b3bd8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 14:34:39 +0100 Subject: [PATCH 0537/2308] Allow SSH port --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6e595c0..ab9f77d 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -115,7 +115,7 @@ networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [80 443 1433]; + networking.firewall.allowedTCPPorts = [22 80 443 1433]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 0504e7548bbd85d33b84d26aac47f9cd6a19f4b0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 14:34:39 +0100 Subject: [PATCH 0538/2308] Allow SSH port --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6e595c0..ab9f77d 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -115,7 +115,7 @@ networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [80 443 1433]; + networking.firewall.allowedTCPPorts = [22 80 443 1433]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 7878ea2df3f0bd7f88e510f9867d81187c17cdc7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 6 Dec 2023 11:14:36 +0100 Subject: [PATCH 0539/2308] Maybe the updates have fixed akkoma? (doubful) --- nixos/queen/akkoma.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index fef0b69..bd68ba9 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,7 +25,7 @@ nginx = { enableACME = true; forceSSL = true; - serverName = "social.gladtherescake.eu"; + serverName = "akkoma.gladtherescake.eu"; }; #dist.cookie._secret = config.sops.secrets."releaseCookie".path; config = { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ab9f77d..fb3dfd0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -20,7 +20,7 @@ ./nextcloud.nix ./mail-server.nix ./gotosocial.nix - #./akkoma.nix + ./akkoma.nix ]; boot.tmp.cleanOnBoot = true; From 5865d18a98d6ea68acdcc01e6ecc8f2f8cc0ad76 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 6 Dec 2023 11:14:36 +0100 Subject: [PATCH 0540/2308] Maybe the updates have fixed akkoma? (doubful) --- nixos/queen/akkoma.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index fef0b69..bd68ba9 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,7 +25,7 @@ nginx = { enableACME = true; forceSSL = true; - serverName = "social.gladtherescake.eu"; + serverName = "akkoma.gladtherescake.eu"; }; #dist.cookie._secret = config.sops.secrets."releaseCookie".path; config = { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ab9f77d..fb3dfd0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -20,7 +20,7 @@ ./nextcloud.nix ./mail-server.nix ./gotosocial.nix - #./akkoma.nix + ./akkoma.nix ]; boot.tmp.cleanOnBoot = true; From b1d958fa5f1de84b3e62cca4eb9e2f7bbbf8f52f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 7 Dec 2023 17:51:22 +0100 Subject: [PATCH 0541/2308] add gnu imp --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index d0c3732..17c939a 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -76,6 +76,7 @@ # Office applications: onlyoffice-bin teams-for-linux + gimp-with-plugins # System tools: rage From 73499157c3f0fb223f854eaee4d19bed51449bd5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 7 Dec 2023 17:51:22 +0100 Subject: [PATCH 0542/2308] add gnu imp --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index d0c3732..17c939a 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -76,6 +76,7 @@ # Office applications: onlyoffice-bin teams-for-linux + gimp-with-plugins # System tools: rage From b55a78daf98bea2ad0f41a438549cd6bd6137271 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 11 Dec 2023 16:05:16 +0100 Subject: [PATCH 0543/2308] flake update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c9923c2..7fe53eb 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1701728041, - "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", + "lastModified": 1702203126, + "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", + "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1702151865, + "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1701568804, - "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=", + "lastModified": 1702148972, + "narHash": "sha256-h2jODFP6n+ABrUWcGRSVPRFfLOkM9TJ2pO+h+9JcaL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4", + "rev": "b8f33c044e51de6dde3ad80a9676945e0e4e3227", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1702151865, + "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701336116, - "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", + "lastModified": 1702029940, + "narHash": "sha256-qM3Du0perpLesh5hr87mVPZ79McMUKIWUH7EQMh2kWo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", + "rev": "e9ef8a102c555da4f8f417fe5cf5bd539d8a38b7", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1701728052, - "narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=", + "lastModified": 1702177193, + "narHash": "sha256-J2409SyXROoUHYXVy9h4Pj0VU8ReLuy/mzBc9iK4DBg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d", + "rev": "d806e546f96c88cd9f7d91c1c19ebc99ba6277d9", "type": "github" }, "original": { From 64b1105f24772e2c42d955a03628d8290927dd33 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 11 Dec 2023 16:05:16 +0100 Subject: [PATCH 0544/2308] flake update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c9923c2..7fe53eb 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1701728041, - "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", + "lastModified": 1702203126, + "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", + "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1702151865, + "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1701568804, - "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=", + "lastModified": 1702148972, + "narHash": "sha256-h2jODFP6n+ABrUWcGRSVPRFfLOkM9TJ2pO+h+9JcaL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4", + "rev": "b8f33c044e51de6dde3ad80a9676945e0e4e3227", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1702151865, + "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701336116, - "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", + "lastModified": 1702029940, + "narHash": "sha256-qM3Du0perpLesh5hr87mVPZ79McMUKIWUH7EQMh2kWo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", + "rev": "e9ef8a102c555da4f8f417fe5cf5bd539d8a38b7", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1701728052, - "narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=", + "lastModified": 1702177193, + "narHash": "sha256-J2409SyXROoUHYXVy9h4Pj0VU8ReLuy/mzBc9iK4DBg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d", + "rev": "d806e546f96c88cd9f7d91c1c19ebc99ba6277d9", "type": "github" }, "original": { From f316f9d6302c3d48477a5ffeb7483433d9a47204 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 11 Dec 2023 16:11:07 +0100 Subject: [PATCH 0545/2308] Another day another insecure electron build --- nixos/shared-desktop/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 65782dd..0d14232 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -30,6 +30,9 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; + permittedInsecurePackages = [ + "electron-25.9.0" + ]; }; }; From 6c6363d524e9df91893cd6f9ca4e055ddf44124d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 11 Dec 2023 16:11:07 +0100 Subject: [PATCH 0546/2308] Another day another insecure electron build --- nixos/shared-desktop/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 65782dd..0d14232 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -30,6 +30,9 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; + permittedInsecurePackages = [ + "electron-25.9.0" + ]; }; }; From 96a0ca520fdcafe962ee76c19cccd447200d9158 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 11 Dec 2023 16:12:56 +0100 Subject: [PATCH 0547/2308] In home manager perhaps --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index e50587e..8342b88 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -44,7 +44,7 @@ allowUnfreePredicate = _: true; permittedInsecurePackages = [ - "electron-24.8.6" + "electron-25.9.0" ]; }; }; From cb74bdf5eadec0c615a7dab58db565327772e2a3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 11 Dec 2023 16:12:56 +0100 Subject: [PATCH 0548/2308] In home manager perhaps --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index e50587e..8342b88 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -44,7 +44,7 @@ allowUnfreePredicate = _: true; permittedInsecurePackages = [ - "electron-24.8.6" + "electron-25.9.0" ]; }; }; From 66ee62e5f011d866dae61c04fb64fa3acbb8e809 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 11 Dec 2023 16:17:27 +0100 Subject: [PATCH 0549/2308] Let's just remove bitwarden (that does scare me) --- home-manager/desktop-shared.nix | 5 ----- nixos/shared-desktop/configuration.nix | 3 --- 2 files changed, 8 deletions(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 8342b88..89ed4a0 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -42,10 +42,6 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; - - permittedInsecurePackages = [ - "electron-25.9.0" - ]; }; }; @@ -84,7 +80,6 @@ # System tools: rage - bitwarden discover flameshot fzf diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 0d14232..65782dd 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -30,9 +30,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - permittedInsecurePackages = [ - "electron-25.9.0" - ]; }; }; From 4058f353e905e22821af9cf3729ac3016b1160e2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 11 Dec 2023 16:17:27 +0100 Subject: [PATCH 0550/2308] Let's just remove bitwarden (that does scare me) --- home-manager/desktop-shared.nix | 5 ----- nixos/shared-desktop/configuration.nix | 3 --- 2 files changed, 8 deletions(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 8342b88..89ed4a0 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -42,10 +42,6 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; - - permittedInsecurePackages = [ - "electron-25.9.0" - ]; }; }; @@ -84,7 +80,6 @@ # System tools: rage - bitwarden discover flameshot fzf diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 0d14232..65782dd 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -30,9 +30,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - permittedInsecurePackages = [ - "electron-25.9.0" - ]; }; }; From 0b7926483cc77bfcfd64a7b62787eec91a605b15 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Dec 2023 13:16:12 +0100 Subject: [PATCH 0551/2308] Install librewolf --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 89ed4a0..5aac23f 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -94,6 +94,7 @@ # Web browsing: firefox + librewolf ungoogled-chromium ]; From 7cb86c9b0a1d55326f5407fe5ab9ab15f97b8b8c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Dec 2023 13:16:12 +0100 Subject: [PATCH 0552/2308] Install librewolf --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 89ed4a0..5aac23f 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -94,6 +94,7 @@ # Web browsing: firefox + librewolf ungoogled-chromium ]; From d3299ee377caa24d88529e726dc93ef1fa641c31 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 21:20:10 +0100 Subject: [PATCH 0553/2308] New email domain! --- nixos/queen/mail-server.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index d591e5f..41fd5e3 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -36,6 +36,7 @@ "nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu" "social.gladtherescake.eu" + "lillianviolet.dev" ]; loginAccounts = { @@ -48,7 +49,17 @@ "no-reply@social.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; + "info@lillianviolet.dev" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + aliases = [ + "@lillianviolet.dev" + ]; + catchAll = [ + "lillianviolet.dev" + ]; + }; }; + rejectRecipients = [ "no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu" From 56137e9a90eb5cb5b633a2ffb9f95c33592b1535 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 21:20:10 +0100 Subject: [PATCH 0554/2308] New email domain! --- nixos/queen/mail-server.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index d591e5f..41fd5e3 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -36,6 +36,7 @@ "nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu" "social.gladtherescake.eu" + "lillianviolet.dev" ]; loginAccounts = { @@ -48,7 +49,17 @@ "no-reply@social.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; + "info@lillianviolet.dev" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + aliases = [ + "@lillianviolet.dev" + ]; + catchAll = [ + "lillianviolet.dev" + ]; + }; }; + rejectRecipients = [ "no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu" From a56f1b95fb274e273b27047531a8c1de4102cfa4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 21:29:34 +0100 Subject: [PATCH 0555/2308] Add thunderbird --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 5aac23f..a048e25 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -77,6 +77,7 @@ onlyoffice-bin teams-for-linux gimp-with-plugins + thunderbird # System tools: rage From 79c68b18551ff7af666b79217a6b112866af808d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 21:29:34 +0100 Subject: [PATCH 0556/2308] Add thunderbird --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index 5aac23f..a048e25 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -77,6 +77,7 @@ onlyoffice-bin teams-for-linux gimp-with-plugins + thunderbird # System tools: rage From 03e99166e1101944c5b8e7ea0f8ae57ffa68f11d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 21:57:14 +0100 Subject: [PATCH 0557/2308] Let's try two servers? --- nixos/queen/mail-server.nix | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 41fd5e3..9b8abaf 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -36,7 +36,6 @@ "nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu" "social.gladtherescake.eu" - "lillianviolet.dev" ]; loginAccounts = { @@ -49,6 +48,26 @@ "no-reply@social.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; + }; + + rejectRecipients = [ + "no-reply@nextcloud.gladtherescake.eu" + "no-reply@akkoma.gladtherescake.eu" + "no-reply@social.gladtherescake.eu" + ]; + certificateScheme = "acme-nginx"; + }; + + mailserver = { + enable = true; + enableImap = true; + enableSubmission = true; + fqdn = "mail.lillianviolet.dev"; + domains = [ + "lillianviolet.dev" + ]; + + loginAccounts = { "info@lillianviolet.dev" = { hashedPasswordFile = config.sops.secrets."mailpass".path; aliases = [ @@ -59,12 +78,6 @@ ]; }; }; - - rejectRecipients = [ - "no-reply@nextcloud.gladtherescake.eu" - "no-reply@akkoma.gladtherescake.eu" - "no-reply@social.gladtherescake.eu" - ]; certificateScheme = "acme-nginx"; }; } From 588161a0c6071482b9e6f176b918fa224c1ed307 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 21:57:14 +0100 Subject: [PATCH 0558/2308] Let's try two servers? --- nixos/queen/mail-server.nix | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 41fd5e3..9b8abaf 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -36,7 +36,6 @@ "nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu" "social.gladtherescake.eu" - "lillianviolet.dev" ]; loginAccounts = { @@ -49,6 +48,26 @@ "no-reply@social.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; + }; + + rejectRecipients = [ + "no-reply@nextcloud.gladtherescake.eu" + "no-reply@akkoma.gladtherescake.eu" + "no-reply@social.gladtherescake.eu" + ]; + certificateScheme = "acme-nginx"; + }; + + mailserver = { + enable = true; + enableImap = true; + enableSubmission = true; + fqdn = "mail.lillianviolet.dev"; + domains = [ + "lillianviolet.dev" + ]; + + loginAccounts = { "info@lillianviolet.dev" = { hashedPasswordFile = config.sops.secrets."mailpass".path; aliases = [ @@ -59,12 +78,6 @@ ]; }; }; - - rejectRecipients = [ - "no-reply@nextcloud.gladtherescake.eu" - "no-reply@akkoma.gladtherescake.eu" - "no-reply@social.gladtherescake.eu" - ]; certificateScheme = "acme-nginx"; }; } From b56eb5a1872d9dedca67d10fad0820961ed061eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 22:06:04 +0100 Subject: [PATCH 0559/2308] That didn't work --- nixos/queen/mail-server.nix | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 9b8abaf..41fd5e3 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -36,6 +36,7 @@ "nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu" "social.gladtherescake.eu" + "lillianviolet.dev" ]; loginAccounts = { @@ -48,26 +49,6 @@ "no-reply@social.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; - }; - - rejectRecipients = [ - "no-reply@nextcloud.gladtherescake.eu" - "no-reply@akkoma.gladtherescake.eu" - "no-reply@social.gladtherescake.eu" - ]; - certificateScheme = "acme-nginx"; - }; - - mailserver = { - enable = true; - enableImap = true; - enableSubmission = true; - fqdn = "mail.lillianviolet.dev"; - domains = [ - "lillianviolet.dev" - ]; - - loginAccounts = { "info@lillianviolet.dev" = { hashedPasswordFile = config.sops.secrets."mailpass".path; aliases = [ @@ -78,6 +59,12 @@ ]; }; }; + + rejectRecipients = [ + "no-reply@nextcloud.gladtherescake.eu" + "no-reply@akkoma.gladtherescake.eu" + "no-reply@social.gladtherescake.eu" + ]; certificateScheme = "acme-nginx"; }; } From 43de7b578ecb4c7894367c61abd47310a5d61774 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 22:06:04 +0100 Subject: [PATCH 0560/2308] That didn't work --- nixos/queen/mail-server.nix | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 9b8abaf..41fd5e3 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -36,6 +36,7 @@ "nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu" "social.gladtherescake.eu" + "lillianviolet.dev" ]; loginAccounts = { @@ -48,26 +49,6 @@ "no-reply@social.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; - }; - - rejectRecipients = [ - "no-reply@nextcloud.gladtherescake.eu" - "no-reply@akkoma.gladtherescake.eu" - "no-reply@social.gladtherescake.eu" - ]; - certificateScheme = "acme-nginx"; - }; - - mailserver = { - enable = true; - enableImap = true; - enableSubmission = true; - fqdn = "mail.lillianviolet.dev"; - domains = [ - "lillianviolet.dev" - ]; - - loginAccounts = { "info@lillianviolet.dev" = { hashedPasswordFile = config.sops.secrets."mailpass".path; aliases = [ @@ -78,6 +59,12 @@ ]; }; }; + + rejectRecipients = [ + "no-reply@nextcloud.gladtherescake.eu" + "no-reply@akkoma.gladtherescake.eu" + "no-reply@social.gladtherescake.eu" + ]; certificateScheme = "acme-nginx"; }; } From f34d0f868e8d3f9d22c26bfb28b379a0368a8995 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 22:11:07 +0100 Subject: [PATCH 0561/2308] Try and generate some certificates? --- nixos/queen/mail-server.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 41fd5e3..d0cbd10 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -66,5 +66,11 @@ "no-reply@social.gladtherescake.eu" ]; certificateScheme = "acme-nginx"; + certificateDomains = [ + "imap.lillianviolet.dev" + "mail.lillianviolet.dev" + "pop3.lillianviolet.dev" + "lillianviolet.dev" + ]; }; } From fa0533a94f80ff9fee516d49171679b9bb83237f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 22:11:07 +0100 Subject: [PATCH 0562/2308] Try and generate some certificates? --- nixos/queen/mail-server.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 41fd5e3..d0cbd10 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -66,5 +66,11 @@ "no-reply@social.gladtherescake.eu" ]; certificateScheme = "acme-nginx"; + certificateDomains = [ + "imap.lillianviolet.dev" + "mail.lillianviolet.dev" + "pop3.lillianviolet.dev" + "lillianviolet.dev" + ]; }; } From ae1b9317381acf627aee33b7674285547589319a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 22:22:17 +0100 Subject: [PATCH 0563/2308] Don't need that mssql anymore babey --- nixos/queen/configuration.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index fb3dfd0..e407b63 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -161,18 +161,6 @@ }; }; - virtualisation.oci-containers.containers = { - mssql = { - image = "mcr.microsoft.com/mssql/server:2022-latest"; - ports = ["1433:1433"]; - environment = { - "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; - }; - volumes = ["/home/lillian/docker/mssql:/data"]; - }; - }; - # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; From 04733e7d648e3f32a2e0013125acfb36f97bd5dc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 15 Dec 2023 22:22:17 +0100 Subject: [PATCH 0564/2308] Don't need that mssql anymore babey --- nixos/queen/configuration.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index fb3dfd0..e407b63 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -161,18 +161,6 @@ }; }; - virtualisation.oci-containers.containers = { - mssql = { - image = "mcr.microsoft.com/mssql/server:2022-latest"; - ports = ["1433:1433"]; - environment = { - "ACCEPT_EULA" = "Y"; - "MSSQL_SA_PASSWORD" = "EbKihNUHg6S$V$qchADFmw!JCm##toc3"; - }; - volumes = ["/home/lillian/docker/mssql:/data"]; - }; - }; - # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; From ed2799a955b69db2ec5e3a09d6bd18e1ddb342b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 17:20:19 +0100 Subject: [PATCH 0565/2308] Some mail server updates and webmail --- nixos/queen/configuration.nix | 1 + nixos/queen/mail-server.nix | 24 ++++++++++++++++++++++++ nixos/queen/webmail.nix | 25 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 nixos/queen/webmail.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index e407b63..085a594 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -19,6 +19,7 @@ ./postgres.nix ./nextcloud.nix ./mail-server.nix + ./webmail.nix ./gotosocial.nix ./akkoma.nix ]; diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index d0cbd10..4c2bd2b 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -6,6 +6,7 @@ pkgs, ... }: { + #The thing you want for multiple domains is SNI, I don't know how to set that up imports = [ (builtins.fetchTarball { # Pick a release version you are interested in and set its hash, e.g. @@ -60,6 +61,29 @@ }; }; + mailboxes = { + Inbox = { + auto = "subscribe"; + specialUse = "Inbox"; + }; + Drafts = { + auto = "subscribe"; + specialUse = "Drafts"; + }; + Junk = { + auto = "subscribe"; + specialUse = "Junk"; + }; + Sent = { + auto = "subscribe"; + specialUse = "Sent"; + }; + Trash = { + auto = "no"; + specialUse = "Trash"; + }; + }; + rejectRecipients = [ "no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu" diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix new file mode 100644 index 0000000..4369b22 --- /dev/null +++ b/nixos/queen/webmail.nix @@ -0,0 +1,25 @@ +{ + config, + pkgs, + lib, + ... +}: +with lib; { + services.roundcube = { + enable = true; + # this is the url of the vhost, not necessarily the same as the fqdn of + # the mailserver + hostName = "mail.lillianviolet.dev"; + extraConfig = '' + # starttls needed for authentication, so the fqdn required to match + # the certificate + $config['smtp_server'] = "tls://${config.mailserver.fqdn}"; + $config['smtp_user'] = "%u"; + $config['smtp_pass'] = "%p"; + ''; + }; + + services.nginx.enable = true; + + networking.firewall.allowedTCPPorts = [80 443]; +} From 9a2ac3d4e3bdb0863523ff09aa72895c1e08bb97 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 17:20:19 +0100 Subject: [PATCH 0566/2308] Some mail server updates and webmail --- nixos/queen/configuration.nix | 1 + nixos/queen/mail-server.nix | 24 ++++++++++++++++++++++++ nixos/queen/webmail.nix | 25 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 nixos/queen/webmail.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index e407b63..085a594 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -19,6 +19,7 @@ ./postgres.nix ./nextcloud.nix ./mail-server.nix + ./webmail.nix ./gotosocial.nix ./akkoma.nix ]; diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index d0cbd10..4c2bd2b 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -6,6 +6,7 @@ pkgs, ... }: { + #The thing you want for multiple domains is SNI, I don't know how to set that up imports = [ (builtins.fetchTarball { # Pick a release version you are interested in and set its hash, e.g. @@ -60,6 +61,29 @@ }; }; + mailboxes = { + Inbox = { + auto = "subscribe"; + specialUse = "Inbox"; + }; + Drafts = { + auto = "subscribe"; + specialUse = "Drafts"; + }; + Junk = { + auto = "subscribe"; + specialUse = "Junk"; + }; + Sent = { + auto = "subscribe"; + specialUse = "Sent"; + }; + Trash = { + auto = "no"; + specialUse = "Trash"; + }; + }; + rejectRecipients = [ "no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu" diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix new file mode 100644 index 0000000..4369b22 --- /dev/null +++ b/nixos/queen/webmail.nix @@ -0,0 +1,25 @@ +{ + config, + pkgs, + lib, + ... +}: +with lib; { + services.roundcube = { + enable = true; + # this is the url of the vhost, not necessarily the same as the fqdn of + # the mailserver + hostName = "mail.lillianviolet.dev"; + extraConfig = '' + # starttls needed for authentication, so the fqdn required to match + # the certificate + $config['smtp_server'] = "tls://${config.mailserver.fqdn}"; + $config['smtp_user'] = "%u"; + $config['smtp_pass'] = "%p"; + ''; + }; + + services.nginx.enable = true; + + networking.firewall.allowedTCPPorts = [80 443]; +} From 73c492165af752dc12558aaab58dd22849132e88 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 17:22:23 +0100 Subject: [PATCH 0567/2308] That don't work --- nixos/queen/mail-server.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 4c2bd2b..7a63eda 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -62,9 +62,13 @@ }; mailboxes = { - Inbox = { + All = { auto = "subscribe"; - specialUse = "Inbox"; + specialUse = "All"; + }; + Archive = { + auto = "subscribe"; + specialUse = "Archive"; }; Drafts = { auto = "subscribe"; From 5f77acf652096757a22ba7a20848c610b5870e56 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 17:22:23 +0100 Subject: [PATCH 0568/2308] That don't work --- nixos/queen/mail-server.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 4c2bd2b..7a63eda 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -62,9 +62,13 @@ }; mailboxes = { - Inbox = { + All = { auto = "subscribe"; - specialUse = "Inbox"; + specialUse = "All"; + }; + Archive = { + auto = "subscribe"; + specialUse = "Archive"; }; Drafts = { auto = "subscribe"; From cc88f919b0ea62ebf6dab570664dcb0dda2a5a14 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 20:59:39 +0100 Subject: [PATCH 0569/2308] Update version to 23.11 and flake lock --- flake.lock | 36 +++++++++++++++++----------------- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 7fe53eb..9740215 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1702203126, - "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", + "lastModified": 1702814335, + "narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", + "rev": "e4dba0bd01956170667458be7b45f68170a63651", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702148972, - "narHash": "sha256-h2jODFP6n+ABrUWcGRSVPRFfLOkM9TJ2pO+h+9JcaL0=", + "lastModified": 1702777222, + "narHash": "sha256-/SYmqgxTYzqZnQEfbOCHCN4GzqB9uAIsR9IWLzo0/8I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8f33c044e51de6dde3ad80a9676945e0e4e3227", + "rev": "a19a71d1ee93226fd71984359552affbc1cd3dc3", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702029940, - "narHash": "sha256-qM3Du0perpLesh5hr87mVPZ79McMUKIWUH7EQMh2kWo=", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ef8a102c555da4f8f417fe5cf5bd539d8a38b7", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702177193, - "narHash": "sha256-J2409SyXROoUHYXVy9h4Pj0VU8ReLuy/mzBc9iK4DBg=", + "lastModified": 1702812162, + "narHash": "sha256-18cKptpAAfkatdQgjO5SZXZsbc1IVPRoYx2AxaiooL4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d806e546f96c88cd9f7d91c1c19ebc99ba6277d9", + "rev": "21f2b8f123a1601fef3cf6bbbdf5171257290a77", "type": "github" }, "original": { diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 14cdb9d..3eed06c 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 085a594..0e65be6 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -180,5 +180,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } From 75f9869747bb7ac66f1663ab1d788a2a49742d0f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 20:59:39 +0100 Subject: [PATCH 0570/2308] Update version to 23.11 and flake lock --- flake.lock | 36 +++++++++++++++++----------------- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 7fe53eb..9740215 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1702203126, - "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", + "lastModified": 1702814335, + "narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", + "rev": "e4dba0bd01956170667458be7b45f68170a63651", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702148972, - "narHash": "sha256-h2jODFP6n+ABrUWcGRSVPRFfLOkM9TJ2pO+h+9JcaL0=", + "lastModified": 1702777222, + "narHash": "sha256-/SYmqgxTYzqZnQEfbOCHCN4GzqB9uAIsR9IWLzo0/8I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8f33c044e51de6dde3ad80a9676945e0e4e3227", + "rev": "a19a71d1ee93226fd71984359552affbc1cd3dc3", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702029940, - "narHash": "sha256-qM3Du0perpLesh5hr87mVPZ79McMUKIWUH7EQMh2kWo=", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ef8a102c555da4f8f417fe5cf5bd539d8a38b7", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702177193, - "narHash": "sha256-J2409SyXROoUHYXVy9h4Pj0VU8ReLuy/mzBc9iK4DBg=", + "lastModified": 1702812162, + "narHash": "sha256-18cKptpAAfkatdQgjO5SZXZsbc1IVPRoYx2AxaiooL4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d806e546f96c88cd9f7d91c1c19ebc99ba6277d9", + "rev": "21f2b8f123a1601fef3cf6bbbdf5171257290a77", "type": "github" }, "original": { diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 14cdb9d..3eed06c 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 085a594..0e65be6 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -180,5 +180,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } From 1532eb1e19d19dea2509b3682caaa4ecf2ffd968 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 21:07:30 +0100 Subject: [PATCH 0571/2308] Nextcloud won't work that way... --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 3eed06c..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 0e65be6..085a594 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -180,5 +180,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.11"; + system.stateVersion = "23.05"; } From a24f0511fcb58882d34b28d573d69ef2b70cd145 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 21:07:30 +0100 Subject: [PATCH 0572/2308] Nextcloud won't work that way... --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 3eed06c..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 0e65be6..085a594 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -180,5 +180,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.11"; + system.stateVersion = "23.05"; } From 287cfe7aee828013d7799997579457b24c5d54d7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 21:09:51 +0100 Subject: [PATCH 0573/2308] Disable akkoma --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 085a594..1fcf01f 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -21,7 +21,7 @@ ./mail-server.nix ./webmail.nix ./gotosocial.nix - ./akkoma.nix + #./akkoma.nix ]; boot.tmp.cleanOnBoot = true; From d0443b0d03f9288def1c2974cdcb3eaf72b9af50 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 21:09:51 +0100 Subject: [PATCH 0574/2308] Disable akkoma --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 085a594..1fcf01f 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -21,7 +21,7 @@ ./mail-server.nix ./webmail.nix ./gotosocial.nix - ./akkoma.nix + #./akkoma.nix ]; boot.tmp.cleanOnBoot = true; From 6d8163c538bbc306baeaebee2e058085334fa016 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 21:25:08 +0100 Subject: [PATCH 0575/2308] Let's try this ownership setting? --- nixos/queen/postgres.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 37d3cfd..d13f253 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -16,19 +16,19 @@ ensureUsers = [ { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } { name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } { name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } { name = "gotosocial"; - ensurePermissions."DATABASE gotosocial" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; }; From 1b52c0bf65b246552fb72dc66a9c5d2b022645b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 21:25:08 +0100 Subject: [PATCH 0576/2308] Let's try this ownership setting? --- nixos/queen/postgres.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 37d3cfd..d13f253 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -16,19 +16,19 @@ ensureUsers = [ { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } { name = "onlyoffice"; - ensurePermissions."DATABASE onlyoffice" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } { name = "akkoma"; - ensurePermissions."DATABASE akkoma" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } { name = "gotosocial"; - ensurePermissions."DATABASE gotosocial" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; }; From bfd1101936a903a5b8f04efdc54d17601b129b24 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 21:28:54 +0100 Subject: [PATCH 0577/2308] =?UTF-8?q?Now=20we=20can=20update=20to=2023.11?= =?UTF-8?q?=20=F0=9F=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 14cdb9d..3eed06c 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 1fcf01f..f4c1fc5 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -180,5 +180,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } From 38eafe7f9e08af7ad520d55b17f579700ab93df5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 21:28:54 +0100 Subject: [PATCH 0578/2308] =?UTF-8?q?Now=20we=20can=20update=20to=2023.11?= =?UTF-8?q?=20=F0=9F=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 14cdb9d..3eed06c 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 1fcf01f..f4c1fc5 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -180,5 +180,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } From 2ac6673b4597abab6386113ba1ccdee9761b8326 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 21:32:31 +0100 Subject: [PATCH 0579/2308] Let's see if the apps are the issue... --- nixos/queen/nextcloud.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 14b3ae2..0a32491 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -13,10 +13,6 @@ users.users = { nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; aria2.extraGroups = ["nextcloud"]; - mssql = { - isSystemUser = true; - group = "mssql"; - }; }; # Enable Nginx @@ -68,12 +64,12 @@ phpOptions."opcache.interned_strings_buffer" = "23"; appstoreEnable = true; - extraAppsEnable = true; - extraApps = with config.services.nextcloud.package.packages.apps; { - # List of apps we want to install and are already packaged in - # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; - }; + #extraAppsEnable = true; + #extraApps = with config.services.nextcloud.package.packages.apps; { + # List of apps we want to install and are already packaged in + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json + # inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + #}; config = { # Further forces Nextcloud to use HTTPS From a6919d33c08543c2fed9b1921dcdbe10c93c5db7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 21:32:31 +0100 Subject: [PATCH 0580/2308] Let's see if the apps are the issue... --- nixos/queen/nextcloud.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 14b3ae2..0a32491 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -13,10 +13,6 @@ users.users = { nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; aria2.extraGroups = ["nextcloud"]; - mssql = { - isSystemUser = true; - group = "mssql"; - }; }; # Enable Nginx @@ -68,12 +64,12 @@ phpOptions."opcache.interned_strings_buffer" = "23"; appstoreEnable = true; - extraAppsEnable = true; - extraApps = with config.services.nextcloud.package.packages.apps; { - # List of apps we want to install and are already packaged in - # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; - }; + #extraAppsEnable = true; + #extraApps = with config.services.nextcloud.package.packages.apps; { + # List of apps we want to install and are already packaged in + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json + # inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + #}; config = { # Further forces Nextcloud to use HTTPS From 6997dd14b8a02e73a680ba9f68012a2340e88c99 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 22:00:06 +0100 Subject: [PATCH 0581/2308] Never mind, back to 23.05, no idea ab this psql --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 3eed06c..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index f4c1fc5..1fcf01f 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -180,5 +180,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.11"; + system.stateVersion = "23.05"; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 0a32491..5768161 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -64,12 +64,12 @@ phpOptions."opcache.interned_strings_buffer" = "23"; appstoreEnable = true; - #extraAppsEnable = true; - #extraApps = with config.services.nextcloud.package.packages.apps; { - # List of apps we want to install and are already packaged in - # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - # inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; - #}; + extraAppsEnable = true; + extraApps = with config.services.nextcloud.package.packages.apps; { + # List of apps we want to install and are already packaged in + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json + inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + }; config = { # Further forces Nextcloud to use HTTPS From a0a2d0c87a6ab2c64221c006d0640ddb584aa824 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 22:00:06 +0100 Subject: [PATCH 0582/2308] Never mind, back to 23.05, no idea ab this psql --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- nixos/queen/nextcloud.nix | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 3eed06c..14cdb9d 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index f4c1fc5..1fcf01f 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -180,5 +180,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.11"; + system.stateVersion = "23.05"; } diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 0a32491..5768161 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -64,12 +64,12 @@ phpOptions."opcache.interned_strings_buffer" = "23"; appstoreEnable = true; - #extraAppsEnable = true; - #extraApps = with config.services.nextcloud.package.packages.apps; { - # List of apps we want to install and are already packaged in - # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - # inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; - #}; + extraAppsEnable = true; + extraApps = with config.services.nextcloud.package.packages.apps; { + # List of apps we want to install and are already packaged in + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json + inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + }; config = { # Further forces Nextcloud to use HTTPS From 245ea2522dffd149ad3b9411b26d5b88da03c9c3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 22:27:04 +0100 Subject: [PATCH 0583/2308] Install roundcube --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 1fcf01f..c03005b 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -106,6 +106,7 @@ python3 rsync rabbitmq-server + roundcube youtube-dl wget zsh From a8ea219f2e0c7ce96240e0cf648e6937f8de43cb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 22:27:04 +0100 Subject: [PATCH 0584/2308] Install roundcube --- nixos/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 1fcf01f..c03005b 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -106,6 +106,7 @@ python3 rsync rabbitmq-server + roundcube youtube-dl wget zsh From aba33a97b02ecffea264a55d6a533540c153147a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 22:29:36 +0100 Subject: [PATCH 0585/2308] Maybe remove with lib --- nixos/queen/webmail.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index 4369b22..4acca69 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -with lib; { +}: { services.roundcube = { enable = true; # this is the url of the vhost, not necessarily the same as the fqdn of @@ -18,8 +17,4 @@ with lib; { $config['smtp_pass'] = "%p"; ''; }; - - services.nginx.enable = true; - - networking.firewall.allowedTCPPorts = [80 443]; } From 1d7ec761a3460b762195d7bcde2650ca75ad2edb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Dec 2023 22:29:36 +0100 Subject: [PATCH 0586/2308] Maybe remove with lib --- nixos/queen/webmail.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index 4369b22..4acca69 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -with lib; { +}: { services.roundcube = { enable = true; # this is the url of the vhost, not necessarily the same as the fqdn of @@ -18,8 +17,4 @@ with lib; { $config['smtp_pass'] = "%p"; ''; }; - - services.nginx.enable = true; - - networking.firewall.allowedTCPPorts = [80 443]; } From a4f857a92f0ba2c5351806b3cf4e00e1b8bb7844 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 21:38:17 +0100 Subject: [PATCH 0587/2308] made psql version explicit + migration instruction --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c03005b..5f5f457 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -102,7 +102,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql + postgresql_14 python3 rsync rabbitmq-server diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index d13f253..ab8a9e3 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -4,6 +4,9 @@ ... }: { services.postgresql = { + #TODO: update to postgres 15 before migrating to 23.11 + # https://nixos.org/manual/nixos/stable/#module-postgresql + package = pkgs.postgresql_14; enable = true; # Ensure the database, user, and permissions always exist From b672ea47611328ff4f16c92b2ad0a4b92d076f8b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 21:38:17 +0100 Subject: [PATCH 0588/2308] made psql version explicit + migration instruction --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c03005b..5f5f457 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -102,7 +102,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql + postgresql_14 python3 rsync rabbitmq-server diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index d13f253..ab8a9e3 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -4,6 +4,9 @@ ... }: { services.postgresql = { + #TODO: update to postgres 15 before migrating to 23.11 + # https://nixos.org/manual/nixos/stable/#module-postgresql + package = pkgs.postgresql_14; enable = true; # Ensure the database, user, and permissions always exist From 2286d0136fdd03d530c2dd7e709420e2d27b3b29 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 21:39:33 +0100 Subject: [PATCH 0589/2308] close port 1433 --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 5f5f457..905cb17 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -117,7 +117,7 @@ networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [22 80 443 1433]; + networking.firewall.allowedTCPPorts = [22 80 443]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From aabd1e5e54abc526c2b4d63e5eeb2f4f6a6164da Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 21:39:33 +0100 Subject: [PATCH 0590/2308] close port 1433 --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 5f5f457..905cb17 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -117,7 +117,7 @@ networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [22 80 443 1433]; + networking.firewall.allowedTCPPorts = [22 80 443]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 3981101495b5dbe25029c496326efd5b3d30fdc0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 22:00:31 +0100 Subject: [PATCH 0591/2308] Let's try and update and see if this works --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 14cdb9d..3eed06c 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 905cb17..84f0f16 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -181,5 +181,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } From 8217f40bac55fdf1f32f3c8bc5694d1b622fac42 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 22:00:31 +0100 Subject: [PATCH 0592/2308] Let's try and update and see if this works --- home-manager/queen-Lillian.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/queen-Lillian.nix b/home-manager/queen-Lillian.nix index 14cdb9d..3eed06c 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 905cb17..84f0f16 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -181,5 +181,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } From 2e39d1ed9bc1fdbc42c9686cd0f7487c74e0eac5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 22:17:37 +0100 Subject: [PATCH 0593/2308] Systemd boot limit > grub boot limit (queen) --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 84f0f16..a7fbf43 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -177,7 +177,7 @@ networking.hostName = "queen"; boot.loader.grub.enable = true; - boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.grub.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index ab8a9e3..de29ee1 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -9,7 +9,7 @@ package = pkgs.postgresql_14; enable = true; - # Ensure the database, user, and permissions always exist + # Ensure the database, user, and ownership is set ensureDatabases = [ "nextcloud" "onlyoffice" From b91e1ba6b547add4e18d54870dc1280fca14fb08 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 22:17:37 +0100 Subject: [PATCH 0594/2308] Systemd boot limit > grub boot limit (queen) --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 84f0f16..a7fbf43 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -177,7 +177,7 @@ networking.hostName = "queen"; boot.loader.grub.enable = true; - boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.grub.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index ab8a9e3..de29ee1 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -9,7 +9,7 @@ package = pkgs.postgresql_14; enable = true; - # Ensure the database, user, and permissions always exist + # Ensure the database, user, and ownership is set ensureDatabases = [ "nextcloud" "onlyoffice" From b7161f4ffd8cfa5b15be525f565bbc4f53e8241a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 22:19:06 +0100 Subject: [PATCH 0595/2308] Remove mssql user group --- nixos/queen/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index a7fbf43..8c49387 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -150,8 +150,6 @@ defaults.email = "letsencrypt@gladtherescake.eu"; }; - users.groups.mssql = {}; - users.groups.virtualMail = {}; users.users = { From becb396c68f4a41bbb8a4a209dfa54c942d62f3e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 22:19:06 +0100 Subject: [PATCH 0596/2308] Remove mssql user group --- nixos/queen/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index a7fbf43..8c49387 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -150,8 +150,6 @@ defaults.email = "letsencrypt@gladtherescake.eu"; }; - users.groups.mssql = {}; - users.groups.virtualMail = {}; users.users = { From c84fd01a9c52a53c163dd24ae8eb7a0a29653d1b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 23:12:45 +0100 Subject: [PATCH 0597/2308] Comment was incorrect ;) --- nixos/queen/postgres.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index de29ee1..7046863 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -4,7 +4,7 @@ ... }: { services.postgresql = { - #TODO: update to postgres 15 before migrating to 23.11 + #TODO: update to postgres 15 # https://nixos.org/manual/nixos/stable/#module-postgresql package = pkgs.postgresql_14; enable = true; From ed307818b8c4e5d7127509bc6d62e01ba655315e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Dec 2023 23:12:45 +0100 Subject: [PATCH 0598/2308] Comment was incorrect ;) --- nixos/queen/postgres.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index de29ee1..7046863 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -4,7 +4,7 @@ ... }: { services.postgresql = { - #TODO: update to postgres 15 before migrating to 23.11 + #TODO: update to postgres 15 # https://nixos.org/manual/nixos/stable/#module-postgresql package = pkgs.postgresql_14; enable = true; From 19e63eea54b6541764c401369e70136b5194d654 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Dec 2023 10:42:48 +0100 Subject: [PATCH 0599/2308] Add direnv --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index a048e25..86a6be5 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -56,6 +56,7 @@ home.packages = with pkgs; [ # Coding: + direnv git kate From a44c2a6b28533a94e8c27375cb4e2406a29f5e1a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Dec 2023 10:42:48 +0100 Subject: [PATCH 0600/2308] Add direnv --- home-manager/desktop-shared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index a048e25..86a6be5 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -56,6 +56,7 @@ home.packages = with pkgs; [ # Coding: + direnv git kate From ce29616895bcd8f0998386642e92585171d6c3bc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Dec 2023 11:17:48 +0100 Subject: [PATCH 0601/2308] Maybe this user is breaking things? --- nixos/queen/mail-server.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 7a63eda..57f643b 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -20,13 +20,13 @@ sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; - users.users = { - virtualMail = { - isSystemUser = true; - isNormalUser = false; - group = "virtualMail"; - }; - }; + # users.users = { + # virtualMail = { + # isSystemUser = true; + # isNormalUser = false; + # group = "virtualMail"; + # }; + # }; mailserver = { enable = true; From 1533f83d40bfc1d80490c64f9abdc4124c2ee268 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Dec 2023 11:17:48 +0100 Subject: [PATCH 0602/2308] Maybe this user is breaking things? --- nixos/queen/mail-server.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 7a63eda..57f643b 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -20,13 +20,13 @@ sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; - users.users = { - virtualMail = { - isSystemUser = true; - isNormalUser = false; - group = "virtualMail"; - }; - }; + # users.users = { + # virtualMail = { + # isSystemUser = true; + # isNormalUser = false; + # group = "virtualMail"; + # }; + # }; mailserver = { enable = true; From 1b2b7dc2a15aa5d804916acb72036068db177de9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Dec 2023 11:19:29 +0100 Subject: [PATCH 0603/2308] Group too? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 8c49387..ff5a6f4 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -150,7 +150,7 @@ defaults.email = "letsencrypt@gladtherescake.eu"; }; - users.groups.virtualMail = {}; + # users.groups.virtualMail = {}; users.users = { lillian = { From f5b2e41e8b0dc5fab404924e49905f7f6f98a560 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Dec 2023 11:19:29 +0100 Subject: [PATCH 0604/2308] Group too? --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 8c49387..ff5a6f4 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -150,7 +150,7 @@ defaults.email = "letsencrypt@gladtherescake.eu"; }; - users.groups.virtualMail = {}; + # users.groups.virtualMail = {}; users.users = { lillian = { From 0db4d00c8ced109973194d19f8dcd809b0fc71c9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 09:54:34 +0100 Subject: [PATCH 0605/2308] update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 9740215..d8feb82 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1702814335, - "narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=", + "lastModified": 1703026685, + "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4dba0bd01956170667458be7b45f68170a63651", + "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702812162, - "narHash": "sha256-18cKptpAAfkatdQgjO5SZXZsbc1IVPRoYx2AxaiooL4=", + "lastModified": 1702937567, + "narHash": "sha256-bUNl3GPqRgTGp13+oV1DrYa1/NHuGHo5SKmr+RqC/2g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "21f2b8f123a1601fef3cf6bbbdf5171257290a77", + "rev": "f7db64b88dabc95e4f7bee20455f418e7ab805d4", "type": "github" }, "original": { From 65c81f42c7585a0c961e09070c50d16917112475 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 09:54:34 +0100 Subject: [PATCH 0606/2308] update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 9740215..d8feb82 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1702814335, - "narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=", + "lastModified": 1703026685, + "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4dba0bd01956170667458be7b45f68170a63651", + "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702812162, - "narHash": "sha256-18cKptpAAfkatdQgjO5SZXZsbc1IVPRoYx2AxaiooL4=", + "lastModified": 1702937567, + "narHash": "sha256-bUNl3GPqRgTGp13+oV1DrYa1/NHuGHo5SKmr+RqC/2g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "21f2b8f123a1601fef3cf6bbbdf5171257290a77", + "rev": "f7db64b88dabc95e4f7bee20455f418e7ab805d4", "type": "github" }, "original": { From 8988c584150d5008f7de0a9326cad2c3d08d95bd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:04:24 +0100 Subject: [PATCH 0607/2308] Upgrade nextcloud 27 > 28 --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ff5a6f4..4444710 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -95,7 +95,7 @@ aria2 git-filter-repo home-manager - nextcloud27 + nextcloud28 nginx noto-fonts noto-fonts-emoji-blob-bin From c59ed620649fbe30c6a7fce3d186c8fe2e5396e8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:04:24 +0100 Subject: [PATCH 0608/2308] Upgrade nextcloud 27 > 28 --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ff5a6f4..4444710 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -95,7 +95,7 @@ aria2 git-filter-repo home-manager - nextcloud27 + nextcloud28 nginx noto-fonts noto-fonts-emoji-blob-bin From 3485993263943945105c7d7d04070f1498b4d331 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:05:54 +0100 Subject: [PATCH 0609/2308] Oops should add that there --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5768161..6b0e559 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -48,7 +48,7 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; - package = pkgs.nextcloud27; + package = pkgs.nextcloud28; # Use HTTPS for links https = true; From 7b169b88d8a3cf6561fd55f451abcfca05d11ba9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:05:54 +0100 Subject: [PATCH 0610/2308] Oops should add that there --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5768161..6b0e559 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -48,7 +48,7 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; - package = pkgs.nextcloud27; + package = pkgs.nextcloud28; # Use HTTPS for links https = true; From 0743acc51d029e03892ce46139cd25e77229b7a0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:07:32 +0100 Subject: [PATCH 0611/2308] Music is gone --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6b0e559..3fea0f6 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -68,7 +68,7 @@ extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + inherit calendar contacts deck forms news notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; config = { From 29c49bf4d50cea240cb74a0b295844bf053d138b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:07:32 +0100 Subject: [PATCH 0612/2308] Music is gone --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6b0e559..3fea0f6 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -68,7 +68,7 @@ extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + inherit calendar contacts deck forms news notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; config = { From 55f4b4c12600e43195d17b9ee09c941523d65950 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:08:27 +0100 Subject: [PATCH 0613/2308] Let's just forget this for now eh --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 3fea0f6..71d61da 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -68,7 +68,7 @@ extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + #inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; config = { From cfd1888035c67d6ab975b850be701b461faac307 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 10:08:27 +0100 Subject: [PATCH 0614/2308] Let's just forget this for now eh --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 3fea0f6..71d61da 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -68,7 +68,7 @@ extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + #inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; config = { From 964ff3f5974fea35206a84b3d14265a6b0c3f5e7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 19:26:20 +0100 Subject: [PATCH 0615/2308] Let's try the alpha version of news --- nixos/queen/nextcloud.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5768161..d4598ce 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -66,9 +66,15 @@ appstoreEnable = true; extraAppsEnable = true; extraApps = with config.services.nextcloud.package.packages.apps; { + news = pkgs.fetchNextcloudApp { + name = "news"; + sha256 = "52179795dba6a4eea0354deb66c14af10adc1ba2e7c6e3ee08de0eebcb773f6c"; + url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha2/news.tar.gz"; + version = "25.0.0-alpha2"; + }; # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + inherit calendar contacts deck forms music notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; config = { From 30441ec92885ebd0d0f747f5db629aed24835236 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 19:26:20 +0100 Subject: [PATCH 0616/2308] Let's try the alpha version of news --- nixos/queen/nextcloud.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 5768161..d4598ce 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -66,9 +66,15 @@ appstoreEnable = true; extraAppsEnable = true; extraApps = with config.services.nextcloud.package.packages.apps; { + news = pkgs.fetchNextcloudApp { + name = "news"; + sha256 = "52179795dba6a4eea0354deb66c14af10adc1ba2e7c6e3ee08de0eebcb773f6c"; + url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha2/news.tar.gz"; + version = "25.0.0-alpha2"; + }; # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; + inherit calendar contacts deck forms music notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; config = { From c278c37584d21821f90359cb1d1b93dfa11e57bb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 19:28:00 +0100 Subject: [PATCH 0617/2308] Let's remove that --- nixos/queen/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6333383..7f9f7bc 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -75,7 +75,6 @@ # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json #inherit calendar contacts deck forms notes onlyoffice polls twofactor_nextcloud_notification unsplash; - #inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; config = { From 2b85b13eb73ab1d20ad0b9eeb87a30fe90b63cad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 19:28:00 +0100 Subject: [PATCH 0618/2308] Let's remove that --- nixos/queen/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6333383..7f9f7bc 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -75,7 +75,6 @@ # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json #inherit calendar contacts deck forms notes onlyoffice polls twofactor_nextcloud_notification unsplash; - #inherit calendar contacts deck forms music news notes onlyoffice polls twofactor_nextcloud_notification unsplash; }; config = { From f330f3177a8ff6e936a46c15b36919952fce2822 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 19:32:46 +0100 Subject: [PATCH 0619/2308] Let's try it this way --- nixos/queen/nextcloud.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 7f9f7bc..01eb6c3 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -65,7 +65,8 @@ appstoreEnable = true; extraAppsEnable = true; - extraApps = with config.services.nextcloud.package.packages.apps; { + #extraApps = with config.services.nextcloud.package.packages.apps; { + extraApps = { news = pkgs.fetchNextcloudApp { name = "news"; sha256 = "52179795dba6a4eea0354deb66c14af10adc1ba2e7c6e3ee08de0eebcb773f6c"; From cfde50aa228164d1a3eace9cc8bec04d7dba4fdf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 19:32:46 +0100 Subject: [PATCH 0620/2308] Let's try it this way --- nixos/queen/nextcloud.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 7f9f7bc..01eb6c3 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -65,7 +65,8 @@ appstoreEnable = true; extraAppsEnable = true; - extraApps = with config.services.nextcloud.package.packages.apps; { + #extraApps = with config.services.nextcloud.package.packages.apps; { + extraApps = { news = pkgs.fetchNextcloudApp { name = "news"; sha256 = "52179795dba6a4eea0354deb66c14af10adc1ba2e7c6e3ee08de0eebcb773f6c"; From 75334835c2762fa572dc2e3f1460663c0183feab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 19:33:46 +0100 Subject: [PATCH 0621/2308] Version? --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 01eb6c3..1b7d34d 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -71,7 +71,7 @@ name = "news"; sha256 = "52179795dba6a4eea0354deb66c14af10adc1ba2e7c6e3ee08de0eebcb773f6c"; url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha2/news.tar.gz"; - version = "25.0.0-alpha2"; + version = "25.0.0"; }; # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json From 7054e0c8291df5765080bd747e4749dcbbb7aa7b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 19:33:46 +0100 Subject: [PATCH 0622/2308] Version? --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 01eb6c3..1b7d34d 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -71,7 +71,7 @@ name = "news"; sha256 = "52179795dba6a4eea0354deb66c14af10adc1ba2e7c6e3ee08de0eebcb773f6c"; url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha2/news.tar.gz"; - version = "25.0.0-alpha2"; + version = "25.0.0"; }; # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json From 6cf9543567fb79ebe92967d4952e6ba97c2788c5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 19:35:22 +0100 Subject: [PATCH 0623/2308] Maybe the hash is failing --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 1b7d34d..6887eb9 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -69,7 +69,7 @@ extraApps = { news = pkgs.fetchNextcloudApp { name = "news"; - sha256 = "52179795dba6a4eea0354deb66c14af10adc1ba2e7c6e3ee08de0eebcb773f6c"; + sha256 = "0000000000000000000000000000000000000000000000"; url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha2/news.tar.gz"; version = "25.0.0"; }; From 79768bcb752782ba040c1641d22ee061fb312d9f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Dec 2023 19:35:22 +0100 Subject: [PATCH 0624/2308] Maybe the hash is failing --- nixos/queen/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 1b7d34d..6887eb9 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -69,7 +69,7 @@ extraApps = { news = pkgs.fetchNextcloudApp { name = "news"; - sha256 = "52179795dba6a4eea0354deb66c14af10adc1ba2e7c6e3ee08de0eebcb773f6c"; + sha256 = "0000000000000000000000000000000000000000000000"; url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha2/news.tar.gz"; version = "25.0.0"; }; From 8157364ef3d04a2e9fb34e8d149787dac9dad176 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 12:29:21 +0100 Subject: [PATCH 0625/2308] update flake lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d8feb82..800c727 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1703026685, - "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=", + "lastModified": 1703155327, + "narHash": "sha256-Q25AEghhhOp+ImNN4PsAExi7DIB1INMlBSaggGz7q4w=", "owner": "nix-community", "repo": "home-manager", - "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e", + "rev": "8b797c8eea1eba7dfb47f6964103e6e0d134255f", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { From 370fe71069dd13392e836ab4b025c21a00cb3f38 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 12:29:21 +0100 Subject: [PATCH 0626/2308] update flake lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d8feb82..800c727 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1703026685, - "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=", + "lastModified": 1703155327, + "narHash": "sha256-Q25AEghhhOp+ImNN4PsAExi7DIB1INMlBSaggGz7q4w=", "owner": "nix-community", "repo": "home-manager", - "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e", + "rev": "8b797c8eea1eba7dfb47f6964103e6e0d134255f", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { From ac52cbc842dd2228bc364b1b8a20456e0711a702 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 19:22:00 +0100 Subject: [PATCH 0627/2308] Remove that stuff --- nixos/queen/nextcloud.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6887eb9..4aee6d2 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -66,17 +66,10 @@ appstoreEnable = true; extraAppsEnable = true; #extraApps = with config.services.nextcloud.package.packages.apps; { - extraApps = { - news = pkgs.fetchNextcloudApp { - name = "news"; - sha256 = "0000000000000000000000000000000000000000000000"; - url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha2/news.tar.gz"; - version = "25.0.0"; - }; - # List of apps we want to install and are already packaged in - # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - #inherit calendar contacts deck forms notes onlyoffice polls twofactor_nextcloud_notification unsplash; - }; + # List of apps we want to install and are already packaged in + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json + # inherit calendar contacts deck forms notes onlyoffice polls twofactor_nextcloud_notification unsplash; + #}; config = { # Further forces Nextcloud to use HTTPS From 586b242187b89a11b1d9c5125b99ca41bff00f29 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 19:22:00 +0100 Subject: [PATCH 0628/2308] Remove that stuff --- nixos/queen/nextcloud.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix index 6887eb9..4aee6d2 100644 --- a/nixos/queen/nextcloud.nix +++ b/nixos/queen/nextcloud.nix @@ -66,17 +66,10 @@ appstoreEnable = true; extraAppsEnable = true; #extraApps = with config.services.nextcloud.package.packages.apps; { - extraApps = { - news = pkgs.fetchNextcloudApp { - name = "news"; - sha256 = "0000000000000000000000000000000000000000000000"; - url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha2/news.tar.gz"; - version = "25.0.0"; - }; - # List of apps we want to install and are already packaged in - # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json - #inherit calendar contacts deck forms notes onlyoffice polls twofactor_nextcloud_notification unsplash; - }; + # List of apps we want to install and are already packaged in + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json + # inherit calendar contacts deck forms notes onlyoffice polls twofactor_nextcloud_notification unsplash; + #}; config = { # Further forces Nextcloud to use HTTPS From b3bed1353fbc38a8e9ea4d211ba20d86298f3b96 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:38:49 +0100 Subject: [PATCH 0629/2308] Add upgrade path for postgresql --- nixos/queen/configuration.nix | 1 + nixos/upgrade/postgresql.nix | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 nixos/upgrade/postgresql.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 4444710..c2a81bf 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -21,6 +21,7 @@ ./mail-server.nix ./webmail.nix ./gotosocial.nix + ../upgrade/postgresql.nix #./akkoma.nix ]; diff --git a/nixos/upgrade/postgresql.nix b/nixos/upgrade/postgresql.nix new file mode 100644 index 0000000..d683f3f --- /dev/null +++ b/nixos/upgrade/postgresql.nix @@ -0,0 +1,36 @@ +{ + config, + pkgs, + ... +}: { + environment.systemPackages = [ + (let + # XXX specify the postgresql package you'd like to upgrade to. + # Do not forget to list the extensions you need. + newPostgres = pkgs.postgresql_15.withPackages (pp: [ + # pp.plv8 + ]); + in + pkgs.writeScriptBin "upgrade-pg-cluster" '' + set -eux + # XXX it's perhaps advisable to stop all services that depend on postgresql + systemctl stop postgresql + + export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}" + + export NEWBIN="${newPostgres}/bin" + + export OLDDATA="${config.services.postgresql.dataDir}" + export OLDBIN="${config.services.postgresql.package}/bin" + + install -d -m 0700 -o postgres -g postgres "$NEWDATA" + cd "$NEWDATA" + sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" + + sudo -u postgres $NEWBIN/pg_upgrade \ + --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ + --old-bindir $OLDBIN --new-bindir $NEWBIN \ + "$@" + '') + ]; +} From 8671964043ad06b214015764cb553a826e79fc98 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:38:49 +0100 Subject: [PATCH 0630/2308] Add upgrade path for postgresql --- nixos/queen/configuration.nix | 1 + nixos/upgrade/postgresql.nix | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 nixos/upgrade/postgresql.nix diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 4444710..c2a81bf 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -21,6 +21,7 @@ ./mail-server.nix ./webmail.nix ./gotosocial.nix + ../upgrade/postgresql.nix #./akkoma.nix ]; diff --git a/nixos/upgrade/postgresql.nix b/nixos/upgrade/postgresql.nix new file mode 100644 index 0000000..d683f3f --- /dev/null +++ b/nixos/upgrade/postgresql.nix @@ -0,0 +1,36 @@ +{ + config, + pkgs, + ... +}: { + environment.systemPackages = [ + (let + # XXX specify the postgresql package you'd like to upgrade to. + # Do not forget to list the extensions you need. + newPostgres = pkgs.postgresql_15.withPackages (pp: [ + # pp.plv8 + ]); + in + pkgs.writeScriptBin "upgrade-pg-cluster" '' + set -eux + # XXX it's perhaps advisable to stop all services that depend on postgresql + systemctl stop postgresql + + export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}" + + export NEWBIN="${newPostgres}/bin" + + export OLDDATA="${config.services.postgresql.dataDir}" + export OLDBIN="${config.services.postgresql.package}/bin" + + install -d -m 0700 -o postgres -g postgres "$NEWDATA" + cd "$NEWDATA" + sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" + + sudo -u postgres $NEWBIN/pg_upgrade \ + --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ + --old-bindir $OLDBIN --new-bindir $NEWBIN \ + "$@" + '') + ]; +} From 87e96e9fe928a590d0b787695eac32f23fd11187 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:44:33 +0100 Subject: [PATCH 0631/2308] Upgrade to psql 15 --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c2a81bf..b35dc90 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -103,7 +103,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_14 + postgresql_15 python3 rsync rabbitmq-server From 40c2aa90b2d0d3b720b8ba7e4e1650a54494bd36 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:44:33 +0100 Subject: [PATCH 0632/2308] Upgrade to psql 15 --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index c2a81bf..b35dc90 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -103,7 +103,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_14 + postgresql_15 python3 rsync rabbitmq-server From b15edc8e52fc21a57b3f47f03f4b5cad79ab6cef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:47:00 +0100 Subject: [PATCH 0633/2308] Actually update to 15... --- nixos/queen/postgres.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 7046863..f234937 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -4,9 +4,8 @@ ... }: { services.postgresql = { - #TODO: update to postgres 15 # https://nixos.org/manual/nixos/stable/#module-postgresql - package = pkgs.postgresql_14; + package = pkgs.postgresql_15; enable = true; # Ensure the database, user, and ownership is set From a0be89f0742b627a6fca5614ae315d0d64fb0dfe Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:47:00 +0100 Subject: [PATCH 0634/2308] Actually update to 15... --- nixos/queen/postgres.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 7046863..f234937 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -4,9 +4,8 @@ ... }: { services.postgresql = { - #TODO: update to postgres 15 # https://nixos.org/manual/nixos/stable/#module-postgresql - package = pkgs.postgresql_14; + package = pkgs.postgresql_15; enable = true; # Ensure the database, user, and ownership is set From a0b0a309f6477360c6a545b169200fad0e29732a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:47:49 +0100 Subject: [PATCH 0635/2308] Upgrade path to psql 16 --- nixos/upgrade/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/upgrade/postgresql.nix b/nixos/upgrade/postgresql.nix index d683f3f..081a123 100644 --- a/nixos/upgrade/postgresql.nix +++ b/nixos/upgrade/postgresql.nix @@ -7,7 +7,7 @@ (let # XXX specify the postgresql package you'd like to upgrade to. # Do not forget to list the extensions you need. - newPostgres = pkgs.postgresql_15.withPackages (pp: [ + newPostgres = pkgs.postgresql_16.withPackages (pp: [ # pp.plv8 ]); in From 6591567d0e46ed447875728a8da5b71a2ab46363 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:47:49 +0100 Subject: [PATCH 0636/2308] Upgrade path to psql 16 --- nixos/upgrade/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/upgrade/postgresql.nix b/nixos/upgrade/postgresql.nix index d683f3f..081a123 100644 --- a/nixos/upgrade/postgresql.nix +++ b/nixos/upgrade/postgresql.nix @@ -7,7 +7,7 @@ (let # XXX specify the postgresql package you'd like to upgrade to. # Do not forget to list the extensions you need. - newPostgres = pkgs.postgresql_15.withPackages (pp: [ + newPostgres = pkgs.postgresql_16.withPackages (pp: [ # pp.plv8 ]); in From 75bb370ddccae8628aa8884d0da1b1226d74f546 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:50:50 +0100 Subject: [PATCH 0637/2308] Upgrade path to psql 16 & unify pkgs vers --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index b35dc90..cde9925 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -103,7 +103,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_15 + postgresPackage python3 rsync rabbitmq-server diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index f234937..f85f7af 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -3,9 +3,11 @@ pkgs, ... }: { + #Define postgres here so this is the only place to update its version + postgresPackage = pkgs.postgresql_15; services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql - package = pkgs.postgresql_15; + package = postgresPackage; enable = true; # Ensure the database, user, and ownership is set From 03fea64d26597b108b519be87a44070266a4697e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:50:50 +0100 Subject: [PATCH 0638/2308] Upgrade path to psql 16 & unify pkgs vers --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index b35dc90..cde9925 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -103,7 +103,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_15 + postgresPackage python3 rsync rabbitmq-server diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index f234937..f85f7af 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -3,9 +3,11 @@ pkgs, ... }: { + #Define postgres here so this is the only place to update its version + postgresPackage = pkgs.postgresql_15; services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql - package = pkgs.postgresql_15; + package = postgresPackage; enable = true; # Ensure the database, user, and ownership is set From 031f06f5325ce4b23d6cf1bd0e03553477393b81 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:52:35 +0100 Subject: [PATCH 0639/2308] Let's try this --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index cde9925..6236358 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -103,7 +103,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresPackage + ${postgresPackage} python3 rsync rabbitmq-server diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index f85f7af..384909c 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -4,10 +4,12 @@ ... }: { #Define postgres here so this is the only place to update its version - postgresPackage = pkgs.postgresql_15; + postgresPackage = pkgs.postgresql_15.withPackages (pp: [ + # pp.plv8 + ]); services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql - package = postgresPackage; + package = ${postgresPackage}; enable = true; # Ensure the database, user, and ownership is set From c48d4e409a5a4b2aa21e0f57ba92acd6ef1303e4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:52:35 +0100 Subject: [PATCH 0640/2308] Let's try this --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index cde9925..6236358 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -103,7 +103,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresPackage + ${postgresPackage} python3 rsync rabbitmq-server diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index f85f7af..384909c 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -4,10 +4,12 @@ ... }: { #Define postgres here so this is the only place to update its version - postgresPackage = pkgs.postgresql_15; + postgresPackage = pkgs.postgresql_15.withPackages (pp: [ + # pp.plv8 + ]); services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql - package = postgresPackage; + package = ${postgresPackage}; enable = true; # Ensure the database, user, and ownership is set From 9c6c95423e30e904b2a1bf58d5efc8937357b350 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:53:49 +0100 Subject: [PATCH 0641/2308] This mayhaps --- nixos/queen/postgres.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 384909c..384fe46 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -4,12 +4,12 @@ ... }: { #Define postgres here so this is the only place to update its version - postgresPackage = pkgs.postgresql_15.withPackages (pp: [ + postgresPackage = postgresql_15.withPackages (pp: [ # pp.plv8 ]); services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql - package = ${postgresPackage}; + package = pkgs.${postgresPackage}; enable = true; # Ensure the database, user, and ownership is set From 8526e4520ceace04deb182437362665c92b80687 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:53:49 +0100 Subject: [PATCH 0642/2308] This mayhaps --- nixos/queen/postgres.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 384909c..384fe46 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -4,12 +4,12 @@ ... }: { #Define postgres here so this is the only place to update its version - postgresPackage = pkgs.postgresql_15.withPackages (pp: [ + postgresPackage = postgresql_15.withPackages (pp: [ # pp.plv8 ]); services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql - package = ${postgresPackage}; + package = pkgs.${postgresPackage}; enable = true; # Ensure the database, user, and ownership is set From 8e4a5d1e5f7040170b360fe6513819767ac30356 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:54:48 +0100 Subject: [PATCH 0643/2308] Never mind... --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6236358..b35dc90 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -103,7 +103,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - ${postgresPackage} + postgresql_15 python3 rsync rabbitmq-server diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 384fe46..f234937 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -3,13 +3,9 @@ pkgs, ... }: { - #Define postgres here so this is the only place to update its version - postgresPackage = postgresql_15.withPackages (pp: [ - # pp.plv8 - ]); services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql - package = pkgs.${postgresPackage}; + package = pkgs.postgresql_15; enable = true; # Ensure the database, user, and ownership is set From c4bfb1792826f91c72ece4bed5e0b0324700e015 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:54:48 +0100 Subject: [PATCH 0644/2308] Never mind... --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6236358..b35dc90 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -103,7 +103,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - ${postgresPackage} + postgresql_15 python3 rsync rabbitmq-server diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 384fe46..f234937 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -3,13 +3,9 @@ pkgs, ... }: { - #Define postgres here so this is the only place to update its version - postgresPackage = postgresql_15.withPackages (pp: [ - # pp.plv8 - ]); services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql - package = pkgs.${postgresPackage}; + package = pkgs.postgresql_15; enable = true; # Ensure the database, user, and ownership is set From fc62ac62feb34422bcf6ab34b31ab42ba696cb8e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:57:21 +0100 Subject: [PATCH 0645/2308] Upgrade psql to 16 --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index b35dc90..36fff87 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -103,7 +103,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_15 + postgresql_16 python3 rsync rabbitmq-server diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index f234937..9d4cd88 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -5,7 +5,7 @@ }: { services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql - package = pkgs.postgresql_15; + package = pkgs.postgresql_16; enable = true; # Ensure the database, user, and ownership is set From 13d19ee78f6a724428c353718d52c56edb71e41d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 20:57:21 +0100 Subject: [PATCH 0646/2308] Upgrade psql to 16 --- nixos/queen/configuration.nix | 2 +- nixos/queen/postgres.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index b35dc90..36fff87 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -103,7 +103,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - postgresql_15 + postgresql_16 python3 rsync rabbitmq-server diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index f234937..9d4cd88 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -5,7 +5,7 @@ }: { services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql - package = pkgs.postgresql_15; + package = pkgs.postgresql_16; enable = true; # Ensure the database, user, and ownership is set From dd523915632d8d6dfd1cddea770b255c8b5e1bc0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 21:15:44 +0100 Subject: [PATCH 0647/2308] Change domain webmail --- nixos/queen/webmail.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index 4acca69..613277c 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -8,7 +8,7 @@ enable = true; # this is the url of the vhost, not necessarily the same as the fqdn of # the mailserver - hostName = "mail.lillianviolet.dev"; + hostName = "webmail.lillianviolet.dev"; extraConfig = '' # starttls needed for authentication, so the fqdn required to match # the certificate From 334c930181a820293665d39921524f7a4b7391aa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 21:15:44 +0100 Subject: [PATCH 0648/2308] Change domain webmail --- nixos/queen/webmail.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index 4acca69..613277c 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -8,7 +8,7 @@ enable = true; # this is the url of the vhost, not necessarily the same as the fqdn of # the mailserver - hostName = "mail.lillianviolet.dev"; + hostName = "webmail.lillianviolet.dev"; extraConfig = '' # starttls needed for authentication, so the fqdn required to match # the certificate From 96f7deb590a375e435035745f6a0b6c5a37ce010 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 23:34:45 +0100 Subject: [PATCH 0649/2308] Add some plugins for roundcube --- nixos/queen/mail-server.nix | 1 - nixos/queen/webmail.nix | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 57f643b..34f0798 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -6,7 +6,6 @@ pkgs, ... }: { - #The thing you want for multiple domains is SNI, I don't know how to set that up imports = [ (builtins.fetchTarball { # Pick a release version you are interested in and set its hash, e.g. diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index 613277c..9c371ab 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -4,8 +4,22 @@ lib, ... }: { + # TODO: Figure out how to create packages for some plugins for roundcube! + # https://packagist.org/search/?query=roundcube + # https://discourse.nixos.org/t/roundcube-with-plugins/28292/7 services.roundcube = { enable = true; + + package = pkgs.roundcube.withPlugins ( + plugins: [ + plugins.contextmenu + plugins.carddav + plugins.custom_from + plugins.persistent_login + plugins.thunderbird_labels + ] + ); + # this is the url of the vhost, not necessarily the same as the fqdn of # the mailserver hostName = "webmail.lillianviolet.dev"; From 66379321c86a0d4a5e55476e0ff272346a14681a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 23:34:45 +0100 Subject: [PATCH 0650/2308] Add some plugins for roundcube --- nixos/queen/mail-server.nix | 1 - nixos/queen/webmail.nix | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix index 57f643b..34f0798 100644 --- a/nixos/queen/mail-server.nix +++ b/nixos/queen/mail-server.nix @@ -6,7 +6,6 @@ pkgs, ... }: { - #The thing you want for multiple domains is SNI, I don't know how to set that up imports = [ (builtins.fetchTarball { # Pick a release version you are interested in and set its hash, e.g. diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index 613277c..9c371ab 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -4,8 +4,22 @@ lib, ... }: { + # TODO: Figure out how to create packages for some plugins for roundcube! + # https://packagist.org/search/?query=roundcube + # https://discourse.nixos.org/t/roundcube-with-plugins/28292/7 services.roundcube = { enable = true; + + package = pkgs.roundcube.withPlugins ( + plugins: [ + plugins.contextmenu + plugins.carddav + plugins.custom_from + plugins.persistent_login + plugins.thunderbird_labels + ] + ); + # this is the url of the vhost, not necessarily the same as the fqdn of # the mailserver hostName = "webmail.lillianviolet.dev"; From 4d3432ac8c808c3aa99e681850a03aaf376f50af Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 23:38:01 +0100 Subject: [PATCH 0651/2308] Plugins don't seem installed yet --- nixos/queen/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 36fff87..dbf8a97 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,6 +108,11 @@ rsync rabbitmq-server roundcube + roundcubePlugins.contextmenu + roundcubePlugins.carddav + roundcubePlugins.custom_from + roundcubePlugins.persistent_login + roundcubePlugins.thunderbird_labels youtube-dl wget zsh From 3b7731e2d9b8049998d254113202623cc76d1761 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 23:38:01 +0100 Subject: [PATCH 0652/2308] Plugins don't seem installed yet --- nixos/queen/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 36fff87..dbf8a97 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -108,6 +108,11 @@ rsync rabbitmq-server roundcube + roundcubePlugins.contextmenu + roundcubePlugins.carddav + roundcubePlugins.custom_from + roundcubePlugins.persistent_login + roundcubePlugins.thunderbird_labels youtube-dl wget zsh From e2670fe057dfcc131a8f8eeb74f81006e038194f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 23:42:42 +0100 Subject: [PATCH 0653/2308] This seems more correct eh --- nixos/queen/webmail.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index 9c371ab..d17f845 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -10,15 +10,13 @@ services.roundcube = { enable = true; - package = pkgs.roundcube.withPlugins ( - plugins: [ - plugins.contextmenu - plugins.carddav - plugins.custom_from - plugins.persistent_login - plugins.thunderbird_labels - ] - ); + plugins = [ + "contextmenu" + "carddav" + "custom_from" + "persistent_login" + "thunderbird_labels" + ]; # this is the url of the vhost, not necessarily the same as the fqdn of # the mailserver From 37521056d9a147cb465b97f2907019129ea4e426 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 23:42:42 +0100 Subject: [PATCH 0654/2308] This seems more correct eh --- nixos/queen/webmail.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index 9c371ab..d17f845 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -10,15 +10,13 @@ services.roundcube = { enable = true; - package = pkgs.roundcube.withPlugins ( - plugins: [ - plugins.contextmenu - plugins.carddav - plugins.custom_from - plugins.persistent_login - plugins.thunderbird_labels - ] - ); + plugins = [ + "contextmenu" + "carddav" + "custom_from" + "persistent_login" + "thunderbird_labels" + ]; # this is the url of the vhost, not necessarily the same as the fqdn of # the mailserver From 0b4e0e3b93d327b8b5d8ba671c6b7fe561558073 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 23:46:11 +0100 Subject: [PATCH 0655/2308] Now? --- nixos/queen/webmail.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index d17f845..1806769 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -9,7 +9,15 @@ # https://discourse.nixos.org/t/roundcube-with-plugins/28292/7 services.roundcube = { enable = true; - + services.roundcube.package = pkgs.roundcube.withPlugins ( + plugins: [ + plugins.contextmenu + plugins.carddav + plugins.custom_from + plugins.persistent_login + plugins.thunderbird_labels + ] + ); plugins = [ "contextmenu" "carddav" From b9869a071a135d0ec873f3f7b0d4b5129eafd75d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 23:46:11 +0100 Subject: [PATCH 0656/2308] Now? --- nixos/queen/webmail.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index d17f845..1806769 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -9,7 +9,15 @@ # https://discourse.nixos.org/t/roundcube-with-plugins/28292/7 services.roundcube = { enable = true; - + services.roundcube.package = pkgs.roundcube.withPlugins ( + plugins: [ + plugins.contextmenu + plugins.carddav + plugins.custom_from + plugins.persistent_login + plugins.thunderbird_labels + ] + ); plugins = [ "contextmenu" "carddav" From 7435b36c20e9c56c92ce4ac5c3602194233731ec Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 23:46:56 +0100 Subject: [PATCH 0657/2308] Oop, double definition, fix --- nixos/queen/webmail.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index 1806769..d33c621 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -9,7 +9,7 @@ # https://discourse.nixos.org/t/roundcube-with-plugins/28292/7 services.roundcube = { enable = true; - services.roundcube.package = pkgs.roundcube.withPlugins ( + package = pkgs.roundcube.withPlugins ( plugins: [ plugins.contextmenu plugins.carddav From 9f065b1552f4f61fab93b6abcaa6c0a1a211d4f8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Dec 2023 23:46:56 +0100 Subject: [PATCH 0658/2308] Oop, double definition, fix --- nixos/queen/webmail.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/webmail.nix b/nixos/queen/webmail.nix index 1806769..d33c621 100644 --- a/nixos/queen/webmail.nix +++ b/nixos/queen/webmail.nix @@ -9,7 +9,7 @@ # https://discourse.nixos.org/t/roundcube-with-plugins/28292/7 services.roundcube = { enable = true; - services.roundcube.package = pkgs.roundcube.withPlugins ( + package = pkgs.roundcube.withPlugins ( plugins: [ plugins.contextmenu plugins.carddav From ea2a74a4a2f38e14050e79bb4e3a2968be59c3bf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 23 Dec 2023 21:22:54 +0100 Subject: [PATCH 0659/2308] Update flake lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 800c727..8b27426 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1703155327, - "narHash": "sha256-Q25AEghhhOp+ImNN4PsAExi7DIB1INMlBSaggGz7q4w=", + "lastModified": 1703355189, + "narHash": "sha256-fflRwsyW+R3u0kScApX6uP7oSln9ToFoFy9/5LOKTK0=", "owner": "nix-community", "repo": "home-manager", - "rev": "8b797c8eea1eba7dfb47f6964103e6e0d134255f", + "rev": "de9134144b456104953c2533debb27a02787891f", "type": "github" }, "original": { From 27cddf361fa449ff50f3e5a23a64f5537c838cdc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 23 Dec 2023 21:22:54 +0100 Subject: [PATCH 0660/2308] Update flake lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 800c727..8b27426 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1703155327, - "narHash": "sha256-Q25AEghhhOp+ImNN4PsAExi7DIB1INMlBSaggGz7q4w=", + "lastModified": 1703355189, + "narHash": "sha256-fflRwsyW+R3u0kScApX6uP7oSln9ToFoFy9/5LOKTK0=", "owner": "nix-community", "repo": "home-manager", - "rev": "8b797c8eea1eba7dfb47f6964103e6e0d134255f", + "rev": "de9134144b456104953c2533debb27a02787891f", "type": "github" }, "original": { From 624f18f54b848c86120500302994c38a95c32398 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Dec 2023 16:35:33 +0100 Subject: [PATCH 0661/2308] Gitea added, some mail config improvements --- flake.lock | 36 ++++++++++++++--------------- nixos/queen/configuration.nix | 3 ++- nixos/queen/gittea.nix | 43 +++++++++++++++++++++++++++++++++++ nixos/queen/gotosocial.nix | 2 +- nixos/queen/postgres.nix | 5 ++++ secrets/queen-Lillian.yaml | 5 ++-- 6 files changed, 72 insertions(+), 22 deletions(-) create mode 100644 nixos/queen/gittea.nix diff --git a/flake.lock b/flake.lock index 8b27426..7706688 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1703355189, - "narHash": "sha256-fflRwsyW+R3u0kScApX6uP7oSln9ToFoFy9/5LOKTK0=", + "lastModified": 1703527373, + "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", "owner": "nix-community", "repo": "home-manager", - "rev": "de9134144b456104953c2533debb27a02787891f", + "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702777222, - "narHash": "sha256-/SYmqgxTYzqZnQEfbOCHCN4GzqB9uAIsR9IWLzo0/8I=", + "lastModified": 1703351344, + "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a19a71d1ee93226fd71984359552affbc1cd3dc3", + "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1703134684, + "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702937567, - "narHash": "sha256-bUNl3GPqRgTGp13+oV1DrYa1/NHuGHo5SKmr+RqC/2g=", + "lastModified": 1703387502, + "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f7db64b88dabc95e4f7bee20455f418e7ab805d4", + "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3", "type": "github" }, "original": { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index dbf8a97..717609e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -22,7 +22,7 @@ ./webmail.nix ./gotosocial.nix ../upgrade/postgresql.nix - #./akkoma.nix + ./akkoma.nix ]; boot.tmp.cleanOnBoot = true; @@ -88,6 +88,7 @@ docker docker-compose git + gitea gotosocial alejandra exiftool diff --git a/nixos/queen/gittea.nix b/nixos/queen/gittea.nix new file mode 100644 index 0000000..238220e --- /dev/null +++ b/nixos/queen/gittea.nix @@ -0,0 +1,43 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = []; + users.users = { + gitea = { + isSystemUser = true; + isNormalUser = false; + extraGroups = ["virtualMail"]; + }; + }; + sops.secrets."mailpassunhash".mode = "0440"; + sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; + + services.gitea = { + enable = true; + #TODO: different mail passwords for different services + mailerPasswordFile = config.sops.secrets."mailpassunhash".path; + database = { + type = "postgres"; + }; + domain = "git.lillianviolet.dev"; + rootUrl = "https://git.lillianviolet.dev/"; + httpPort = 3218; + }; + + services.nginx = { + virtualHosts = { + "git.lillianviolet.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:3218"; + }; + }; + }; + }; +} diff --git a/nixos/queen/gotosocial.nix b/nixos/queen/gotosocial.nix index 576f419..a09cc3e 100644 --- a/nixos/queen/gotosocial.nix +++ b/nixos/queen/gotosocial.nix @@ -38,7 +38,7 @@ smtp-host = "localhost"; smtp-port = 587; smtp-username = "no-reply@social.gladtherescake.eu"; - smtp-password = config.sops.secrets."mailpass".path; + smtp-password = config.sops.secrets."mailpassunhash".path; smtp-from = "no-reply@social.gladtherescake.eu"; }; }; diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 9d4cd88..92b9478 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -14,6 +14,7 @@ "onlyoffice" "akkoma" "gotosocial" + "gitea" ]; ensureUsers = [ { @@ -32,6 +33,10 @@ name = "gotosocial"; ensureDBOwnership = true; } + { + name = "gitea"; + ensureDBOwnership = true; + } ]; }; } diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index 6ee2f99..df84d54 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -4,6 +4,7 @@ local.json: ENC[AES256_GCM,data:EWMZTvnP9DmJKZq3mejvlSc8e2BZxcREn+XB1tAM5NLS0G2f mailpass: ENC[AES256_GCM,data:UVrc1RUV0xJFPiZ8J4refglR0p35gUd21EvvTSoeXHVE9/xC0biKmjdPu8cBmimNPmKJMvZRf8wOz+/x,iv:zIYI9JY/bfUc3nNPNopKMbh09B6KUotMUAmNDzVUBN8=,tag:53N8WlQ5CDlrp/KIEQiHgQ==,type:str] releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/J0AP0o3qw==,iv:zS12xjcNbLaLaLd3VQT8+o9hDqTo1cZdxoPjjhiExDU=,tag:nJFelasEUjebEBpvmfcDEA==,type:str] mssqlpass: ENC[AES256_GCM,data:XEu4bQC5qM5Cm8UDVX3qAzTuL/t3xbx+qcEbZM4h3Hg=,iv:jgpZ93THYBlUvJDC5+YZiIxu/14e7nFSy76J0vc8Hek=,tag:iKsEDp/KZ5juqzmUgtP8iA==,type:str] +mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8,iv:oAFna87l3sL/42ljUF1QsRL0xBrP82uYdKLxK/8HcQE=,tag:liFFGHbNPOpOHyMsjnvMOQ==,type:str] sops: kms: [] gcp_kms: [] @@ -19,8 +20,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-27T22:46:02Z" - mac: ENC[AES256_GCM,data:8aObcXuGWeb3XeOxEh+rvkGKGl9FXAB3jzAE0IbvoOpGFK0mpeOlIp+4BsGVo6LjecGfE80mBE49mCgC27KqYEq+jUC4onFiIgWB0VQSD367vd4BLZJqIYH7H+X3bShw7JGHq9Kq+CDwbCOzAQJHltYDg4jhJ5qbWqNINJ6t7tY=,iv:OWmROKYvN4nCwGNSFrue2icqNQ+QOp9xVlfLXUwuS1s=,tag:N3AHph2pnTSKwlO1Px/TwQ==,type:str] + lastmodified: "2023-12-26T15:30:39Z" + mac: ENC[AES256_GCM,data:j0ZX7F0etvbL1Th3I3eO36PSA5/IiXHzPFWJdxeZEUN9N40hshppeRQ/54Nnn//k9uFennC4F/CIFu5fZioBcQJUnxuCy2EmpztWiGSIbiO94+H2ovMy9Wly8NgvG/DnYb1uSBhTEdXJoEDbzJ/ngb/MtvgB1mCZKbhIw88IDM0=,iv:5XcfXAu6mORLd/O2UCfaPhiPQul7b807xy1PyZo3MF0=,tag:mC5JAmb7jgezJjm5AXT+sg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 68c5093744e112742b55e573b87baf48bf55d218 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Dec 2023 16:35:33 +0100 Subject: [PATCH 0662/2308] Gitea added, some mail config improvements --- flake.lock | 36 ++++++++++++++--------------- nixos/queen/configuration.nix | 3 ++- nixos/queen/gittea.nix | 43 +++++++++++++++++++++++++++++++++++ nixos/queen/gotosocial.nix | 2 +- nixos/queen/postgres.nix | 5 ++++ secrets/queen-Lillian.yaml | 5 ++-- 6 files changed, 72 insertions(+), 22 deletions(-) create mode 100644 nixos/queen/gittea.nix diff --git a/flake.lock b/flake.lock index 8b27426..7706688 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1703355189, - "narHash": "sha256-fflRwsyW+R3u0kScApX6uP7oSln9ToFoFy9/5LOKTK0=", + "lastModified": 1703527373, + "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", "owner": "nix-community", "repo": "home-manager", - "rev": "de9134144b456104953c2533debb27a02787891f", + "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702777222, - "narHash": "sha256-/SYmqgxTYzqZnQEfbOCHCN4GzqB9uAIsR9IWLzo0/8I=", + "lastModified": 1703351344, + "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a19a71d1ee93226fd71984359552affbc1cd3dc3", + "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1703134684, + "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702937567, - "narHash": "sha256-bUNl3GPqRgTGp13+oV1DrYa1/NHuGHo5SKmr+RqC/2g=", + "lastModified": 1703387502, + "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f7db64b88dabc95e4f7bee20455f418e7ab805d4", + "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3", "type": "github" }, "original": { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index dbf8a97..717609e 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -22,7 +22,7 @@ ./webmail.nix ./gotosocial.nix ../upgrade/postgresql.nix - #./akkoma.nix + ./akkoma.nix ]; boot.tmp.cleanOnBoot = true; @@ -88,6 +88,7 @@ docker docker-compose git + gitea gotosocial alejandra exiftool diff --git a/nixos/queen/gittea.nix b/nixos/queen/gittea.nix new file mode 100644 index 0000000..238220e --- /dev/null +++ b/nixos/queen/gittea.nix @@ -0,0 +1,43 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = []; + users.users = { + gitea = { + isSystemUser = true; + isNormalUser = false; + extraGroups = ["virtualMail"]; + }; + }; + sops.secrets."mailpassunhash".mode = "0440"; + sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; + + services.gitea = { + enable = true; + #TODO: different mail passwords for different services + mailerPasswordFile = config.sops.secrets."mailpassunhash".path; + database = { + type = "postgres"; + }; + domain = "git.lillianviolet.dev"; + rootUrl = "https://git.lillianviolet.dev/"; + httpPort = 3218; + }; + + services.nginx = { + virtualHosts = { + "git.lillianviolet.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:3218"; + }; + }; + }; + }; +} diff --git a/nixos/queen/gotosocial.nix b/nixos/queen/gotosocial.nix index 576f419..a09cc3e 100644 --- a/nixos/queen/gotosocial.nix +++ b/nixos/queen/gotosocial.nix @@ -38,7 +38,7 @@ smtp-host = "localhost"; smtp-port = 587; smtp-username = "no-reply@social.gladtherescake.eu"; - smtp-password = config.sops.secrets."mailpass".path; + smtp-password = config.sops.secrets."mailpassunhash".path; smtp-from = "no-reply@social.gladtherescake.eu"; }; }; diff --git a/nixos/queen/postgres.nix b/nixos/queen/postgres.nix index 9d4cd88..92b9478 100644 --- a/nixos/queen/postgres.nix +++ b/nixos/queen/postgres.nix @@ -14,6 +14,7 @@ "onlyoffice" "akkoma" "gotosocial" + "gitea" ]; ensureUsers = [ { @@ -32,6 +33,10 @@ name = "gotosocial"; ensureDBOwnership = true; } + { + name = "gitea"; + ensureDBOwnership = true; + } ]; }; } diff --git a/secrets/queen-Lillian.yaml b/secrets/queen-Lillian.yaml index 6ee2f99..df84d54 100644 --- a/secrets/queen-Lillian.yaml +++ b/secrets/queen-Lillian.yaml @@ -4,6 +4,7 @@ local.json: ENC[AES256_GCM,data:EWMZTvnP9DmJKZq3mejvlSc8e2BZxcREn+XB1tAM5NLS0G2f mailpass: ENC[AES256_GCM,data:UVrc1RUV0xJFPiZ8J4refglR0p35gUd21EvvTSoeXHVE9/xC0biKmjdPu8cBmimNPmKJMvZRf8wOz+/x,iv:zIYI9JY/bfUc3nNPNopKMbh09B6KUotMUAmNDzVUBN8=,tag:53N8WlQ5CDlrp/KIEQiHgQ==,type:str] releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/J0AP0o3qw==,iv:zS12xjcNbLaLaLd3VQT8+o9hDqTo1cZdxoPjjhiExDU=,tag:nJFelasEUjebEBpvmfcDEA==,type:str] mssqlpass: ENC[AES256_GCM,data:XEu4bQC5qM5Cm8UDVX3qAzTuL/t3xbx+qcEbZM4h3Hg=,iv:jgpZ93THYBlUvJDC5+YZiIxu/14e7nFSy76J0vc8Hek=,tag:iKsEDp/KZ5juqzmUgtP8iA==,type:str] +mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8,iv:oAFna87l3sL/42ljUF1QsRL0xBrP82uYdKLxK/8HcQE=,tag:liFFGHbNPOpOHyMsjnvMOQ==,type:str] sops: kms: [] gcp_kms: [] @@ -19,8 +20,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-27T22:46:02Z" - mac: ENC[AES256_GCM,data:8aObcXuGWeb3XeOxEh+rvkGKGl9FXAB3jzAE0IbvoOpGFK0mpeOlIp+4BsGVo6LjecGfE80mBE49mCgC27KqYEq+jUC4onFiIgWB0VQSD367vd4BLZJqIYH7H+X3bShw7JGHq9Kq+CDwbCOzAQJHltYDg4jhJ5qbWqNINJ6t7tY=,iv:OWmROKYvN4nCwGNSFrue2icqNQ+QOp9xVlfLXUwuS1s=,tag:N3AHph2pnTSKwlO1Px/TwQ==,type:str] + lastmodified: "2023-12-26T15:30:39Z" + mac: ENC[AES256_GCM,data:j0ZX7F0etvbL1Th3I3eO36PSA5/IiXHzPFWJdxeZEUN9N40hshppeRQ/54Nnn//k9uFennC4F/CIFu5fZioBcQJUnxuCy2EmpztWiGSIbiO94+H2ovMy9Wly8NgvG/DnYb1uSBhTEdXJoEDbzJ/ngb/MtvgB1mCZKbhIw88IDM0=,iv:5XcfXAu6mORLd/O2UCfaPhiPQul7b807xy1PyZo3MF0=,tag:mC5JAmb7jgezJjm5AXT+sg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 7a6aad4174eed2b5a421f8f3e1d9027e26aadcb6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Dec 2023 16:23:57 +0100 Subject: [PATCH 0663/2308] Created configuration for steam deck (shodan) --- flake.nix | 11 ++ home-manager/shodan-Lillian.nix | 55 +++++++ nixos/shodan/configuration.nix | 247 ++++++++++++++++++++++++++++++++ 3 files changed, 313 insertions(+) create mode 100644 home-manager/shodan-Lillian.nix create mode 100644 nixos/shodan/configuration.nix diff --git a/flake.nix b/flake.nix index 89d218e..124844a 100644 --- a/flake.nix +++ b/flake.nix @@ -92,5 +92,16 @@ ]; }; }; + + nixosConfigurations = { + shodan = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main nixos configuration file < + ./nixos/shodan/configuration.nix + sops-nix.nixosModules.sops + ]; + }; + }; }; } diff --git a/home-manager/shodan-Lillian.nix b/home-manager/shodan-Lillian.nix new file mode 100644 index 0000000..80dae42 --- /dev/null +++ b/home-manager/shodan-Lillian.nix @@ -0,0 +1,55 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ]; + + home.packages = with pkgs; [ + #Chat: + webcord-vencord + + #Gaming: + prismlauncher + + # Multimedia: + freetube + obs-studio + vlc + + # System tools: + rage + discover + flameshot + fzf + nextcloud-client + nitrokey-app + protonvpn-gui + sops + watchmate + qbittorrent + zsh + + # Web browsing: + librewolf + ungoogled-chromium + ]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "23.11"; +} diff --git a/nixos/shodan/configuration.nix b/nixos/shodan/configuration.nix new file mode 100644 index 0000000..0dcf8e5 --- /dev/null +++ b/nixos/shodan/configuration.nix @@ -0,0 +1,247 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + #Jovian Nixos + ( + # Put the most recent revision here: + let + revision = "4d24d2ff927a8b8a698bbacdb1966045bcadf872"; + in + builtins.fetchTarball { + url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz"; + # Update the hash as needed: + sha256 = "sha256:9b9cd766072751ea23e22969d4804320a146afa340c496628a4a87797ac13771"; + } + + "/modules" + ) + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + inputs.home-manager.nixosModules.home-manager + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ./hardware-configuration.nix + ]; + + boot.tmp.cleanOnBoot = true; + zramSwap.enable = false; + networking.domain = ""; + services.openssh.enable = true; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys + sops.defaultSopsFile = ../../secrets/shodan-Lillian.yaml; + sops.age.keyFile = ./keys.txt; + + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + environment.systemPackages = with pkgs; [ + #System: + alejandra + git + git-filter-repo + home-manager + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + oh-my-zsh + rsync + wget + zsh + + #KDE: + krunner-translator + libsForQt5.discover + libsForQt5.kcalc + libsForQt5.kdepim-addons + libsForQt5.kirigami2 + libsForQt5.kdeconnect-kde + libsForQt5.krunner-ssh + libsForQt5.krunner-symbols + libsForQt5.packagekit-qt + libportal-qt5 + + #Gaming: + steam + heroic-unwrapped + ]; + + #Enable steam deck steam interface + jovian.steam.enable = true; + + #Autostart this inteface at login + jovian.steam.autoStart = true; + + #What desktop to start when switching to desktop session + jovian.steam.desktopSession = "plasmawayland"; + + jovian.steam.user = users.users.lillian; + + #Enable gyro service for CEMU + jovian.devices.steamdeck.enableGyroDsuService = true; + + #Enable auto updates for the BIOS and controller firmware + jovian.devices.steamdeck.autoUpdate = true; + + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.desktopManager.plasma5.enable = true; + programs.kdeconnect.enable = true; + + # Enable flatpak support + services.flatpak.enable = true; + services.packagekit.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable networking + networking.networkmanager.enable = true; + + networking.firewall.enable = true; + + networking.firewall.allowedTCPPorts = [22]; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + # Enable fwupd daemon and user space client + services.fwupd.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + programs.noisetorch = { + enable = true; + }; + + programs.zsh = { + enable = true; + }; + + programs.git = { + enable = true; + }; + + users.users = { + lillian = { + openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "decky"]; + shell = pkgs.zsh; + }; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../home-manager/shodan-Lillian.nix; + }; + }; + + networking.hostName = "shodan"; + + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "unstable"; +} From 2da39b417054ac4dd003a41ec05a568c54ae62e5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Dec 2023 16:23:57 +0100 Subject: [PATCH 0664/2308] Created configuration for steam deck (shodan) --- flake.nix | 11 ++ home-manager/shodan-Lillian.nix | 55 +++++++ nixos/shodan/configuration.nix | 247 ++++++++++++++++++++++++++++++++ 3 files changed, 313 insertions(+) create mode 100644 home-manager/shodan-Lillian.nix create mode 100644 nixos/shodan/configuration.nix diff --git a/flake.nix b/flake.nix index 89d218e..124844a 100644 --- a/flake.nix +++ b/flake.nix @@ -92,5 +92,16 @@ ]; }; }; + + nixosConfigurations = { + shodan = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main nixos configuration file < + ./nixos/shodan/configuration.nix + sops-nix.nixosModules.sops + ]; + }; + }; }; } diff --git a/home-manager/shodan-Lillian.nix b/home-manager/shodan-Lillian.nix new file mode 100644 index 0000000..80dae42 --- /dev/null +++ b/home-manager/shodan-Lillian.nix @@ -0,0 +1,55 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ]; + + home.packages = with pkgs; [ + #Chat: + webcord-vencord + + #Gaming: + prismlauncher + + # Multimedia: + freetube + obs-studio + vlc + + # System tools: + rage + discover + flameshot + fzf + nextcloud-client + nitrokey-app + protonvpn-gui + sops + watchmate + qbittorrent + zsh + + # Web browsing: + librewolf + ungoogled-chromium + ]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "23.11"; +} diff --git a/nixos/shodan/configuration.nix b/nixos/shodan/configuration.nix new file mode 100644 index 0000000..0dcf8e5 --- /dev/null +++ b/nixos/shodan/configuration.nix @@ -0,0 +1,247 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + #Jovian Nixos + ( + # Put the most recent revision here: + let + revision = "4d24d2ff927a8b8a698bbacdb1966045bcadf872"; + in + builtins.fetchTarball { + url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz"; + # Update the hash as needed: + sha256 = "sha256:9b9cd766072751ea23e22969d4804320a146afa340c496628a4a87797ac13771"; + } + + "/modules" + ) + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + inputs.home-manager.nixosModules.home-manager + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ./hardware-configuration.nix + ]; + + boot.tmp.cleanOnBoot = true; + zramSwap.enable = false; + networking.domain = ""; + services.openssh.enable = true; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys + sops.defaultSopsFile = ../../secrets/shodan-Lillian.yaml; + sops.age.keyFile = ./keys.txt; + + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + environment.systemPackages = with pkgs; [ + #System: + alejandra + git + git-filter-repo + home-manager + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + oh-my-zsh + rsync + wget + zsh + + #KDE: + krunner-translator + libsForQt5.discover + libsForQt5.kcalc + libsForQt5.kdepim-addons + libsForQt5.kirigami2 + libsForQt5.kdeconnect-kde + libsForQt5.krunner-ssh + libsForQt5.krunner-symbols + libsForQt5.packagekit-qt + libportal-qt5 + + #Gaming: + steam + heroic-unwrapped + ]; + + #Enable steam deck steam interface + jovian.steam.enable = true; + + #Autostart this inteface at login + jovian.steam.autoStart = true; + + #What desktop to start when switching to desktop session + jovian.steam.desktopSession = "plasmawayland"; + + jovian.steam.user = users.users.lillian; + + #Enable gyro service for CEMU + jovian.devices.steamdeck.enableGyroDsuService = true; + + #Enable auto updates for the BIOS and controller firmware + jovian.devices.steamdeck.autoUpdate = true; + + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.desktopManager.plasma5.enable = true; + programs.kdeconnect.enable = true; + + # Enable flatpak support + services.flatpak.enable = true; + services.packagekit.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable networking + networking.networkmanager.enable = true; + + networking.firewall.enable = true; + + networking.firewall.allowedTCPPorts = [22]; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + # Enable fwupd daemon and user space client + services.fwupd.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + programs.noisetorch = { + enable = true; + }; + + programs.zsh = { + enable = true; + }; + + programs.git = { + enable = true; + }; + + users.users = { + lillian = { + openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "decky"]; + shell = pkgs.zsh; + }; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../home-manager/shodan-Lillian.nix; + }; + }; + + networking.hostName = "shodan"; + + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "unstable"; +} From f708476a73e2da7b92faa4b80e41cb6b773be536 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Dec 2023 16:26:39 +0100 Subject: [PATCH 0665/2308] Dummy hardware config file (copy of queen) for testing --- nixos/shodan/configuration.nix | 4 ++-- nixos/shodan/hardware-configuration.nix | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 nixos/shodan/hardware-configuration.nix diff --git a/nixos/shodan/configuration.nix b/nixos/shodan/configuration.nix index 0dcf8e5..9e0612b 100644 --- a/nixos/shodan/configuration.nix +++ b/nixos/shodan/configuration.nix @@ -16,7 +16,7 @@ builtins.fetchTarball { url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz"; # Update the hash as needed: - sha256 = "sha256:9b9cd766072751ea23e22969d4804320a146afa340c496628a4a87797ac13771"; + sha256 = "sha256:1bj0vm734jllsl7kyicdjlcpm30q6syzavr3im89m0f5bpnzkj7l"; } + "/modules" ) @@ -127,7 +127,7 @@ #What desktop to start when switching to desktop session jovian.steam.desktopSession = "plasmawayland"; - jovian.steam.user = users.users.lillian; + jovian.steam.user = "lillian"; #Enable gyro service for CEMU jovian.devices.steamdeck.enableGyroDsuService = true; diff --git a/nixos/shodan/hardware-configuration.nix b/nixos/shodan/hardware-configuration.nix new file mode 100644 index 0000000..52ea2b5 --- /dev/null +++ b/nixos/shodan/hardware-configuration.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [(modulesPath + "/profiles/qemu-guest.nix")]; + boot.loader.grub.device = "/dev/sda"; + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + boot.initrd.kernelModules = ["nvme"]; + fileSystems."/" = { + device = "/dev/sda3"; + fsType = "ext4"; + }; + swapDevices = [{device = "/dev/sda2";}]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} From 53a74ac58abf58adc90875e23520d05c445f411d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Dec 2023 16:26:39 +0100 Subject: [PATCH 0666/2308] Dummy hardware config file (copy of queen) for testing --- nixos/shodan/configuration.nix | 4 ++-- nixos/shodan/hardware-configuration.nix | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 nixos/shodan/hardware-configuration.nix diff --git a/nixos/shodan/configuration.nix b/nixos/shodan/configuration.nix index 0dcf8e5..9e0612b 100644 --- a/nixos/shodan/configuration.nix +++ b/nixos/shodan/configuration.nix @@ -16,7 +16,7 @@ builtins.fetchTarball { url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz"; # Update the hash as needed: - sha256 = "sha256:9b9cd766072751ea23e22969d4804320a146afa340c496628a4a87797ac13771"; + sha256 = "sha256:1bj0vm734jllsl7kyicdjlcpm30q6syzavr3im89m0f5bpnzkj7l"; } + "/modules" ) @@ -127,7 +127,7 @@ #What desktop to start when switching to desktop session jovian.steam.desktopSession = "plasmawayland"; - jovian.steam.user = users.users.lillian; + jovian.steam.user = "lillian"; #Enable gyro service for CEMU jovian.devices.steamdeck.enableGyroDsuService = true; diff --git a/nixos/shodan/hardware-configuration.nix b/nixos/shodan/hardware-configuration.nix new file mode 100644 index 0000000..52ea2b5 --- /dev/null +++ b/nixos/shodan/hardware-configuration.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [(modulesPath + "/profiles/qemu-guest.nix")]; + boot.loader.grub.device = "/dev/sda"; + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + boot.initrd.kernelModules = ["nvme"]; + fileSystems."/" = { + device = "/dev/sda3"; + fsType = "ext4"; + }; + swapDevices = [{device = "/dev/sda2";}]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} From e746bea681bc70ae57723cffbea962b31407215d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Dec 2023 16:27:46 +0100 Subject: [PATCH 0667/2308] Dry build works, let's remove that --- nixos/shodan/hardware-configuration.nix | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 nixos/shodan/hardware-configuration.nix diff --git a/nixos/shodan/hardware-configuration.nix b/nixos/shodan/hardware-configuration.nix deleted file mode 100644 index 52ea2b5..0000000 --- a/nixos/shodan/hardware-configuration.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [(modulesPath + "/profiles/qemu-guest.nix")]; - boot.loader.grub.device = "/dev/sda"; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; - boot.initrd.kernelModules = ["nvme"]; - fileSystems."/" = { - device = "/dev/sda3"; - fsType = "ext4"; - }; - swapDevices = [{device = "/dev/sda2";}]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} From 107fd06c0556cea2b71bc0fd3ff19c35ada41a4c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Dec 2023 16:27:46 +0100 Subject: [PATCH 0668/2308] Dry build works, let's remove that --- nixos/shodan/hardware-configuration.nix | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 nixos/shodan/hardware-configuration.nix diff --git a/nixos/shodan/hardware-configuration.nix b/nixos/shodan/hardware-configuration.nix deleted file mode 100644 index 52ea2b5..0000000 --- a/nixos/shodan/hardware-configuration.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [(modulesPath + "/profiles/qemu-guest.nix")]; - boot.loader.grub.device = "/dev/sda"; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; - boot.initrd.kernelModules = ["nvme"]; - fileSystems."/" = { - device = "/dev/sda3"; - fsType = "ext4"; - }; - swapDevices = [{device = "/dev/sda2";}]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} From d5531f4b9b483be0cadeb31308c62202321787d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Dec 2023 16:40:45 +0100 Subject: [PATCH 0669/2308] Remove the azuredatastudio bs --- pkgs/azuredatastudio/default.nix | 195 ------------------------------- pkgs/default.nix | 1 - 2 files changed, 196 deletions(-) delete mode 100644 pkgs/azuredatastudio/default.nix diff --git a/pkgs/azuredatastudio/default.nix b/pkgs/azuredatastudio/default.nix deleted file mode 100644 index 880fa8f..0000000 --- a/pkgs/azuredatastudio/default.nix +++ /dev/null @@ -1,195 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - copyDesktopItems, - makeDesktopItem, - makeWrapper, - alsa-lib, - at-spi2-atk, - at-spi2-core, - cairo, - cups, - curl, - dbus, - expat, - gdk-pixbuf, - glib, - gnutar, - gtk3, - icu, - libdrm, - libunwind, - libuuid, - libxkbcommon, - mesa, - nspr, - nss, - openssl, - pango, - systemd, - xorg, - zlib, -}: -# from justinwoo/azuredatastudio-nix -# https://github.com/justinwoo/azuredatastudio-nix/blob/537c48aa3981cd1a82d5d6e508ab7e7393b3d7c8/default.nix -let - desktopItem = makeDesktopItem { - name = "azuredatastudio"; - desktopName = "Azure Data Studio"; - comment = "Data Management Tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux."; - genericName = "Text Editor"; - exec = "azuredatastudio --no-sandbox --unity-launch %F"; - icon = "azuredatastudio"; - startupNotify = true; - startupWMClass = "azuredatastudio"; - categories = ["Utility" "TextEditor" "Development" "IDE"]; - mimeTypes = ["text/plain" "inode/directory" "application/x-azuredatastudio-workspace"]; - keywords = ["azuredatastudio"]; - actions.new-empty-window = { - name = "New Empty Window"; - exec = "azuredatastudio --no-sandbox --new-window %F"; - icon = "azuredatastudio"; - }; - }; - - urlHandlerDesktopItem = makeDesktopItem { - name = "azuredatastudio-url-handler"; - desktopName = "Azure Data Studio - URL Handler"; - comment = "Azure Data Studio"; - genericName = "Text Editor"; - exec = "azuredatastudio --no-sandbox --open-url %U"; - icon = "azuredatastudio"; - startupNotify = true; - startupWMClass = "azuredatastudio"; - categories = ["Utility" "TextEditor" "Development" "IDE"]; - mimeTypes = ["x-scheme-handler/azuredatastudio"]; - keywords = ["azuredatastudio"]; - noDisplay = true; - }; -in - stdenv.mkDerivation rec { - pname = "azuredatastudio"; - version = "1.47.0"; - - desktopItems = [desktopItem urlHandlerDesktopItem]; - - src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; - sha256 = "0e094179ffb883d0da8fdbe9721a32402303bf68f411445f2d="; - }; - - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - buildInputs = [ - libuuid - at-spi2-core - at-spi2-atk - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/pixmaps - cp ${targetPath}/resources/app/resources/linux/code.png $out/share/pixmaps/azuredatastudio.png - - runHook postInstall - ''; - - # change this to azuredatastudio-insiders for insiders releases - edition = "azuredatastudio"; - targetPath = "$out/${edition}"; - - unpackPhase = '' - mkdir -p ${targetPath} - ${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath} - ''; - - sqltoolsserviceRpath = lib.makeLibraryPath [ - stdenv.cc.cc - libunwind - libuuid - icu - openssl - zlib - curl - ]; - - # this will most likely need to be updated when azuredatastudio's version changes - sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; - - rpath = lib.concatStringsSep ":" [ - (lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - mesa - nss - nspr - libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence - libxkbcommon - xorg.libxkbfile - pango - stdenv.cc.cc.lib - systemd - ]) - targetPath - sqltoolsserviceRpath - ]; - - fixupPhase = '' - fix_sqltoolsservice() - { - mv ${sqltoolsservicePath}/$1 ${sqltoolsservicePath}/$1_old - patchelf \ - --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - ${sqltoolsservicePath}/$1_old - - makeWrapper \ - ${sqltoolsservicePath}/$1_old \ - ${sqltoolsservicePath}/$1 \ - --set LD_LIBRARY_PATH ${sqltoolsserviceRpath} - } - - fix_sqltoolsservice MicrosoftSqlToolsServiceLayer - fix_sqltoolsservice MicrosoftSqlToolsCredentials - fix_sqltoolsservice SqlToolsResourceProviderService - - patchelf \ - --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - ${targetPath}/${edition} - - mkdir -p $out/bin - makeWrapper \ - ${targetPath}/bin/${edition} \ - $out/bin/azuredatastudio \ - --set LD_LIBRARY_PATH ${rpath} - ''; - - meta = { - maintainers = with lib.maintainers; [xavierzwirtz]; - description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; - homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; - sourceProvenance = with lib.sourceTypes; [binaryNativeCode]; - license = lib.licenses.unfreeRedistributable; - platforms = ["x86_64-linux"]; - }; - } diff --git a/pkgs/default.nix b/pkgs/default.nix index c9847b8..3d9e23c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,5 +2,4 @@ # You can build them using 'nix build .#example' pkgs: { # example = pkgs.callPackage ./example { }; - #azuredatastudio = pkgs.callPackage ./azuredatastudio {}; } From afdafa74ddda4539662ff03a99f3891d2b6b439e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Dec 2023 16:40:45 +0100 Subject: [PATCH 0670/2308] Remove the azuredatastudio bs --- pkgs/azuredatastudio/default.nix | 195 ------------------------------- pkgs/default.nix | 1 - 2 files changed, 196 deletions(-) delete mode 100644 pkgs/azuredatastudio/default.nix diff --git a/pkgs/azuredatastudio/default.nix b/pkgs/azuredatastudio/default.nix deleted file mode 100644 index 880fa8f..0000000 --- a/pkgs/azuredatastudio/default.nix +++ /dev/null @@ -1,195 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - copyDesktopItems, - makeDesktopItem, - makeWrapper, - alsa-lib, - at-spi2-atk, - at-spi2-core, - cairo, - cups, - curl, - dbus, - expat, - gdk-pixbuf, - glib, - gnutar, - gtk3, - icu, - libdrm, - libunwind, - libuuid, - libxkbcommon, - mesa, - nspr, - nss, - openssl, - pango, - systemd, - xorg, - zlib, -}: -# from justinwoo/azuredatastudio-nix -# https://github.com/justinwoo/azuredatastudio-nix/blob/537c48aa3981cd1a82d5d6e508ab7e7393b3d7c8/default.nix -let - desktopItem = makeDesktopItem { - name = "azuredatastudio"; - desktopName = "Azure Data Studio"; - comment = "Data Management Tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux."; - genericName = "Text Editor"; - exec = "azuredatastudio --no-sandbox --unity-launch %F"; - icon = "azuredatastudio"; - startupNotify = true; - startupWMClass = "azuredatastudio"; - categories = ["Utility" "TextEditor" "Development" "IDE"]; - mimeTypes = ["text/plain" "inode/directory" "application/x-azuredatastudio-workspace"]; - keywords = ["azuredatastudio"]; - actions.new-empty-window = { - name = "New Empty Window"; - exec = "azuredatastudio --no-sandbox --new-window %F"; - icon = "azuredatastudio"; - }; - }; - - urlHandlerDesktopItem = makeDesktopItem { - name = "azuredatastudio-url-handler"; - desktopName = "Azure Data Studio - URL Handler"; - comment = "Azure Data Studio"; - genericName = "Text Editor"; - exec = "azuredatastudio --no-sandbox --open-url %U"; - icon = "azuredatastudio"; - startupNotify = true; - startupWMClass = "azuredatastudio"; - categories = ["Utility" "TextEditor" "Development" "IDE"]; - mimeTypes = ["x-scheme-handler/azuredatastudio"]; - keywords = ["azuredatastudio"]; - noDisplay = true; - }; -in - stdenv.mkDerivation rec { - pname = "azuredatastudio"; - version = "1.47.0"; - - desktopItems = [desktopItem urlHandlerDesktopItem]; - - src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; - sha256 = "0e094179ffb883d0da8fdbe9721a32402303bf68f411445f2d="; - }; - - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - buildInputs = [ - libuuid - at-spi2-core - at-spi2-atk - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/pixmaps - cp ${targetPath}/resources/app/resources/linux/code.png $out/share/pixmaps/azuredatastudio.png - - runHook postInstall - ''; - - # change this to azuredatastudio-insiders for insiders releases - edition = "azuredatastudio"; - targetPath = "$out/${edition}"; - - unpackPhase = '' - mkdir -p ${targetPath} - ${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath} - ''; - - sqltoolsserviceRpath = lib.makeLibraryPath [ - stdenv.cc.cc - libunwind - libuuid - icu - openssl - zlib - curl - ]; - - # this will most likely need to be updated when azuredatastudio's version changes - sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; - - rpath = lib.concatStringsSep ":" [ - (lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - mesa - nss - nspr - libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence - libxkbcommon - xorg.libxkbfile - pango - stdenv.cc.cc.lib - systemd - ]) - targetPath - sqltoolsserviceRpath - ]; - - fixupPhase = '' - fix_sqltoolsservice() - { - mv ${sqltoolsservicePath}/$1 ${sqltoolsservicePath}/$1_old - patchelf \ - --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - ${sqltoolsservicePath}/$1_old - - makeWrapper \ - ${sqltoolsservicePath}/$1_old \ - ${sqltoolsservicePath}/$1 \ - --set LD_LIBRARY_PATH ${sqltoolsserviceRpath} - } - - fix_sqltoolsservice MicrosoftSqlToolsServiceLayer - fix_sqltoolsservice MicrosoftSqlToolsCredentials - fix_sqltoolsservice SqlToolsResourceProviderService - - patchelf \ - --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - ${targetPath}/${edition} - - mkdir -p $out/bin - makeWrapper \ - ${targetPath}/bin/${edition} \ - $out/bin/azuredatastudio \ - --set LD_LIBRARY_PATH ${rpath} - ''; - - meta = { - maintainers = with lib.maintainers; [xavierzwirtz]; - description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; - homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; - sourceProvenance = with lib.sourceTypes; [binaryNativeCode]; - license = lib.licenses.unfreeRedistributable; - platforms = ["x86_64-linux"]; - }; - } diff --git a/pkgs/default.nix b/pkgs/default.nix index c9847b8..3d9e23c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,5 +2,4 @@ # You can build them using 'nix build .#example' pkgs: { # example = pkgs.callPackage ./example { }; - #azuredatastudio = pkgs.callPackage ./azuredatastudio {}; } From 85eb74721e1dadd289fef785bbf8df2ccd52b848 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 00:00:13 +0100 Subject: [PATCH 0671/2308] Little copy from template, don't use this --- nixos/shodan/hardware-configuration.nix | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 nixos/shodan/hardware-configuration.nix diff --git a/nixos/shodan/hardware-configuration.nix b/nixos/shodan/hardware-configuration.nix new file mode 100644 index 0000000..f0da945 --- /dev/null +++ b/nixos/shodan/hardware-configuration.nix @@ -0,0 +1,42 @@ +# 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" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/19a654d6-c3c7-44fb-9752-fbc6bd7024a2"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/5636-9CA7"; + fsType = "vfat"; + }; + + swapDevices = []; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp4s0f3u1u4.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From 6f2c936913dadb695675cc1900bcc6c2b224b884 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 00:00:13 +0100 Subject: [PATCH 0672/2308] Little copy from template, don't use this --- nixos/shodan/hardware-configuration.nix | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 nixos/shodan/hardware-configuration.nix diff --git a/nixos/shodan/hardware-configuration.nix b/nixos/shodan/hardware-configuration.nix new file mode 100644 index 0000000..f0da945 --- /dev/null +++ b/nixos/shodan/hardware-configuration.nix @@ -0,0 +1,42 @@ +# 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" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/19a654d6-c3c7-44fb-9752-fbc6bd7024a2"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/5636-9CA7"; + fsType = "vfat"; + }; + + swapDevices = []; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp4s0f3u1u4.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From ba1d04f83a07c7511d37a583047c9813ceb2340e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 12:47:58 +0100 Subject: [PATCH 0673/2308] Big refactor, need to test still --- flake.nix | 8 ++++---- .../configuration.nix} | 2 +- home-manager/{ => hosts/EDI}/EDI-Lillian.nix | 2 +- .../{ => hosts/GLaDOS}/GLaDOS-Lillian.nix | 2 +- .../{ => hosts/queen}/queen-Lillian.nix | 2 +- .../{ => hosts/shodan}/shodan-Lillian.nix | 0 .../zsh.nix | 0 .../configuration.nix | 0 nixos/{ => hosts}/EDI/configuration.nix | 0 .../{ => hosts}/EDI/hardware-configuration.nix | 0 .../hosts/EDI/secrets/sops.yaml | 0 nixos/{ => hosts}/GLaDOS/configuration.nix | 0 .../GLaDOS/hardware-configuration.nix | 0 nixos/{ => hosts}/queen/configuration.nix | 17 +++++++++-------- .../queen/hardware-configuration.nix | 0 .../hosts/queen/secrets/sops.yaml | 0 nixos/{ => hosts}/shodan/configuration.nix | 0 .../shodan/hardware-configuration.nix | 0 .../akkoma/configuration.nix} | 0 .../gitea/configuration.nix} | 0 .../gotosocial/configuration.nix} | 0 .../mail-server/configuration.nix} | 0 .../nextcloud/configuration.nix} | 0 .../postgres/configuration.nix} | 0 .../postgres/upgrade.nix} | 0 .../roundcube/configuration.nix} | 0 26 files changed, 17 insertions(+), 16 deletions(-) rename home-manager/{desktop-shared.nix => desktop/configuration.nix} (99%) rename home-manager/{ => hosts/EDI}/EDI-Lillian.nix (95%) rename home-manager/{ => hosts/GLaDOS}/GLaDOS-Lillian.nix (95%) rename home-manager/{ => hosts/queen}/queen-Lillian.nix (98%) rename home-manager/{ => hosts/shodan}/shodan-Lillian.nix (100%) rename home-manager/{program-configs => package-configs}/zsh.nix (100%) rename nixos/{shared-desktop => desktop}/configuration.nix (100%) rename nixos/{ => hosts}/EDI/configuration.nix (100%) rename nixos/{ => hosts}/EDI/hardware-configuration.nix (100%) rename secrets/EDI-Lillian.yaml => nixos/hosts/EDI/secrets/sops.yaml (100%) rename nixos/{ => hosts}/GLaDOS/configuration.nix (100%) rename nixos/{ => hosts}/GLaDOS/hardware-configuration.nix (100%) rename nixos/{ => hosts}/queen/configuration.nix (91%) rename nixos/{ => hosts}/queen/hardware-configuration.nix (100%) rename secrets/queen-Lillian.yaml => nixos/hosts/queen/secrets/sops.yaml (100%) rename nixos/{ => hosts}/shodan/configuration.nix (100%) rename nixos/{ => hosts}/shodan/hardware-configuration.nix (100%) rename nixos/{queen/akkoma.nix => package-configs/akkoma/configuration.nix} (100%) rename nixos/{queen/gittea.nix => package-configs/gitea/configuration.nix} (100%) rename nixos/{queen/gotosocial.nix => package-configs/gotosocial/configuration.nix} (100%) rename nixos/{queen/mail-server.nix => package-configs/mail-server/configuration.nix} (100%) rename nixos/{queen/nextcloud.nix => package-configs/nextcloud/configuration.nix} (100%) rename nixos/{queen/postgres.nix => package-configs/postgres/configuration.nix} (100%) rename nixos/{upgrade/postgresql.nix => package-configs/postgres/upgrade.nix} (100%) rename nixos/{queen/webmail.nix => package-configs/roundcube/configuration.nix} (100%) diff --git a/flake.nix b/flake.nix index 124844a..45f7a4f 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < - ./nixos/EDI/configuration.nix + ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops ]; }; @@ -76,7 +76,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < - ./nixos/GLaDOS/configuration.nix + ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops ]; }; @@ -87,7 +87,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < - ./nixos/queen/configuration.nix + ./nixos/hosts/queen/configuration.nix sops-nix.nixosModules.sops ]; }; @@ -98,7 +98,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < - ./nixos/shodan/configuration.nix + ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops ]; }; diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop/configuration.nix similarity index 99% rename from home-manager/desktop-shared.nix rename to home-manager/desktop/configuration.nix index 86a6be5..f34a413 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop/configuration.nix @@ -16,7 +16,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./program-configs/zsh.nix + ./package-configs/zsh.nix ]; nixpkgs = { # You can add overlays here diff --git a/home-manager/EDI-Lillian.nix b/home-manager/hosts/EDI/EDI-Lillian.nix similarity index 95% rename from home-manager/EDI-Lillian.nix rename to home-manager/hosts/EDI/EDI-Lillian.nix index fb6fcb7..b59fd8c 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/hosts/EDI/EDI-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./desktop-shared.nix + ../../desktop/configuration.nix ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix similarity index 95% rename from home-manager/GLaDOS-Lillian.nix rename to home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index 7d0d024..e6b32ab 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./desktop-shared.nix + ../../desktop/configuration.nix ]; home.packages = with pkgs; [ diff --git a/home-manager/queen-Lillian.nix b/home-manager/hosts/queen/queen-Lillian.nix similarity index 98% rename from home-manager/queen-Lillian.nix rename to home-manager/hosts/queen/queen-Lillian.nix index 3eed06c..2f6c55f 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/hosts/queen/queen-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./program-configs/zsh.nix + ./package-configs/zsh.nix ]; nixpkgs = { diff --git a/home-manager/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix similarity index 100% rename from home-manager/shodan-Lillian.nix rename to home-manager/hosts/shodan/shodan-Lillian.nix diff --git a/home-manager/program-configs/zsh.nix b/home-manager/package-configs/zsh.nix similarity index 100% rename from home-manager/program-configs/zsh.nix rename to home-manager/package-configs/zsh.nix diff --git a/nixos/shared-desktop/configuration.nix b/nixos/desktop/configuration.nix similarity index 100% rename from nixos/shared-desktop/configuration.nix rename to nixos/desktop/configuration.nix diff --git a/nixos/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix similarity index 100% rename from nixos/EDI/configuration.nix rename to nixos/hosts/EDI/configuration.nix diff --git a/nixos/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix similarity index 100% rename from nixos/EDI/hardware-configuration.nix rename to nixos/hosts/EDI/hardware-configuration.nix diff --git a/secrets/EDI-Lillian.yaml b/nixos/hosts/EDI/secrets/sops.yaml similarity index 100% rename from secrets/EDI-Lillian.yaml rename to nixos/hosts/EDI/secrets/sops.yaml diff --git a/nixos/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix similarity index 100% rename from nixos/GLaDOS/configuration.nix rename to nixos/hosts/GLaDOS/configuration.nix diff --git a/nixos/GLaDOS/hardware-configuration.nix b/nixos/hosts/GLaDOS/hardware-configuration.nix similarity index 100% rename from nixos/GLaDOS/hardware-configuration.nix rename to nixos/hosts/GLaDOS/hardware-configuration.nix diff --git a/nixos/queen/configuration.nix b/nixos/hosts/queen/configuration.nix similarity index 91% rename from nixos/queen/configuration.nix rename to nixos/hosts/queen/configuration.nix index 717609e..d1474d7 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -16,13 +16,14 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix - ./postgres.nix - ./nextcloud.nix - ./mail-server.nix - ./webmail.nix - ./gotosocial.nix - ../upgrade/postgresql.nix - ./akkoma.nix + ../../package-configs/akkoma/configuration.nix + ../../package-configs/gitea/configuration.nix + ../../package-configs/gotosocial/configuration.nix + ../../package-configs/mail-server/configuration.nix + ../../package-configs/nextcloud/configuration.nix + ../../package-configs/postgres/configuration.nix + ../../package-configs/postgres/upgrade.nix + ../../package-configs/roundcube/configuration.nix ]; boot.tmp.cleanOnBoot = true; @@ -56,7 +57,7 @@ }; #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys - sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; + sops.defaultSopsFile = ./secrets/sops.yaml; sops.age.keyFile = ./keys.txt; nix = { diff --git a/nixos/queen/hardware-configuration.nix b/nixos/hosts/queen/hardware-configuration.nix similarity index 100% rename from nixos/queen/hardware-configuration.nix rename to nixos/hosts/queen/hardware-configuration.nix diff --git a/secrets/queen-Lillian.yaml b/nixos/hosts/queen/secrets/sops.yaml similarity index 100% rename from secrets/queen-Lillian.yaml rename to nixos/hosts/queen/secrets/sops.yaml diff --git a/nixos/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix similarity index 100% rename from nixos/shodan/configuration.nix rename to nixos/hosts/shodan/configuration.nix diff --git a/nixos/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix similarity index 100% rename from nixos/shodan/hardware-configuration.nix rename to nixos/hosts/shodan/hardware-configuration.nix diff --git a/nixos/queen/akkoma.nix b/nixos/package-configs/akkoma/configuration.nix similarity index 100% rename from nixos/queen/akkoma.nix rename to nixos/package-configs/akkoma/configuration.nix diff --git a/nixos/queen/gittea.nix b/nixos/package-configs/gitea/configuration.nix similarity index 100% rename from nixos/queen/gittea.nix rename to nixos/package-configs/gitea/configuration.nix diff --git a/nixos/queen/gotosocial.nix b/nixos/package-configs/gotosocial/configuration.nix similarity index 100% rename from nixos/queen/gotosocial.nix rename to nixos/package-configs/gotosocial/configuration.nix diff --git a/nixos/queen/mail-server.nix b/nixos/package-configs/mail-server/configuration.nix similarity index 100% rename from nixos/queen/mail-server.nix rename to nixos/package-configs/mail-server/configuration.nix diff --git a/nixos/queen/nextcloud.nix b/nixos/package-configs/nextcloud/configuration.nix similarity index 100% rename from nixos/queen/nextcloud.nix rename to nixos/package-configs/nextcloud/configuration.nix diff --git a/nixos/queen/postgres.nix b/nixos/package-configs/postgres/configuration.nix similarity index 100% rename from nixos/queen/postgres.nix rename to nixos/package-configs/postgres/configuration.nix diff --git a/nixos/upgrade/postgresql.nix b/nixos/package-configs/postgres/upgrade.nix similarity index 100% rename from nixos/upgrade/postgresql.nix rename to nixos/package-configs/postgres/upgrade.nix diff --git a/nixos/queen/webmail.nix b/nixos/package-configs/roundcube/configuration.nix similarity index 100% rename from nixos/queen/webmail.nix rename to nixos/package-configs/roundcube/configuration.nix From 81460a2b8ff3ff073b112830f2e395a55f6a75e9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 12:47:58 +0100 Subject: [PATCH 0674/2308] Big refactor, need to test still --- flake.nix | 8 ++++---- .../configuration.nix} | 2 +- home-manager/{ => hosts/EDI}/EDI-Lillian.nix | 2 +- .../{ => hosts/GLaDOS}/GLaDOS-Lillian.nix | 2 +- .../{ => hosts/queen}/queen-Lillian.nix | 2 +- .../{ => hosts/shodan}/shodan-Lillian.nix | 0 .../zsh.nix | 0 .../configuration.nix | 0 nixos/{ => hosts}/EDI/configuration.nix | 0 .../{ => hosts}/EDI/hardware-configuration.nix | 0 .../hosts/EDI/secrets/sops.yaml | 0 nixos/{ => hosts}/GLaDOS/configuration.nix | 0 .../GLaDOS/hardware-configuration.nix | 0 nixos/{ => hosts}/queen/configuration.nix | 17 +++++++++-------- .../queen/hardware-configuration.nix | 0 .../hosts/queen/secrets/sops.yaml | 0 nixos/{ => hosts}/shodan/configuration.nix | 0 .../shodan/hardware-configuration.nix | 0 .../akkoma/configuration.nix} | 0 .../gitea/configuration.nix} | 0 .../gotosocial/configuration.nix} | 0 .../mail-server/configuration.nix} | 0 .../nextcloud/configuration.nix} | 0 .../postgres/configuration.nix} | 0 .../postgres/upgrade.nix} | 0 .../roundcube/configuration.nix} | 0 26 files changed, 17 insertions(+), 16 deletions(-) rename home-manager/{desktop-shared.nix => desktop/configuration.nix} (99%) rename home-manager/{ => hosts/EDI}/EDI-Lillian.nix (95%) rename home-manager/{ => hosts/GLaDOS}/GLaDOS-Lillian.nix (95%) rename home-manager/{ => hosts/queen}/queen-Lillian.nix (98%) rename home-manager/{ => hosts/shodan}/shodan-Lillian.nix (100%) rename home-manager/{program-configs => package-configs}/zsh.nix (100%) rename nixos/{shared-desktop => desktop}/configuration.nix (100%) rename nixos/{ => hosts}/EDI/configuration.nix (100%) rename nixos/{ => hosts}/EDI/hardware-configuration.nix (100%) rename secrets/EDI-Lillian.yaml => nixos/hosts/EDI/secrets/sops.yaml (100%) rename nixos/{ => hosts}/GLaDOS/configuration.nix (100%) rename nixos/{ => hosts}/GLaDOS/hardware-configuration.nix (100%) rename nixos/{ => hosts}/queen/configuration.nix (91%) rename nixos/{ => hosts}/queen/hardware-configuration.nix (100%) rename secrets/queen-Lillian.yaml => nixos/hosts/queen/secrets/sops.yaml (100%) rename nixos/{ => hosts}/shodan/configuration.nix (100%) rename nixos/{ => hosts}/shodan/hardware-configuration.nix (100%) rename nixos/{queen/akkoma.nix => package-configs/akkoma/configuration.nix} (100%) rename nixos/{queen/gittea.nix => package-configs/gitea/configuration.nix} (100%) rename nixos/{queen/gotosocial.nix => package-configs/gotosocial/configuration.nix} (100%) rename nixos/{queen/mail-server.nix => package-configs/mail-server/configuration.nix} (100%) rename nixos/{queen/nextcloud.nix => package-configs/nextcloud/configuration.nix} (100%) rename nixos/{queen/postgres.nix => package-configs/postgres/configuration.nix} (100%) rename nixos/{upgrade/postgresql.nix => package-configs/postgres/upgrade.nix} (100%) rename nixos/{queen/webmail.nix => package-configs/roundcube/configuration.nix} (100%) diff --git a/flake.nix b/flake.nix index 124844a..45f7a4f 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < - ./nixos/EDI/configuration.nix + ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops ]; }; @@ -76,7 +76,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < - ./nixos/GLaDOS/configuration.nix + ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops ]; }; @@ -87,7 +87,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < - ./nixos/queen/configuration.nix + ./nixos/hosts/queen/configuration.nix sops-nix.nixosModules.sops ]; }; @@ -98,7 +98,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < - ./nixos/shodan/configuration.nix + ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops ]; }; diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop/configuration.nix similarity index 99% rename from home-manager/desktop-shared.nix rename to home-manager/desktop/configuration.nix index 86a6be5..f34a413 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop/configuration.nix @@ -16,7 +16,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./program-configs/zsh.nix + ./package-configs/zsh.nix ]; nixpkgs = { # You can add overlays here diff --git a/home-manager/EDI-Lillian.nix b/home-manager/hosts/EDI/EDI-Lillian.nix similarity index 95% rename from home-manager/EDI-Lillian.nix rename to home-manager/hosts/EDI/EDI-Lillian.nix index fb6fcb7..b59fd8c 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/hosts/EDI/EDI-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./desktop-shared.nix + ../../desktop/configuration.nix ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix similarity index 95% rename from home-manager/GLaDOS-Lillian.nix rename to home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index 7d0d024..e6b32ab 100644 --- a/home-manager/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./desktop-shared.nix + ../../desktop/configuration.nix ]; home.packages = with pkgs; [ diff --git a/home-manager/queen-Lillian.nix b/home-manager/hosts/queen/queen-Lillian.nix similarity index 98% rename from home-manager/queen-Lillian.nix rename to home-manager/hosts/queen/queen-Lillian.nix index 3eed06c..2f6c55f 100644 --- a/home-manager/queen-Lillian.nix +++ b/home-manager/hosts/queen/queen-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./program-configs/zsh.nix + ./package-configs/zsh.nix ]; nixpkgs = { diff --git a/home-manager/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix similarity index 100% rename from home-manager/shodan-Lillian.nix rename to home-manager/hosts/shodan/shodan-Lillian.nix diff --git a/home-manager/program-configs/zsh.nix b/home-manager/package-configs/zsh.nix similarity index 100% rename from home-manager/program-configs/zsh.nix rename to home-manager/package-configs/zsh.nix diff --git a/nixos/shared-desktop/configuration.nix b/nixos/desktop/configuration.nix similarity index 100% rename from nixos/shared-desktop/configuration.nix rename to nixos/desktop/configuration.nix diff --git a/nixos/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix similarity index 100% rename from nixos/EDI/configuration.nix rename to nixos/hosts/EDI/configuration.nix diff --git a/nixos/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix similarity index 100% rename from nixos/EDI/hardware-configuration.nix rename to nixos/hosts/EDI/hardware-configuration.nix diff --git a/secrets/EDI-Lillian.yaml b/nixos/hosts/EDI/secrets/sops.yaml similarity index 100% rename from secrets/EDI-Lillian.yaml rename to nixos/hosts/EDI/secrets/sops.yaml diff --git a/nixos/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix similarity index 100% rename from nixos/GLaDOS/configuration.nix rename to nixos/hosts/GLaDOS/configuration.nix diff --git a/nixos/GLaDOS/hardware-configuration.nix b/nixos/hosts/GLaDOS/hardware-configuration.nix similarity index 100% rename from nixos/GLaDOS/hardware-configuration.nix rename to nixos/hosts/GLaDOS/hardware-configuration.nix diff --git a/nixos/queen/configuration.nix b/nixos/hosts/queen/configuration.nix similarity index 91% rename from nixos/queen/configuration.nix rename to nixos/hosts/queen/configuration.nix index 717609e..d1474d7 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -16,13 +16,14 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix - ./postgres.nix - ./nextcloud.nix - ./mail-server.nix - ./webmail.nix - ./gotosocial.nix - ../upgrade/postgresql.nix - ./akkoma.nix + ../../package-configs/akkoma/configuration.nix + ../../package-configs/gitea/configuration.nix + ../../package-configs/gotosocial/configuration.nix + ../../package-configs/mail-server/configuration.nix + ../../package-configs/nextcloud/configuration.nix + ../../package-configs/postgres/configuration.nix + ../../package-configs/postgres/upgrade.nix + ../../package-configs/roundcube/configuration.nix ]; boot.tmp.cleanOnBoot = true; @@ -56,7 +57,7 @@ }; #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys - sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml; + sops.defaultSopsFile = ./secrets/sops.yaml; sops.age.keyFile = ./keys.txt; nix = { diff --git a/nixos/queen/hardware-configuration.nix b/nixos/hosts/queen/hardware-configuration.nix similarity index 100% rename from nixos/queen/hardware-configuration.nix rename to nixos/hosts/queen/hardware-configuration.nix diff --git a/secrets/queen-Lillian.yaml b/nixos/hosts/queen/secrets/sops.yaml similarity index 100% rename from secrets/queen-Lillian.yaml rename to nixos/hosts/queen/secrets/sops.yaml diff --git a/nixos/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix similarity index 100% rename from nixos/shodan/configuration.nix rename to nixos/hosts/shodan/configuration.nix diff --git a/nixos/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix similarity index 100% rename from nixos/shodan/hardware-configuration.nix rename to nixos/hosts/shodan/hardware-configuration.nix diff --git a/nixos/queen/akkoma.nix b/nixos/package-configs/akkoma/configuration.nix similarity index 100% rename from nixos/queen/akkoma.nix rename to nixos/package-configs/akkoma/configuration.nix diff --git a/nixos/queen/gittea.nix b/nixos/package-configs/gitea/configuration.nix similarity index 100% rename from nixos/queen/gittea.nix rename to nixos/package-configs/gitea/configuration.nix diff --git a/nixos/queen/gotosocial.nix b/nixos/package-configs/gotosocial/configuration.nix similarity index 100% rename from nixos/queen/gotosocial.nix rename to nixos/package-configs/gotosocial/configuration.nix diff --git a/nixos/queen/mail-server.nix b/nixos/package-configs/mail-server/configuration.nix similarity index 100% rename from nixos/queen/mail-server.nix rename to nixos/package-configs/mail-server/configuration.nix diff --git a/nixos/queen/nextcloud.nix b/nixos/package-configs/nextcloud/configuration.nix similarity index 100% rename from nixos/queen/nextcloud.nix rename to nixos/package-configs/nextcloud/configuration.nix diff --git a/nixos/queen/postgres.nix b/nixos/package-configs/postgres/configuration.nix similarity index 100% rename from nixos/queen/postgres.nix rename to nixos/package-configs/postgres/configuration.nix diff --git a/nixos/upgrade/postgresql.nix b/nixos/package-configs/postgres/upgrade.nix similarity index 100% rename from nixos/upgrade/postgresql.nix rename to nixos/package-configs/postgres/upgrade.nix diff --git a/nixos/queen/webmail.nix b/nixos/package-configs/roundcube/configuration.nix similarity index 100% rename from nixos/queen/webmail.nix rename to nixos/package-configs/roundcube/configuration.nix From c7ebfb3c28ba82095145fb93759430661185bdf1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 22:10:17 +0100 Subject: [PATCH 0675/2308] small relative path fix --- home-manager/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index f34a413..b26fcb5 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -16,7 +16,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./package-configs/zsh.nix + ../package-configs/zsh.nix ]; nixpkgs = { # You can add overlays here From 6bde188e7b81de374b942d939faad0b619042c24 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 22:10:17 +0100 Subject: [PATCH 0676/2308] small relative path fix --- home-manager/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index f34a413..b26fcb5 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -16,7 +16,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./package-configs/zsh.nix + ../package-configs/zsh.nix ]; nixpkgs = { # You can add overlays here From 69acb9827a2d10f51c0bfc76fc6c6072840e407e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 22:18:15 +0100 Subject: [PATCH 0677/2308] Another relative path fix --- nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index c291657..b582ade 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - .././shared-desktop/configuration.nix + ../../desktop/configuration.nix # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index a5614d9..321c641 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - .././shared-desktop/configuration.nix + ../../desktop/configuration.nix # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix From 556529a99239b3f0b720fe70cbe8a1a423cef495 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 22:18:15 +0100 Subject: [PATCH 0678/2308] Another relative path fix --- nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index c291657..b582ade 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - .././shared-desktop/configuration.nix + ../../desktop/configuration.nix # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index a5614d9..321c641 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - .././shared-desktop/configuration.nix + ../../desktop/configuration.nix # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix From f2210d4e0a2f0f9f2ad6c08364152eae4bc1be3c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 22:21:31 +0100 Subject: [PATCH 0679/2308] Home manager link fix --- nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index b582ade..9423047 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -32,7 +32,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../home-manager/EDI-Lillian.nix; + lillian = import ../../../home-manager/hosts/EDI/EDI-Lillian.nix; }; }; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 321c641..730f894 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -32,7 +32,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../home-manager/GLaDOS-Lillian.nix; + lillian = import ../../../home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix; }; }; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index d1474d7..2b10e20 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -176,7 +176,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../home-manager/queen-Lillian.nix; + lillian = import ../../../home-manager/hosts/queen/queen-Lillian.nix; }; }; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 9e0612b..02be3e6 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -232,7 +232,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../home-manager/shodan-Lillian.nix; + lillian = import ../../../home-manager/hosts/shodan/shodan-Lillian.nix; }; }; From 433eef0e6628b6d85c756e75e1c1ec2713465f57 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 22:21:31 +0100 Subject: [PATCH 0680/2308] Home manager link fix --- nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index b582ade..9423047 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -32,7 +32,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../home-manager/EDI-Lillian.nix; + lillian = import ../../../home-manager/hosts/EDI/EDI-Lillian.nix; }; }; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 321c641..730f894 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -32,7 +32,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../home-manager/GLaDOS-Lillian.nix; + lillian = import ../../../home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix; }; }; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index d1474d7..2b10e20 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -176,7 +176,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../home-manager/queen-Lillian.nix; + lillian = import ../../../home-manager/hosts/queen/queen-Lillian.nix; }; }; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 9e0612b..02be3e6 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -232,7 +232,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../home-manager/shodan-Lillian.nix; + lillian = import ../../../home-manager/hosts/shodan/shodan-Lillian.nix; }; }; From ed17487fdfcf43694c6d9b459f40b1d6fb35ffdc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 22:22:39 +0100 Subject: [PATCH 0681/2308] Fix again --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 02be3e6..4cacc6e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -62,7 +62,7 @@ }; #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys - sops.defaultSopsFile = ../../secrets/shodan-Lillian.yaml; + sops.defaultSopsFile = ./secrets/sops.yaml; sops.age.keyFile = ./keys.txt; nix = { From 865495cc1d3d5f11943eebf8a1b90b41d427b3b0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 22:22:39 +0100 Subject: [PATCH 0682/2308] Fix again --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 02be3e6..4cacc6e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -62,7 +62,7 @@ }; #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys - sops.defaultSopsFile = ../../secrets/shodan-Lillian.yaml; + sops.defaultSopsFile = ./secrets/sops.yaml; sops.age.keyFile = ./keys.txt; nix = { From be2ff71ee5f3a390a66868c095310ad4771a27d3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 22:34:14 +0100 Subject: [PATCH 0683/2308] set pass in sops --- nixos/hosts/shodan/secrets/sops.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 nixos/hosts/shodan/secrets/sops.yaml diff --git a/nixos/hosts/shodan/secrets/sops.yaml b/nixos/hosts/shodan/secrets/sops.yaml new file mode 100644 index 0000000..45ec605 --- /dev/null +++ b/nixos/hosts/shodan/secrets/sops.yaml @@ -0,0 +1,21 @@ +pass: ENC[AES256_GCM,data:M7V75Q7I,iv:d59fWvFsEOOu8A+BSK0f2ZskX1SXHN1wA3EfGGsHp70=,tag:FLTogvUgI3HdKYWCJc/M1Q==,type:int] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUMmlWMEsrVHhYT2ZuN05a + alAzNWlPMDVJeVdGMTQzQXNlTmw0V3E3UHljCmQ3WnNuY0liOGtqdmNiRmQyV1RN + d0ZKQVUyeWFjOXpXWVVSSFlPVXhjUmcKLS0tIFA0RkltN01XVXZnR3p4SWxkVnAr + KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz + NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-12-28T21:33:20Z" + mac: ENC[AES256_GCM,data:4tFAJCqCAfqlIGj7kDQ9uoUg7TgXYgogkm/h0nP6fuedKiV/CRmD8CbdWInesaDP276pggZbtUY9I92pV8bpJ2h+U07qihTo79ZTPTsObUHQrrc002ZiYwCtI+14t1+2KuTQNpEJsZxoECjG1R0mjg3Zv8MQ0wj6YpnEaGmXkC0=,iv:roPZJXFjB7lLK4RQcmQaNOq5RRCvguNO4O2iasgolEU=,tag:j7G0HvAx6XqrijyZcqntXQ==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 From c0a6cf015b3c70b31f0bfc9a4a73e64167bbe06e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Dec 2023 22:34:14 +0100 Subject: [PATCH 0684/2308] set pass in sops --- nixos/hosts/shodan/secrets/sops.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 nixos/hosts/shodan/secrets/sops.yaml diff --git a/nixos/hosts/shodan/secrets/sops.yaml b/nixos/hosts/shodan/secrets/sops.yaml new file mode 100644 index 0000000..45ec605 --- /dev/null +++ b/nixos/hosts/shodan/secrets/sops.yaml @@ -0,0 +1,21 @@ +pass: ENC[AES256_GCM,data:M7V75Q7I,iv:d59fWvFsEOOu8A+BSK0f2ZskX1SXHN1wA3EfGGsHp70=,tag:FLTogvUgI3HdKYWCJc/M1Q==,type:int] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUMmlWMEsrVHhYT2ZuN05a + alAzNWlPMDVJeVdGMTQzQXNlTmw0V3E3UHljCmQ3WnNuY0liOGtqdmNiRmQyV1RN + d0ZKQVUyeWFjOXpXWVVSSFlPVXhjUmcKLS0tIFA0RkltN01XVXZnR3p4SWxkVnAr + KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz + NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-12-28T21:33:20Z" + mac: ENC[AES256_GCM,data:4tFAJCqCAfqlIGj7kDQ9uoUg7TgXYgogkm/h0nP6fuedKiV/CRmD8CbdWInesaDP276pggZbtUY9I92pV8bpJ2h+U07qihTo79ZTPTsObUHQrrc002ZiYwCtI+14t1+2KuTQNpEJsZxoECjG1R0mjg3Zv8MQ0wj6YpnEaGmXkC0=,iv:roPZJXFjB7lLK4RQcmQaNOq5RRCvguNO4O2iasgolEU=,tag:j7G0HvAx6XqrijyZcqntXQ==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 From 640769f0405f1e6a94f6853596b32528b3b48626 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:07:52 +0100 Subject: [PATCH 0685/2308] Update flake lock, remove system steam desktop --- flake.lock | 18 +++++++++--------- nixos/desktop/configuration.nix | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 7706688..2134f38 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1703527373, - "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", + "lastModified": 1703838268, + "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", + "rev": "2aff324cf65f5f98f89d878c056b779466b17db8", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1703438236, + "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1703438236, + "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", "type": "github" }, "original": { diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 65782dd..9d722f7 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -79,7 +79,6 @@ oh-my-zsh pciutils rsync - steam sqlfluff wget zsh From c410d3d964cfc473e0c747a06cb8b554b2ae6a6d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:07:52 +0100 Subject: [PATCH 0686/2308] Update flake lock, remove system steam desktop --- flake.lock | 18 +++++++++--------- nixos/desktop/configuration.nix | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 7706688..2134f38 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1703527373, - "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", + "lastModified": 1703838268, + "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", + "rev": "2aff324cf65f5f98f89d878c056b779466b17db8", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1703438236, + "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1703438236, + "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", "type": "github" }, "original": { diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 65782dd..9d722f7 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -79,7 +79,6 @@ oh-my-zsh pciutils rsync - steam sqlfluff wget zsh From 46895b6646ec1d4e8b1ed5962e1e9abc7cfa3e0d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:15:16 +0100 Subject: [PATCH 0687/2308] Wrong relative path for that zsh.nix --- home-manager/hosts/queen/queen-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hosts/queen/queen-Lillian.nix b/home-manager/hosts/queen/queen-Lillian.nix index 2f6c55f..97d97ad 100644 --- a/home-manager/hosts/queen/queen-Lillian.nix +++ b/home-manager/hosts/queen/queen-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./package-configs/zsh.nix + ../../package-configs/zsh.nix ]; nixpkgs = { From a9e68f811da3f45efffcfc08bd5e2d8640b04fb8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:15:16 +0100 Subject: [PATCH 0688/2308] Wrong relative path for that zsh.nix --- home-manager/hosts/queen/queen-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hosts/queen/queen-Lillian.nix b/home-manager/hosts/queen/queen-Lillian.nix index 2f6c55f..97d97ad 100644 --- a/home-manager/hosts/queen/queen-Lillian.nix +++ b/home-manager/hosts/queen/queen-Lillian.nix @@ -18,7 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./package-configs/zsh.nix + ../../package-configs/zsh.nix ]; nixpkgs = { From 453caa9d4310d678eeed491ad9b1284b30f819b5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:20:29 +0100 Subject: [PATCH 0689/2308] Look for secrets on the file system --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 2b10e20..b2c23b1 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -58,7 +58,7 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ./secrets/sops.yaml; - sops.age.keyFile = ./keys.txt; + sops.age.keyFile = ../../../../../var/secrets/keys.txt; nix = { gc = { From c688903079962186aac729edd7df111c08f491b0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:20:29 +0100 Subject: [PATCH 0690/2308] Look for secrets on the file system --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 2b10e20..b2c23b1 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -58,7 +58,7 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ./secrets/sops.yaml; - sops.age.keyFile = ./keys.txt; + sops.age.keyFile = ../../../../../var/secrets/keys.txt; nix = { gc = { From a0a6416803d1175fcb36f2d6e8b2329feeca7b89 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:27:07 +0100 Subject: [PATCH 0691/2308] Updated syntax --- nixos/package-configs/gitea/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 238220e..99349ea 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -24,9 +24,9 @@ database = { type = "postgres"; }; - domain = "git.lillianviolet.dev"; - rootUrl = "https://git.lillianviolet.dev/"; - httpPort = 3218; + DOMAIN = "git.lillianviolet.dev"; + ROOT_URL = "https://git.lillianviolet.dev/"; + HTTP_PORT = 3218; }; services.nginx = { From 4606af75a1002ea9f6dc72439f47cf22c4e09d9f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:27:07 +0100 Subject: [PATCH 0692/2308] Updated syntax --- nixos/package-configs/gitea/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 238220e..99349ea 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -24,9 +24,9 @@ database = { type = "postgres"; }; - domain = "git.lillianviolet.dev"; - rootUrl = "https://git.lillianviolet.dev/"; - httpPort = 3218; + DOMAIN = "git.lillianviolet.dev"; + ROOT_URL = "https://git.lillianviolet.dev/"; + HTTP_PORT = 3218; }; services.nginx = { From 59bb7122c64d09fb6cda542681c27c621770dd23 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:28:17 +0100 Subject: [PATCH 0693/2308] Should go in the server block --- nixos/package-configs/gitea/configuration.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 99349ea..e690b68 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -24,9 +24,11 @@ database = { type = "postgres"; }; - DOMAIN = "git.lillianviolet.dev"; - ROOT_URL = "https://git.lillianviolet.dev/"; - HTTP_PORT = 3218; + server = { + DOMAIN = "git.lillianviolet.dev"; + ROOT_URL = "https://git.lillianviolet.dev/"; + HTTP_PORT = 3218; + }; }; services.nginx = { From 0b41e73132167289b58ddca8f2f4052bc2943398 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:28:17 +0100 Subject: [PATCH 0694/2308] Should go in the server block --- nixos/package-configs/gitea/configuration.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 99349ea..e690b68 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -24,9 +24,11 @@ database = { type = "postgres"; }; - DOMAIN = "git.lillianviolet.dev"; - ROOT_URL = "https://git.lillianviolet.dev/"; - HTTP_PORT = 3218; + server = { + DOMAIN = "git.lillianviolet.dev"; + ROOT_URL = "https://git.lillianviolet.dev/"; + HTTP_PORT = 3218; + }; }; services.nginx = { From 950a298fbd703b42eee92a37dfd9d5a13ddf3a66 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:29:41 +0100 Subject: [PATCH 0695/2308] Disable registration too --- nixos/package-configs/gitea/configuration.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index e690b68..2c9f7a4 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -24,10 +24,13 @@ database = { type = "postgres"; }; - server = { - DOMAIN = "git.lillianviolet.dev"; - ROOT_URL = "https://git.lillianviolet.dev/"; - HTTP_PORT = 3218; + settings = { + service.DISABLE_REGISTRATION = true; + server = { + DOMAIN = "git.lillianviolet.dev"; + ROOT_URL = "https://git.lillianviolet.dev/"; + HTTP_PORT = 3218; + }; }; }; From 903657f43cdc4fbcf2eb35985127216cce5839f2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:29:41 +0100 Subject: [PATCH 0696/2308] Disable registration too --- nixos/package-configs/gitea/configuration.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index e690b68..2c9f7a4 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -24,10 +24,13 @@ database = { type = "postgres"; }; - server = { - DOMAIN = "git.lillianviolet.dev"; - ROOT_URL = "https://git.lillianviolet.dev/"; - HTTP_PORT = 3218; + settings = { + service.DISABLE_REGISTRATION = true; + server = { + DOMAIN = "git.lillianviolet.dev"; + ROOT_URL = "https://git.lillianviolet.dev/"; + HTTP_PORT = 3218; + }; }; }; From 52fa8bd7ade55baa238dc64275527724f65ee2b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:31:56 +0100 Subject: [PATCH 0697/2308] Enable registration for sone second ;) --- nixos/package-configs/gitea/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 2c9f7a4..0e5bfb7 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -25,7 +25,7 @@ type = "postgres"; }; settings = { - service.DISABLE_REGISTRATION = true; + service.DISABLE_REGISTRATION = false; server = { DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; From 2de4ecc8e9e194caeb216ba417c4b51580e4cac8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:31:56 +0100 Subject: [PATCH 0698/2308] Enable registration for sone second ;) --- nixos/package-configs/gitea/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 2c9f7a4..0e5bfb7 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -25,7 +25,7 @@ type = "postgres"; }; settings = { - service.DISABLE_REGISTRATION = true; + service.DISABLE_REGISTRATION = false; server = { DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; From fdfe6643274da8bb206b4b941192d8fd99c2f393 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:35:47 +0100 Subject: [PATCH 0699/2308] =?UTF-8?q?And=20now=20we=20disable=20it=20again?= =?UTF-8?q?=20=F0=9F=98=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nixos/package-configs/gitea/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 0e5bfb7..2c9f7a4 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -25,7 +25,7 @@ type = "postgres"; }; settings = { - service.DISABLE_REGISTRATION = false; + service.DISABLE_REGISTRATION = true; server = { DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; From fedd4d5434d1f973f8e38b11027a01c954b7c94d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Dec 2023 23:35:47 +0100 Subject: [PATCH 0700/2308] =?UTF-8?q?And=20now=20we=20disable=20it=20again?= =?UTF-8?q?=20=F0=9F=98=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nixos/package-configs/gitea/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 0e5bfb7..2c9f7a4 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -25,7 +25,7 @@ type = "postgres"; }; settings = { - service.DISABLE_REGISTRATION = false; + service.DISABLE_REGISTRATION = true; server = { DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; From d3509bcb83e9ce33f520f4b0df77b55329f86b44 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 00:24:45 +0100 Subject: [PATCH 0701/2308] Set push to create to true --- nixos/package-configs/gitea/configuration.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 2c9f7a4..3e4f2b1 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -25,6 +25,23 @@ type = "postgres"; }; settings = { + "cron.sync_external_users" = { + RUN_AT_START = true; + SCHEDULE = "@every 24h"; + UPDATE_EXISTING = true; + }; + mailer = { + ENABLED = true; + MAILER_TYPE = "sendmail"; + FROM = "no-reply@git.lillianviolet.dev"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + }; + repository = { + ENABLE_PUSH_CREATE_USER = true; + }; + other = { + SHOW_FOOTER_VERSION = false; + }; service.DISABLE_REGISTRATION = true; server = { DOMAIN = "git.lillianviolet.dev"; From 2563e2af2261e11ee1f8335893c67b8f5e2aada1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 00:24:45 +0100 Subject: [PATCH 0702/2308] Set push to create to true --- nixos/package-configs/gitea/configuration.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 2c9f7a4..3e4f2b1 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -25,6 +25,23 @@ type = "postgres"; }; settings = { + "cron.sync_external_users" = { + RUN_AT_START = true; + SCHEDULE = "@every 24h"; + UPDATE_EXISTING = true; + }; + mailer = { + ENABLED = true; + MAILER_TYPE = "sendmail"; + FROM = "no-reply@git.lillianviolet.dev"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + }; + repository = { + ENABLE_PUSH_CREATE_USER = true; + }; + other = { + SHOW_FOOTER_VERSION = false; + }; service.DISABLE_REGISTRATION = true; server = { DOMAIN = "git.lillianviolet.dev"; From 79dffd7fefbc94d24bfce8df6104794b3766d3fb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 00:28:46 +0100 Subject: [PATCH 0703/2308] Init --- LICENSE | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 + 2 files changed, 235 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2286147 --- /dev/null +++ b/LICENSE @@ -0,0 +1,232 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 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. + + NixOS-Config + Copyright (C) 2023 Lillian-Violet + + 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: + + NixOS-Config Copyright (C) 2023 Lillian-Violet + 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/README.md b/README.md new file mode 100644 index 0000000..99e42c4 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# NixOS-Config + +My NixOS configuration for my different hosts. \ No newline at end of file From 0634562a77affd35eba9bbf1b5dd4f3978e83cb2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 00:28:46 +0100 Subject: [PATCH 0704/2308] Init --- LICENSE | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 + 2 files changed, 235 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2286147 --- /dev/null +++ b/LICENSE @@ -0,0 +1,232 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 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. + + NixOS-Config + Copyright (C) 2023 Lillian-Violet + + 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: + + NixOS-Config Copyright (C) 2023 Lillian-Violet + 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/README.md b/README.md new file mode 100644 index 0000000..99e42c4 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# NixOS-Config + +My NixOS configuration for my different hosts. \ No newline at end of file From 4edde2ef04d3cfba5203e86dfab75b1446dd8647 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 14:44:02 +0100 Subject: [PATCH 0705/2308] Add true hardware config --- nixos/hosts/shodan/hardware-configuration.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix index f0da945..dbd00de 100644 --- a/nixos/hosts/shodan/hardware-configuration.nix +++ b/nixos/hosts/shodan/hardware-configuration.nix @@ -18,16 +18,18 @@ boot.extraModulePackages = []; fileSystems."/" = { - device = "/dev/disk/by-uuid/19a654d6-c3c7-44fb-9752-fbc6bd7024a2"; + device = "/dev/disk/by-uuid/b29d5a9c-a4a6-4321-a767-27ed928cfa94"; fsType = "ext4"; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/5636-9CA7"; + device = "/dev/disk/by-uuid/ABC6-B031"; fsType = "vfat"; }; - swapDevices = []; + swapDevices = [ + {device = "/dev/disk/by-uuid/c0c87d80-b6be-444a-a76f-b32d35c38994";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From 384a4c444b020c3b8035e0a906e8106d0dcb3617 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 14:44:02 +0100 Subject: [PATCH 0706/2308] Add true hardware config --- nixos/hosts/shodan/hardware-configuration.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix index f0da945..dbd00de 100644 --- a/nixos/hosts/shodan/hardware-configuration.nix +++ b/nixos/hosts/shodan/hardware-configuration.nix @@ -18,16 +18,18 @@ boot.extraModulePackages = []; fileSystems."/" = { - device = "/dev/disk/by-uuid/19a654d6-c3c7-44fb-9752-fbc6bd7024a2"; + device = "/dev/disk/by-uuid/b29d5a9c-a4a6-4321-a767-27ed928cfa94"; fsType = "ext4"; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/5636-9CA7"; + device = "/dev/disk/by-uuid/ABC6-B031"; fsType = "vfat"; }; - swapDevices = []; + swapDevices = [ + {device = "/dev/disk/by-uuid/c0c87d80-b6be-444a-a76f-b32d35c38994";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From 4b165c248bea8d6aa9335caf9e76f60fa9e08314 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 16:30:58 +0100 Subject: [PATCH 0707/2308] Remove regular steam --- nixos/hosts/shodan/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 4cacc6e..b376795 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -114,7 +114,6 @@ libportal-qt5 #Gaming: - steam heroic-unwrapped ]; From 2ce0530827db1091c10055fbc306de65d342f38a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 16:30:58 +0100 Subject: [PATCH 0708/2308] Remove regular steam --- nixos/hosts/shodan/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 4cacc6e..b376795 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -114,7 +114,6 @@ libportal-qt5 #Gaming: - steam heroic-unwrapped ]; From 4d63a5b782ea32d4af9af8a124d36604f4dae908 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 16:39:50 +0100 Subject: [PATCH 0709/2308] Enable steam deck settings --- nixos/hosts/shodan/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b376795..8ec13d4 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -131,6 +131,9 @@ #Enable gyro service for CEMU jovian.devices.steamdeck.enableGyroDsuService = true; + #Enable steam deck specific services + jovian.devices.steamdeck.enable = true; + #Enable auto updates for the BIOS and controller firmware jovian.devices.steamdeck.autoUpdate = true; From a40cd187e5e4a9e5a4424cab1e3157247b91878f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 16:39:50 +0100 Subject: [PATCH 0710/2308] Enable steam deck settings --- nixos/hosts/shodan/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b376795..8ec13d4 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -131,6 +131,9 @@ #Enable gyro service for CEMU jovian.devices.steamdeck.enableGyroDsuService = true; + #Enable steam deck specific services + jovian.devices.steamdeck.enable = true; + #Enable auto updates for the BIOS and controller firmware jovian.devices.steamdeck.autoUpdate = true; From f3c242f5c85d243a58306fdec070431ba488e0ba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 16:45:30 +0100 Subject: [PATCH 0711/2308] Set zsh config for steam deck --- home-manager/hosts/shodan/shodan-Lillian.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 80dae42..6f49213 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -18,6 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix + ../../package-configs/zsh.nix ]; home.packages = with pkgs; [ From d0e0012a8e87748ed303d1464ffeec0ac535db07 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 16:45:30 +0100 Subject: [PATCH 0712/2308] Set zsh config for steam deck --- home-manager/hosts/shodan/shodan-Lillian.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 80dae42..6f49213 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -18,6 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix + ../../package-configs/zsh.nix ]; home.packages = with pkgs; [ From 896a6c2625a2f6ee6911bb9ef800f92519d07b7c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 19:50:53 +0100 Subject: [PATCH 0713/2308] Add btrfs progs --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 8ec13d4..ca39741 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -90,6 +90,7 @@ environment.systemPackages = with pkgs; [ #System: alejandra + btrfs-progs git git-filter-repo home-manager From 5ecf4d17c07676edcf5d1c7d17fa3ee713dadb24 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 19:50:53 +0100 Subject: [PATCH 0714/2308] Add btrfs progs --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 8ec13d4..ca39741 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -90,6 +90,7 @@ environment.systemPackages = with pkgs; [ #System: alejandra + btrfs-progs git git-filter-repo home-manager From 2d34be151ea4a2dfb94f3c3f7b41e100562293de Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 19:51:55 +0100 Subject: [PATCH 0715/2308] Nix flake update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2134f38..0515e2c 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1703637592, + "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1703637592, + "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "type": "github" }, "original": { From 227a5b1f4d557c115437081dbb41472c14aadd75 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 19:51:55 +0100 Subject: [PATCH 0716/2308] Nix flake update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2134f38..0515e2c 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1703637592, + "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1703637592, + "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "type": "github" }, "original": { From 6a4ef2685dd2f609e49e202a07749d649074d911 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 20:14:00 +0100 Subject: [PATCH 0717/2308] Enable home manager on deck --- home-manager/hosts/shodan/shodan-Lillian.nix | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 6f49213..3d2f798 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -20,6 +20,37 @@ # ./nvim.nix ../../package-configs/zsh.nix ]; + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + }; + }; + + home = { + username = "lillian"; + homeDirectory = "/home/lillian"; + }; home.packages = with pkgs; [ #Chat: @@ -51,6 +82,14 @@ ungoogled-chromium ]; + # Enable home-manager and git + programs.home-manager.enable = true; + programs.git = { + enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; + }; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.11"; } From c58d2e351d8a0d38541e98d91c617ecbaeb54b7d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 20:14:00 +0100 Subject: [PATCH 0718/2308] Enable home manager on deck --- home-manager/hosts/shodan/shodan-Lillian.nix | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 6f49213..3d2f798 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -20,6 +20,37 @@ # ./nvim.nix ../../package-configs/zsh.nix ]; + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + # Workaround for https://github.com/nix-community/home-manager/issues/2942 + allowUnfreePredicate = _: true; + }; + }; + + home = { + username = "lillian"; + homeDirectory = "/home/lillian"; + }; home.packages = with pkgs; [ #Chat: @@ -51,6 +82,14 @@ ungoogled-chromium ]; + # Enable home-manager and git + programs.home-manager.enable = true; + programs.git = { + enable = true; + userEmail = "git@gladtherescake.eu"; + userName = "Lillian-Violet"; + }; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "23.11"; } From 5d036f3ee5f3207ea44db01e8c161787fc82a109 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 20:50:34 +0100 Subject: [PATCH 0719/2308] Error message said to use protocol instead --- nixos/package-configs/gitea/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 3e4f2b1..8465219 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -32,7 +32,7 @@ }; mailer = { ENABLED = true; - MAILER_TYPE = "sendmail"; + PROTOCOL = "sendmail"; FROM = "no-reply@git.lillianviolet.dev"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; }; From 97cfff7fcdf1eeed25262635996d81538c6114c0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 20:50:34 +0100 Subject: [PATCH 0720/2308] Error message said to use protocol instead --- nixos/package-configs/gitea/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 3e4f2b1..8465219 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -32,7 +32,7 @@ }; mailer = { ENABLED = true; - MAILER_TYPE = "sendmail"; + PROTOCOL = "sendmail"; FROM = "no-reply@git.lillianviolet.dev"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; }; From 547b2caf0fca8b0649aedc1318526753a6b8c0bf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 23:18:48 +0100 Subject: [PATCH 0721/2308] Add the git no-reply --- nixos/package-configs/mail-server/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/package-configs/mail-server/configuration.nix b/nixos/package-configs/mail-server/configuration.nix index 34f0798..ac9c3a0 100644 --- a/nixos/package-configs/mail-server/configuration.nix +++ b/nixos/package-configs/mail-server/configuration.nix @@ -37,6 +37,7 @@ "akkoma.gladtherescake.eu" "social.gladtherescake.eu" "lillianviolet.dev" + "git.lillianviolet.dev" ]; loginAccounts = { @@ -58,6 +59,9 @@ "lillianviolet.dev" ]; }; + "no-reply@git.lillianviolet.dev" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + }; }; mailboxes = { @@ -91,6 +95,7 @@ "no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu" "no-reply@social.gladtherescake.eu" + "no-reply@git.lillianviolet.dev" ]; certificateScheme = "acme-nginx"; certificateDomains = [ From 9ce3777978df2766b3af352cbe431462d29d5801 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 23:18:48 +0100 Subject: [PATCH 0722/2308] Add the git no-reply --- nixos/package-configs/mail-server/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/package-configs/mail-server/configuration.nix b/nixos/package-configs/mail-server/configuration.nix index 34f0798..ac9c3a0 100644 --- a/nixos/package-configs/mail-server/configuration.nix +++ b/nixos/package-configs/mail-server/configuration.nix @@ -37,6 +37,7 @@ "akkoma.gladtherescake.eu" "social.gladtherescake.eu" "lillianviolet.dev" + "git.lillianviolet.dev" ]; loginAccounts = { @@ -58,6 +59,9 @@ "lillianviolet.dev" ]; }; + "no-reply@git.lillianviolet.dev" = { + hashedPasswordFile = config.sops.secrets."mailpass".path; + }; }; mailboxes = { @@ -91,6 +95,7 @@ "no-reply@nextcloud.gladtherescake.eu" "no-reply@akkoma.gladtherescake.eu" "no-reply@social.gladtherescake.eu" + "no-reply@git.lillianviolet.dev" ]; certificateScheme = "acme-nginx"; certificateDomains = [ From 9ba0b33aea76a2f93c6e0ec62c2131882f550cc5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 23:40:47 +0100 Subject: [PATCH 0723/2308] Try /bin/sendmail --- nixos/package-configs/gitea/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 8465219..85cdff4 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -34,7 +34,7 @@ ENABLED = true; PROTOCOL = "sendmail"; FROM = "no-reply@git.lillianviolet.dev"; - SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + SENDMAIL_PATH = "/run/wrappers/bin/sendmail"; }; repository = { ENABLE_PUSH_CREATE_USER = true; From ede636e352ad2e4da0d7dc956be9b1a6b19fd38c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Dec 2023 23:40:47 +0100 Subject: [PATCH 0724/2308] Try /bin/sendmail --- nixos/package-configs/gitea/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 8465219..85cdff4 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -34,7 +34,7 @@ ENABLED = true; PROTOCOL = "sendmail"; FROM = "no-reply@git.lillianviolet.dev"; - SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + SENDMAIL_PATH = "/run/wrappers/bin/sendmail"; }; repository = { ENABLE_PUSH_CREATE_USER = true; From e0e291b35244794e0e9da0020abd425d27b46487 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Dec 2023 13:42:54 +0100 Subject: [PATCH 0725/2308] Try the sendmail like nextcloud --- nixos/package-configs/gitea/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 85cdff4..1a9f51a 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -34,7 +34,8 @@ ENABLED = true; PROTOCOL = "sendmail"; FROM = "no-reply@git.lillianviolet.dev"; - SENDMAIL_PATH = "/run/wrappers/bin/sendmail"; + SENDMAIL_PATH = "sendmail"; + SENDMAIL_ARGS = "-bs"; }; repository = { ENABLE_PUSH_CREATE_USER = true; From 44edc5ccd8dcf5cf3d0d54a48cbb00773765f4be Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Dec 2023 13:42:54 +0100 Subject: [PATCH 0726/2308] Try the sendmail like nextcloud --- nixos/package-configs/gitea/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/gitea/configuration.nix index 85cdff4..1a9f51a 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/gitea/configuration.nix @@ -34,7 +34,8 @@ ENABLED = true; PROTOCOL = "sendmail"; FROM = "no-reply@git.lillianviolet.dev"; - SENDMAIL_PATH = "/run/wrappers/bin/sendmail"; + SENDMAIL_PATH = "sendmail"; + SENDMAIL_ARGS = "-bs"; }; repository = { ENABLE_PUSH_CREATE_USER = true; From f0dab16d385b1764c288697a7c3dd2e0a8252612 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Dec 2023 14:31:01 +0100 Subject: [PATCH 0727/2308] (more) quiet boot on shodan --- nixos/hosts/shodan/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index ca39741..96afd6a 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -244,6 +244,9 @@ boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; + boot.consoleLogLevel = 0; + boot.kernelParams = ["quiet" "udev.log_priority=0"]; + boot.plymouth.enable = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; From a4c2f17e0566aff3ee8fae190744a9602a6edac1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Dec 2023 14:31:01 +0100 Subject: [PATCH 0728/2308] (more) quiet boot on shodan --- nixos/hosts/shodan/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index ca39741..96afd6a 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -244,6 +244,9 @@ boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; + boot.consoleLogLevel = 0; + boot.kernelParams = ["quiet" "udev.log_priority=0"]; + boot.plymouth.enable = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; From 5ad49f73e48db9d97dce3d29f3311781b99812c3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Dec 2023 15:06:51 +0100 Subject: [PATCH 0729/2308] Try this cursor workaround --- flake.nix | 2 +- nixos/hosts/shodan/configuration.nix | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 45f7a4f..afe71dd 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ # Home manager home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - + extest.url = "github:chaorace/nix-extest/main"; # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 96afd6a..9c9c6a5 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -43,6 +43,7 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.unstable-packages + inputs.extest.overlays.default # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default @@ -139,6 +140,9 @@ jovian.devices.steamdeck.autoUpdate = true; programs.steam = { + override = { + extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; + }; enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server From 033fe461465fe03363e38d24f6c43178baf359d5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Dec 2023 15:06:51 +0100 Subject: [PATCH 0730/2308] Try this cursor workaround --- flake.nix | 2 +- nixos/hosts/shodan/configuration.nix | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 45f7a4f..afe71dd 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ # Home manager home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - + extest.url = "github:chaorace/nix-extest/main"; # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 96afd6a..9c9c6a5 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -43,6 +43,7 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.unstable-packages + inputs.extest.overlays.default # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default @@ -139,6 +140,9 @@ jovian.devices.steamdeck.autoUpdate = true; programs.steam = { + override = { + extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; + }; enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server From b38bb780ee8f2f5698de5632d3c801f218ce5bf6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Dec 2023 15:09:19 +0100 Subject: [PATCH 0731/2308] That was typoed in the readme... --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index afe71dd..0e3b28d 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ # Home manager home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - extest.url = "github:chaorace/nix-extest/main"; + extest.url = "github:chaorace/extest-nix"; # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; From 139496b4d29a3c09fb27f16e8563c8b95ca11afb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Dec 2023 15:09:19 +0100 Subject: [PATCH 0732/2308] That was typoed in the readme... --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index afe71dd..0e3b28d 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ # Home manager home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - extest.url = "github:chaorace/nix-extest/main"; + extest.url = "github:chaorace/extest-nix"; # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; From 5cca8f688d29b154cebd9905e10b2b81549dc5bc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 22:38:38 +0100 Subject: [PATCH 0733/2308] Update flake lock --- flake.lock | 98 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 0515e2c..28d41c8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,40 @@ { "nodes": { + "extest": { + "inputs": { + "extest": "extest_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1701241962, + "narHash": "sha256-zY2MbHEMmGjPObG73aOEGqXxEJTveItYKV8cFL50XnQ=", + "owner": "chaorace", + "repo": "extest-nix", + "rev": "e0c93df813a594a0cd883f6bdd01ec44149206fa", + "type": "github" + }, + "original": { + "owner": "chaorace", + "repo": "extest-nix", + "type": "github" + } + }, + "extest_2": { + "flake": false, + "locked": { + "lastModified": 1703711841, + "narHash": "sha256-ZCHOyAACYoV3wW7en374Kfj0STmi0+72INKGNQkO/rU=", + "owner": "Supreeeme", + "repo": "extest", + "rev": "2a0a1f27239f6307b333a68ca7023ccf90215f3e", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "extest", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -7,11 +42,11 @@ ] }, "locked": { - "lastModified": 1703838268, - "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=", + "lastModified": 1704100519, + "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2aff324cf65f5f98f89d878c056b779466b17db8", + "rev": "6e91c5df192395753d8e6d55a0352109cb559790", "type": "github" }, "original": { @@ -23,27 +58,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", - "owner": "nixos", + "lastModified": 1704008649, + "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1703351344, - "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", + "lastModified": 1703950681, + "narHash": "sha256-veU5bE4eLOmi7aOzhE7LfZXcSOONRMay0BKv01WHojo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", + "rev": "0aad9113182747452dbfc68b93c86e168811fa6c", "type": "github" }, "original": { @@ -55,11 +90,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -71,11 +106,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703134684, - "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1703499205, + "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", + "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", "type": "github" }, "original": { @@ -87,23 +138,24 @@ }, "root": { "inputs": { + "extest": "extest", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1703387502, - "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=", + "lastModified": 1703991717, + "narHash": "sha256-XfBg2dmDJXPQEB8EdNBnzybvnhswaiAkUeeDj7fa/hQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3", + "rev": "cfdbaf68d00bc2f9e071f17ae77be4b27ff72fa6", "type": "github" }, "original": { From 5645c9fd29417933c00396a6784ec9d74ca52b5d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 22:38:38 +0100 Subject: [PATCH 0734/2308] Update flake lock --- flake.lock | 98 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 0515e2c..28d41c8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,40 @@ { "nodes": { + "extest": { + "inputs": { + "extest": "extest_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1701241962, + "narHash": "sha256-zY2MbHEMmGjPObG73aOEGqXxEJTveItYKV8cFL50XnQ=", + "owner": "chaorace", + "repo": "extest-nix", + "rev": "e0c93df813a594a0cd883f6bdd01ec44149206fa", + "type": "github" + }, + "original": { + "owner": "chaorace", + "repo": "extest-nix", + "type": "github" + } + }, + "extest_2": { + "flake": false, + "locked": { + "lastModified": 1703711841, + "narHash": "sha256-ZCHOyAACYoV3wW7en374Kfj0STmi0+72INKGNQkO/rU=", + "owner": "Supreeeme", + "repo": "extest", + "rev": "2a0a1f27239f6307b333a68ca7023ccf90215f3e", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "extest", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -7,11 +42,11 @@ ] }, "locked": { - "lastModified": 1703838268, - "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=", + "lastModified": 1704100519, + "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2aff324cf65f5f98f89d878c056b779466b17db8", + "rev": "6e91c5df192395753d8e6d55a0352109cb559790", "type": "github" }, "original": { @@ -23,27 +58,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", - "owner": "nixos", + "lastModified": 1704008649, + "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1703351344, - "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", + "lastModified": 1703950681, + "narHash": "sha256-veU5bE4eLOmi7aOzhE7LfZXcSOONRMay0BKv01WHojo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", + "rev": "0aad9113182747452dbfc68b93c86e168811fa6c", "type": "github" }, "original": { @@ -55,11 +90,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -71,11 +106,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703134684, - "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1703499205, + "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", + "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", "type": "github" }, "original": { @@ -87,23 +138,24 @@ }, "root": { "inputs": { + "extest": "extest", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1703387502, - "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=", + "lastModified": 1703991717, + "narHash": "sha256-XfBg2dmDJXPQEB8EdNBnzybvnhswaiAkUeeDj7fa/hQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3", + "rev": "cfdbaf68d00bc2f9e071f17ae77be4b27ff72fa6", "type": "github" }, "original": { From ec204a34a79a8757be9adc6ff89600604831c1ae Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 22:39:15 +0100 Subject: [PATCH 0735/2308] Fix steam input for shodan --- nixos/hosts/shodan/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 9c9c6a5..efa86d3 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -140,12 +140,12 @@ jovian.devices.steamdeck.autoUpdate = true; programs.steam = { - override = { - extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; - }; enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + programs.steam.package = pkgs.steam.override { + extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; + }; }; hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses From 122a094b7d483feceebbd123efee9fcb67ef9a91 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 22:39:15 +0100 Subject: [PATCH 0736/2308] Fix steam input for shodan --- nixos/hosts/shodan/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 9c9c6a5..efa86d3 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -140,12 +140,12 @@ jovian.devices.steamdeck.autoUpdate = true; programs.steam = { - override = { - extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; - }; enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + programs.steam.package = pkgs.steam.override { + extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; + }; }; hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses From ce91a13631068c477344529ce35926bd45b25af7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 22:41:50 +0100 Subject: [PATCH 0737/2308] programs.steam.programs.steam is nothing actually oop --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index efa86d3..40c31cd 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -143,7 +143,7 @@ enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - programs.steam.package = pkgs.steam.override { + package = pkgs.steam.override { extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; }; }; From 9b7873ac78097e2a4c4d240877abea1b5d1be923 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 22:41:50 +0100 Subject: [PATCH 0738/2308] programs.steam.programs.steam is nothing actually oop --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index efa86d3..40c31cd 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -143,7 +143,7 @@ enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - programs.steam.package = pkgs.steam.override { + package = pkgs.steam.override { extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; }; }; From 8acfa581f47fb9c6e966359ff8bd76d48d711db8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 22:56:53 +0100 Subject: [PATCH 0739/2308] Disable bootloader showing up on shodan --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 40c31cd..f82fb7c 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -247,6 +247,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; boot.consoleLogLevel = 0; boot.kernelParams = ["quiet" "udev.log_priority=0"]; From 7188c6685756f978fc0473e4c2770e1d7b59fc3e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 22:56:53 +0100 Subject: [PATCH 0740/2308] Disable bootloader showing up on shodan --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 40c31cd..f82fb7c 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -247,6 +247,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; boot.consoleLogLevel = 0; boot.kernelParams = ["quiet" "udev.log_priority=0"]; From a3f0b541009b0f26d0c17aeb0f7c707ec6c39675 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 23:23:53 +0100 Subject: [PATCH 0741/2308] Install and enable jellyfin on queen --- nixos/hosts/queen/configuration.nix | 4 ++++ .../jellyfin/configuration.nix | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 nixos/package-configs/jellyfin/configuration.nix diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index b2c23b1..362669c 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -24,6 +24,7 @@ ../../package-configs/postgres/configuration.nix ../../package-configs/postgres/upgrade.nix ../../package-configs/roundcube/configuration.nix + ../../package-configs/jellyfin/configuration.nix ]; boot.tmp.cleanOnBoot = true; @@ -98,6 +99,9 @@ aria2 git-filter-repo home-manager + jellyfin + jellyfin-web + jellyfin-ffmpeg nextcloud28 nginx noto-fonts diff --git a/nixos/package-configs/jellyfin/configuration.nix b/nixos/package-configs/jellyfin/configuration.nix new file mode 100644 index 0000000..479ef36 --- /dev/null +++ b/nixos/package-configs/jellyfin/configuration.nix @@ -0,0 +1,24 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + services.nginx = { + virtualHosts = { + "video.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:8096"; + }; + }; + }; + }; + + services.jellyfin = { + enable = true; + }; +} From 2d95d1f9223601c8bb2d191d0252aa2688d1caa0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 23:23:53 +0100 Subject: [PATCH 0742/2308] Install and enable jellyfin on queen --- nixos/hosts/queen/configuration.nix | 4 ++++ .../jellyfin/configuration.nix | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 nixos/package-configs/jellyfin/configuration.nix diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index b2c23b1..362669c 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -24,6 +24,7 @@ ../../package-configs/postgres/configuration.nix ../../package-configs/postgres/upgrade.nix ../../package-configs/roundcube/configuration.nix + ../../package-configs/jellyfin/configuration.nix ]; boot.tmp.cleanOnBoot = true; @@ -98,6 +99,9 @@ aria2 git-filter-repo home-manager + jellyfin + jellyfin-web + jellyfin-ffmpeg nextcloud28 nginx noto-fonts diff --git a/nixos/package-configs/jellyfin/configuration.nix b/nixos/package-configs/jellyfin/configuration.nix new file mode 100644 index 0000000..479ef36 --- /dev/null +++ b/nixos/package-configs/jellyfin/configuration.nix @@ -0,0 +1,24 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + services.nginx = { + virtualHosts = { + "video.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:8096"; + }; + }; + }; + }; + + services.jellyfin = { + enable = true; + }; +} From 0f8a707147714b45863ffd9f31eee972e7cf6177 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 23:31:13 +0100 Subject: [PATCH 0743/2308] Told me to update these settings --- nixos/package-configs/nextcloud/configuration.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/package-configs/nextcloud/configuration.nix b/nixos/package-configs/nextcloud/configuration.nix index 4aee6d2..0bfa331 100644 --- a/nixos/package-configs/nextcloud/configuration.nix +++ b/nixos/package-configs/nextcloud/configuration.nix @@ -62,7 +62,11 @@ #Increase opcache string buffer phpOptions."opcache.interned_strings_buffer" = "23"; - + # Further forces Nextcloud to use HTTPS + extraOptions = { + defaultPhoneRegion = "NL"; + overwriteprotocol = "https"; + }; appstoreEnable = true; extraAppsEnable = true; #extraApps = with config.services.nextcloud.package.packages.apps; { @@ -72,11 +76,6 @@ #}; config = { - # Further forces Nextcloud to use HTTPS - overwriteProtocol = "https"; - - defaultPhoneRegion = "NL"; - # Nextcloud PostegreSQL database configuration, recommended over using SQLite dbtype = "pgsql"; dbuser = "nextcloud"; From 8f4640850afbcc44e1f657211fd6a128e453679b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 23:31:13 +0100 Subject: [PATCH 0744/2308] Told me to update these settings --- nixos/package-configs/nextcloud/configuration.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/package-configs/nextcloud/configuration.nix b/nixos/package-configs/nextcloud/configuration.nix index 4aee6d2..0bfa331 100644 --- a/nixos/package-configs/nextcloud/configuration.nix +++ b/nixos/package-configs/nextcloud/configuration.nix @@ -62,7 +62,11 @@ #Increase opcache string buffer phpOptions."opcache.interned_strings_buffer" = "23"; - + # Further forces Nextcloud to use HTTPS + extraOptions = { + defaultPhoneRegion = "NL"; + overwriteprotocol = "https"; + }; appstoreEnable = true; extraAppsEnable = true; #extraApps = with config.services.nextcloud.package.packages.apps; { @@ -72,11 +76,6 @@ #}; config = { - # Further forces Nextcloud to use HTTPS - overwriteProtocol = "https"; - - defaultPhoneRegion = "NL"; - # Nextcloud PostegreSQL database configuration, recommended over using SQLite dbtype = "pgsql"; dbuser = "nextcloud"; From 025312cc5b39cd483c5d983c32cb4e346421c188 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 23:57:45 +0100 Subject: [PATCH 0745/2308] Add jellyfin to nextcloud for syncing --- nixos/package-configs/jellyfin/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/package-configs/jellyfin/configuration.nix b/nixos/package-configs/jellyfin/configuration.nix index 479ef36..7231059 100644 --- a/nixos/package-configs/jellyfin/configuration.nix +++ b/nixos/package-configs/jellyfin/configuration.nix @@ -6,6 +6,8 @@ pkgs, ... }: { + users.users.jellyfin.extraGroups = ["nextcloud"]; + services.nginx = { virtualHosts = { "video.gladtherescake.eu" = { From e1195f8a495efe179e27332b25db0c84c41065ef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Jan 2024 23:57:45 +0100 Subject: [PATCH 0746/2308] Add jellyfin to nextcloud for syncing --- nixos/package-configs/jellyfin/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/package-configs/jellyfin/configuration.nix b/nixos/package-configs/jellyfin/configuration.nix index 479ef36..7231059 100644 --- a/nixos/package-configs/jellyfin/configuration.nix +++ b/nixos/package-configs/jellyfin/configuration.nix @@ -6,6 +6,8 @@ pkgs, ... }: { + users.users.jellyfin.extraGroups = ["nextcloud"]; + services.nginx = { virtualHosts = { "video.gladtherescake.eu" = { From 1a966afd296c5bf32ca8e80a7ec754c3eb854ee1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:08:24 +0100 Subject: [PATCH 0747/2308] Replace gitea with forgejo in place --- nixos/hosts/queen/configuration.nix | 2 +- nixos/package-configs/{gitea => forgejo}/configuration.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) rename nixos/package-configs/{gitea => forgejo}/configuration.nix (93%) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 362669c..f7f616f 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -17,7 +17,7 @@ # ./nvim.nix ./hardware-configuration.nix ../../package-configs/akkoma/configuration.nix - ../../package-configs/gitea/configuration.nix + ../../package-configs/forgejo/configuration.nix ../../package-configs/gotosocial/configuration.nix ../../package-configs/mail-server/configuration.nix ../../package-configs/nextcloud/configuration.nix diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/forgejo/configuration.nix similarity index 93% rename from nixos/package-configs/gitea/configuration.nix rename to nixos/package-configs/forgejo/configuration.nix index 1a9f51a..236315d 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -17,11 +17,14 @@ sops.secrets."mailpassunhash".mode = "0440"; sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; - services.gitea = { + services.forgejo = { enable = true; + user = "gitea"; + stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { + user = "gitea"; type = "postgres"; }; settings = { From bca4ef2a703b6513f18f279b57cd7a8c7ab2ded3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:08:24 +0100 Subject: [PATCH 0748/2308] Replace gitea with forgejo in place --- nixos/hosts/queen/configuration.nix | 2 +- nixos/package-configs/{gitea => forgejo}/configuration.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) rename nixos/package-configs/{gitea => forgejo}/configuration.nix (93%) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 362669c..f7f616f 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -17,7 +17,7 @@ # ./nvim.nix ./hardware-configuration.nix ../../package-configs/akkoma/configuration.nix - ../../package-configs/gitea/configuration.nix + ../../package-configs/forgejo/configuration.nix ../../package-configs/gotosocial/configuration.nix ../../package-configs/mail-server/configuration.nix ../../package-configs/nextcloud/configuration.nix diff --git a/nixos/package-configs/gitea/configuration.nix b/nixos/package-configs/forgejo/configuration.nix similarity index 93% rename from nixos/package-configs/gitea/configuration.nix rename to nixos/package-configs/forgejo/configuration.nix index 1a9f51a..236315d 100644 --- a/nixos/package-configs/gitea/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -17,11 +17,14 @@ sops.secrets."mailpassunhash".mode = "0440"; sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; - services.gitea = { + services.forgejo = { enable = true; + user = "gitea"; + stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { + user = "gitea"; type = "postgres"; }; settings = { From 73b2e4262a291e79d3b22ad618c09e74a0f3f2ef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:09:59 +0100 Subject: [PATCH 0749/2308] Group set too --- nixos/package-configs/forgejo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 236315d..dd7154d 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -20,6 +20,7 @@ services.forgejo = { enable = true; user = "gitea"; + group = "gitea"; stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services mailerPasswordFile = config.sops.secrets."mailpassunhash".path; From 75688141146122d5dd893ae6fc6eb5a7cc28e118 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:09:59 +0100 Subject: [PATCH 0750/2308] Group set too --- nixos/package-configs/forgejo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 236315d..dd7154d 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -20,6 +20,7 @@ services.forgejo = { enable = true; user = "gitea"; + group = "gitea"; stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services mailerPasswordFile = config.sops.secrets."mailpassunhash".path; From 1370c2cd782c308acb07b70d083940ae8796b28b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:11:17 +0100 Subject: [PATCH 0751/2308] Database name too --- nixos/package-configs/forgejo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index dd7154d..2402ba1 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -26,6 +26,7 @@ mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { user = "gitea"; + name = "gitea"; type = "postgres"; }; settings = { From 0b62079c4de4c0d30b569fc725568fe771f79f0f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:11:17 +0100 Subject: [PATCH 0752/2308] Database name too --- nixos/package-configs/forgejo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index dd7154d..2402ba1 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -26,6 +26,7 @@ mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { user = "gitea"; + name = "gitea"; type = "postgres"; }; settings = { From 12e247e1ec6d6d3d7373daa4f089b2f57331bda3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:12:03 +0100 Subject: [PATCH 0753/2308] Add a group as well here --- nixos/package-configs/forgejo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 2402ba1..f752207 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -11,6 +11,7 @@ gitea = { isSystemUser = true; isNormalUser = false; + group = "gitea"; extraGroups = ["virtualMail"]; }; }; From 0738e861087aa501719f00014f764ef437103f5c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:12:03 +0100 Subject: [PATCH 0754/2308] Add a group as well here --- nixos/package-configs/forgejo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 2402ba1..f752207 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -11,6 +11,7 @@ gitea = { isSystemUser = true; isNormalUser = false; + group = "gitea"; extraGroups = ["virtualMail"]; }; }; From 68031d3c702de6c7ec44610aa1f1e8040a15c524 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:12:46 +0100 Subject: [PATCH 0755/2308] And add the group... --- nixos/package-configs/forgejo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index f752207..acb10d9 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -7,6 +7,7 @@ ... }: { imports = []; + users.groups.gitea = {}; users.users = { gitea = { isSystemUser = true; From 7d5352f05836428bb083cce24735135c902c5530 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:12:46 +0100 Subject: [PATCH 0756/2308] And add the group... --- nixos/package-configs/forgejo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index f752207..acb10d9 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -7,6 +7,7 @@ ... }: { imports = []; + users.groups.gitea = {}; users.users = { gitea = { isSystemUser = true; From 293f313059f5fbbe89c8f47b62bc4caf68d18b8f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:16:14 +0100 Subject: [PATCH 0757/2308] Sendmail fix hopefully --- nixos/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index acb10d9..b811e71 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -41,7 +41,7 @@ ENABLED = true; PROTOCOL = "sendmail"; FROM = "no-reply@git.lillianviolet.dev"; - SENDMAIL_PATH = "sendmail"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; SENDMAIL_ARGS = "-bs"; }; repository = { From 70a0ce7ae43bfac230799360af80a062f49a6634 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:16:14 +0100 Subject: [PATCH 0758/2308] Sendmail fix hopefully --- nixos/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index acb10d9..b811e71 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -41,7 +41,7 @@ ENABLED = true; PROTOCOL = "sendmail"; FROM = "no-reply@git.lillianviolet.dev"; - SENDMAIL_PATH = "sendmail"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; SENDMAIL_ARGS = "-bs"; }; repository = { From a2cae4a73c1c4cd015984fa007a008040af04188 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:24:17 +0100 Subject: [PATCH 0759/2308] Enable federation of forgejo --- nixos/package-configs/forgejo/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index b811e71..0c8ff72 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -47,6 +47,9 @@ repository = { ENABLE_PUSH_CREATE_USER = true; }; + federation = { + ENABLED = true; + }; other = { SHOW_FOOTER_VERSION = false; }; From dd5da499eaaaf132d42dd2956bb879649f41b40b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:24:17 +0100 Subject: [PATCH 0760/2308] Enable federation of forgejo --- nixos/package-configs/forgejo/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index b811e71..0c8ff72 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -47,6 +47,9 @@ repository = { ENABLE_PUSH_CREATE_USER = true; }; + federation = { + ENABLED = true; + }; other = { SHOW_FOOTER_VERSION = false; }; From aafc555af8d23b77b3d466bddb924c50ee73ea2c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:26:53 +0100 Subject: [PATCH 0761/2308] Some mail fixes --- nixos/package-configs/forgejo/configuration.nix | 1 + nixos/package-configs/mail-server/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 0c8ff72..e226fc5 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -41,6 +41,7 @@ ENABLED = true; PROTOCOL = "sendmail"; FROM = "no-reply@git.lillianviolet.dev"; + USER = "gitea"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; SENDMAIL_ARGS = "-bs"; }; diff --git a/nixos/package-configs/mail-server/configuration.nix b/nixos/package-configs/mail-server/configuration.nix index ac9c3a0..a48b9fd 100644 --- a/nixos/package-configs/mail-server/configuration.nix +++ b/nixos/package-configs/mail-server/configuration.nix @@ -103,6 +103,7 @@ "mail.lillianviolet.dev" "pop3.lillianviolet.dev" "lillianviolet.dev" + "git.lillianviolet.dev" ]; }; } From 069ebef7102dff4da10a988b5bb335517eb9d6e0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:26:53 +0100 Subject: [PATCH 0762/2308] Some mail fixes --- nixos/package-configs/forgejo/configuration.nix | 1 + nixos/package-configs/mail-server/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 0c8ff72..e226fc5 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -41,6 +41,7 @@ ENABLED = true; PROTOCOL = "sendmail"; FROM = "no-reply@git.lillianviolet.dev"; + USER = "gitea"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; SENDMAIL_ARGS = "-bs"; }; diff --git a/nixos/package-configs/mail-server/configuration.nix b/nixos/package-configs/mail-server/configuration.nix index ac9c3a0..a48b9fd 100644 --- a/nixos/package-configs/mail-server/configuration.nix +++ b/nixos/package-configs/mail-server/configuration.nix @@ -103,6 +103,7 @@ "mail.lillianviolet.dev" "pop3.lillianviolet.dev" "lillianviolet.dev" + "git.lillianviolet.dev" ]; }; } From 7051feb4297b520f686b2816a558dbd598f3ce2f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:28:55 +0100 Subject: [PATCH 0763/2308] Let's remove the password? --- nixos/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index e226fc5..1391a28 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -25,7 +25,7 @@ group = "gitea"; stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services - mailerPasswordFile = config.sops.secrets."mailpassunhash".path; + #mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { user = "gitea"; name = "gitea"; From e92880ab384f499f57c429135c40cb90d647306e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:28:55 +0100 Subject: [PATCH 0764/2308] Let's remove the password? --- nixos/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index e226fc5..1391a28 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -25,7 +25,7 @@ group = "gitea"; stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services - mailerPasswordFile = config.sops.secrets."mailpassunhash".path; + #mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { user = "gitea"; name = "gitea"; From 255523eac32b3813641a8e0d81a34f00a29e46b9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:30:41 +0100 Subject: [PATCH 0765/2308] No arguments? --- nixos/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 1391a28..501e60f 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -43,7 +43,7 @@ FROM = "no-reply@git.lillianviolet.dev"; USER = "gitea"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - SENDMAIL_ARGS = "-bs"; + SENDMAIL_ARGS = "--"; }; repository = { ENABLE_PUSH_CREATE_USER = true; From b206d285d779689345015591cd6e0879be4490c9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:30:41 +0100 Subject: [PATCH 0766/2308] No arguments? --- nixos/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 1391a28..501e60f 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -43,7 +43,7 @@ FROM = "no-reply@git.lillianviolet.dev"; USER = "gitea"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - SENDMAIL_ARGS = "-bs"; + SENDMAIL_ARGS = "--"; }; repository = { ENABLE_PUSH_CREATE_USER = true; From 47e5789b81f2b7a7de009ef643fd367b1602c9f1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:32:06 +0100 Subject: [PATCH 0767/2308] Absolutely nothing --- nixos/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 501e60f..75c1f78 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -43,7 +43,7 @@ FROM = "no-reply@git.lillianviolet.dev"; USER = "gitea"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - SENDMAIL_ARGS = "--"; + SENDMAIL_ARGS = ""; }; repository = { ENABLE_PUSH_CREATE_USER = true; From 61cb1657dc48f5fd09647d58abb8d352ea69339e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:32:06 +0100 Subject: [PATCH 0768/2308] Absolutely nothing --- nixos/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 501e60f..75c1f78 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -43,7 +43,7 @@ FROM = "no-reply@git.lillianviolet.dev"; USER = "gitea"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - SENDMAIL_ARGS = "--"; + SENDMAIL_ARGS = ""; }; repository = { ENABLE_PUSH_CREATE_USER = true; From 72fca64f2471a4673792da53c8a93f78e32055c9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:33:20 +0100 Subject: [PATCH 0769/2308] OOH I think I get what I did wrong... fixed mailer for forgejo I assume --- nixos/package-configs/forgejo/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 75c1f78..b45d834 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -40,10 +40,10 @@ mailer = { ENABLED = true; PROTOCOL = "sendmail"; - FROM = "no-reply@git.lillianviolet.dev"; - USER = "gitea"; + FROM = "git.lillianviolet.dev"; + USER = "no-reply"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - SENDMAIL_ARGS = ""; + SENDMAIL_ARGS = "-bs"; }; repository = { ENABLE_PUSH_CREATE_USER = true; From bd0147869478306f06044be1e092851f7113985b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:33:20 +0100 Subject: [PATCH 0770/2308] OOH I think I get what I did wrong... fixed mailer for forgejo I assume --- nixos/package-configs/forgejo/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 75c1f78..b45d834 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -40,10 +40,10 @@ mailer = { ENABLED = true; PROTOCOL = "sendmail"; - FROM = "no-reply@git.lillianviolet.dev"; - USER = "gitea"; + FROM = "git.lillianviolet.dev"; + USER = "no-reply"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - SENDMAIL_ARGS = ""; + SENDMAIL_ARGS = "-bs"; }; repository = { ENABLE_PUSH_CREATE_USER = true; From 1e44273f599bad6cc4038d9fb6733c1014a32c9e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:59:06 +0100 Subject: [PATCH 0771/2308] Remove this maybe? --- nixos/package-configs/mail-server/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/package-configs/mail-server/configuration.nix b/nixos/package-configs/mail-server/configuration.nix index a48b9fd..ac9c3a0 100644 --- a/nixos/package-configs/mail-server/configuration.nix +++ b/nixos/package-configs/mail-server/configuration.nix @@ -103,7 +103,6 @@ "mail.lillianviolet.dev" "pop3.lillianviolet.dev" "lillianviolet.dev" - "git.lillianviolet.dev" ]; }; } From 3392318a29169fcb1824569d077d1a6809ee5b42 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 12:59:06 +0100 Subject: [PATCH 0772/2308] Remove this maybe? --- nixos/package-configs/mail-server/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/package-configs/mail-server/configuration.nix b/nixos/package-configs/mail-server/configuration.nix index a48b9fd..ac9c3a0 100644 --- a/nixos/package-configs/mail-server/configuration.nix +++ b/nixos/package-configs/mail-server/configuration.nix @@ -103,7 +103,6 @@ "mail.lillianviolet.dev" "pop3.lillianviolet.dev" "lillianviolet.dev" - "git.lillianviolet.dev" ]; }; } From 81f79421d6a8420191bfab5fe92cd1c605cd3fa1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 13:02:14 +0100 Subject: [PATCH 0773/2308] Is the mailer breaking things? --- nixos/package-configs/forgejo/configuration.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index b45d834..1c867f9 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -37,14 +37,14 @@ SCHEDULE = "@every 24h"; UPDATE_EXISTING = true; }; - mailer = { - ENABLED = true; - PROTOCOL = "sendmail"; - FROM = "git.lillianviolet.dev"; - USER = "no-reply"; - SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - SENDMAIL_ARGS = "-bs"; - }; + # mailer = { + # ENABLED = true; + # PROTOCOL = "sendmail"; + # FROM = "git.lillianviolet.dev"; + # USER = "no-reply"; + # SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + # SENDMAIL_ARGS = "-bs"; + # }; repository = { ENABLE_PUSH_CREATE_USER = true; }; From c10b658babb5ab3221bb0de0cc5f3926b05a931f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 13:02:14 +0100 Subject: [PATCH 0774/2308] Is the mailer breaking things? --- nixos/package-configs/forgejo/configuration.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index b45d834..1c867f9 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -37,14 +37,14 @@ SCHEDULE = "@every 24h"; UPDATE_EXISTING = true; }; - mailer = { - ENABLED = true; - PROTOCOL = "sendmail"; - FROM = "git.lillianviolet.dev"; - USER = "no-reply"; - SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - SENDMAIL_ARGS = "-bs"; - }; + # mailer = { + # ENABLED = true; + # PROTOCOL = "sendmail"; + # FROM = "git.lillianviolet.dev"; + # USER = "no-reply"; + # SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + # SENDMAIL_ARGS = "-bs"; + # }; repository = { ENABLE_PUSH_CREATE_USER = true; }; From 9879700f9cf322f0fca01c316228065bff8e5e29 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 13:05:08 +0100 Subject: [PATCH 0775/2308] Do you need a password or something to fix it? --- .../package-configs/forgejo/configuration.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 1c867f9..4bd3038 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -25,7 +25,7 @@ group = "gitea"; stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services - #mailerPasswordFile = config.sops.secrets."mailpassunhash".path; + mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { user = "gitea"; name = "gitea"; @@ -37,14 +37,14 @@ SCHEDULE = "@every 24h"; UPDATE_EXISTING = true; }; - # mailer = { - # ENABLED = true; - # PROTOCOL = "sendmail"; - # FROM = "git.lillianviolet.dev"; - # USER = "no-reply"; - # SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - # SENDMAIL_ARGS = "-bs"; - # }; + mailer = { + ENABLED = true; + PROTOCOL = "sendmail"; + FROM = "git.lillianviolet.dev"; + USER = "no-reply"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + SENDMAIL_ARGS = "-bs"; + }; repository = { ENABLE_PUSH_CREATE_USER = true; }; From 6130388b8bffdb40f5d403f1408deee4d2999f69 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 13:05:08 +0100 Subject: [PATCH 0776/2308] Do you need a password or something to fix it? --- .../package-configs/forgejo/configuration.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 1c867f9..4bd3038 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -25,7 +25,7 @@ group = "gitea"; stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services - #mailerPasswordFile = config.sops.secrets."mailpassunhash".path; + mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { user = "gitea"; name = "gitea"; @@ -37,14 +37,14 @@ SCHEDULE = "@every 24h"; UPDATE_EXISTING = true; }; - # mailer = { - # ENABLED = true; - # PROTOCOL = "sendmail"; - # FROM = "git.lillianviolet.dev"; - # USER = "no-reply"; - # SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - # SENDMAIL_ARGS = "-bs"; - # }; + mailer = { + ENABLED = true; + PROTOCOL = "sendmail"; + FROM = "git.lillianviolet.dev"; + USER = "no-reply"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + SENDMAIL_ARGS = "-bs"; + }; repository = { ENABLE_PUSH_CREATE_USER = true; }; From 0946256e2258399bcd507ac233353de7a26b040c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 13:06:39 +0100 Subject: [PATCH 0777/2308] Yeah guess not, mailer is breaking it, idk why, look at it later --- nixos/package-configs/forgejo/configuration.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 4bd3038..2af3b05 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -37,14 +37,14 @@ SCHEDULE = "@every 24h"; UPDATE_EXISTING = true; }; - mailer = { - ENABLED = true; - PROTOCOL = "sendmail"; - FROM = "git.lillianviolet.dev"; - USER = "no-reply"; - SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - SENDMAIL_ARGS = "-bs"; - }; + # mailer = { + # ENABLED = true; + # PROTOCOL = "sendmail"; + # FROM = "git.lillianviolet.dev"; + # USER = "no-reply"; + # SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + # SENDMAIL_ARGS = "-bs"; + # }; repository = { ENABLE_PUSH_CREATE_USER = true; }; From cf6aaf6146e258662848bae806554189ae70d234 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 13:06:39 +0100 Subject: [PATCH 0778/2308] Yeah guess not, mailer is breaking it, idk why, look at it later --- nixos/package-configs/forgejo/configuration.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 4bd3038..2af3b05 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -37,14 +37,14 @@ SCHEDULE = "@every 24h"; UPDATE_EXISTING = true; }; - mailer = { - ENABLED = true; - PROTOCOL = "sendmail"; - FROM = "git.lillianviolet.dev"; - USER = "no-reply"; - SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - SENDMAIL_ARGS = "-bs"; - }; + # mailer = { + # ENABLED = true; + # PROTOCOL = "sendmail"; + # FROM = "git.lillianviolet.dev"; + # USER = "no-reply"; + # SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + # SENDMAIL_ARGS = "-bs"; + # }; repository = { ENABLE_PUSH_CREATE_USER = true; }; From 78ec78a293e6a9587b2a9da7d831c15a82fa6400 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 13:20:40 +0100 Subject: [PATCH 0779/2308] Try this again? --- nixos/package-configs/forgejo/configuration.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 2af3b05..0c8ff72 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -37,14 +37,13 @@ SCHEDULE = "@every 24h"; UPDATE_EXISTING = true; }; - # mailer = { - # ENABLED = true; - # PROTOCOL = "sendmail"; - # FROM = "git.lillianviolet.dev"; - # USER = "no-reply"; - # SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - # SENDMAIL_ARGS = "-bs"; - # }; + mailer = { + ENABLED = true; + PROTOCOL = "sendmail"; + FROM = "no-reply@git.lillianviolet.dev"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + SENDMAIL_ARGS = "-bs"; + }; repository = { ENABLE_PUSH_CREATE_USER = true; }; From 68e50634199daf195a7d16102a65f81dab5b68e6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jan 2024 13:20:40 +0100 Subject: [PATCH 0780/2308] Try this again? --- nixos/package-configs/forgejo/configuration.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/package-configs/forgejo/configuration.nix index 2af3b05..0c8ff72 100644 --- a/nixos/package-configs/forgejo/configuration.nix +++ b/nixos/package-configs/forgejo/configuration.nix @@ -37,14 +37,13 @@ SCHEDULE = "@every 24h"; UPDATE_EXISTING = true; }; - # mailer = { - # ENABLED = true; - # PROTOCOL = "sendmail"; - # FROM = "git.lillianviolet.dev"; - # USER = "no-reply"; - # SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; - # SENDMAIL_ARGS = "-bs"; - # }; + mailer = { + ENABLED = true; + PROTOCOL = "sendmail"; + FROM = "no-reply@git.lillianviolet.dev"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + SENDMAIL_ARGS = "-bs"; + }; repository = { ENABLE_PUSH_CREATE_USER = true; }; From 20cffb2a4a7c7c66b96798db171284d691db0263 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 22:51:17 +0100 Subject: [PATCH 0781/2308] Added ombi, radarr, and sonarr --- nixos/package-configs/ombi/configuration.nix | 26 +++++++++++++++++++ .../package-configs/radarr/configuration.nix | 10 +++++++ .../package-configs/sonarr/configuration.nix | 10 +++++++ 3 files changed, 46 insertions(+) create mode 100644 nixos/package-configs/ombi/configuration.nix create mode 100644 nixos/package-configs/radarr/configuration.nix create mode 100644 nixos/package-configs/sonarr/configuration.nix diff --git a/nixos/package-configs/ombi/configuration.nix b/nixos/package-configs/ombi/configuration.nix new file mode 100644 index 0000000..e2f411b --- /dev/null +++ b/nixos/package-configs/ombi/configuration.nix @@ -0,0 +1,26 @@ +{ + config, + pkgs, + ... +}: { + users.users = { + ombi.extraGroups = ["radarr" "sonarr"]; + }; + #uses port 7878 + services.ombi = { + enable = true; + port = 2368; + }; + + services.nginx = { + virtualHosts = { + "ombi.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:2386"; + }; + }; + }; + }; +} diff --git a/nixos/package-configs/radarr/configuration.nix b/nixos/package-configs/radarr/configuration.nix new file mode 100644 index 0000000..db3c170 --- /dev/null +++ b/nixos/package-configs/radarr/configuration.nix @@ -0,0 +1,10 @@ +{ + config, + pkgs, + ... +}: { + #uses port 7878 + services.radarr = { + enable = true; + }; +} diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix new file mode 100644 index 0000000..0397f8f --- /dev/null +++ b/nixos/package-configs/sonarr/configuration.nix @@ -0,0 +1,10 @@ +{ + config, + pkgs, + ... +}: { + #uses port 8989 + services.radarr = { + enable = true; + }; +} From 5fd869242e4ffb7fdd1883513631722ff37e23e4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 22:51:17 +0100 Subject: [PATCH 0782/2308] Added ombi, radarr, and sonarr --- nixos/package-configs/ombi/configuration.nix | 26 +++++++++++++++++++ .../package-configs/radarr/configuration.nix | 10 +++++++ .../package-configs/sonarr/configuration.nix | 10 +++++++ 3 files changed, 46 insertions(+) create mode 100644 nixos/package-configs/ombi/configuration.nix create mode 100644 nixos/package-configs/radarr/configuration.nix create mode 100644 nixos/package-configs/sonarr/configuration.nix diff --git a/nixos/package-configs/ombi/configuration.nix b/nixos/package-configs/ombi/configuration.nix new file mode 100644 index 0000000..e2f411b --- /dev/null +++ b/nixos/package-configs/ombi/configuration.nix @@ -0,0 +1,26 @@ +{ + config, + pkgs, + ... +}: { + users.users = { + ombi.extraGroups = ["radarr" "sonarr"]; + }; + #uses port 7878 + services.ombi = { + enable = true; + port = 2368; + }; + + services.nginx = { + virtualHosts = { + "ombi.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:2386"; + }; + }; + }; + }; +} diff --git a/nixos/package-configs/radarr/configuration.nix b/nixos/package-configs/radarr/configuration.nix new file mode 100644 index 0000000..db3c170 --- /dev/null +++ b/nixos/package-configs/radarr/configuration.nix @@ -0,0 +1,10 @@ +{ + config, + pkgs, + ... +}: { + #uses port 7878 + services.radarr = { + enable = true; + }; +} diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix new file mode 100644 index 0000000..0397f8f --- /dev/null +++ b/nixos/package-configs/sonarr/configuration.nix @@ -0,0 +1,10 @@ +{ + config, + pkgs, + ... +}: { + #uses port 8989 + services.radarr = { + enable = true; + }; +} From 7e65497a6445de37ad9ad94791cd28f7993f4dd6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:01:45 +0100 Subject: [PATCH 0783/2308] Enable radarr sonarr and ombi --- nixos/hosts/queen/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index f7f616f..e065a5e 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -25,6 +25,9 @@ ../../package-configs/postgres/upgrade.nix ../../package-configs/roundcube/configuration.nix ../../package-configs/jellyfin/configuration.nix + ../../package-configs/ombi/configuration.nix + ../../package-configs/radarr/configuration.nix + ../../package-configs/sonarr/configuration.nix ]; boot.tmp.cleanOnBoot = true; From c52f556d4ed8cf4fb39c0f89bffd37f0ba8d805f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:01:45 +0100 Subject: [PATCH 0784/2308] Enable radarr sonarr and ombi --- nixos/hosts/queen/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index f7f616f..e065a5e 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -25,6 +25,9 @@ ../../package-configs/postgres/upgrade.nix ../../package-configs/roundcube/configuration.nix ../../package-configs/jellyfin/configuration.nix + ../../package-configs/ombi/configuration.nix + ../../package-configs/radarr/configuration.nix + ../../package-configs/sonarr/configuration.nix ]; boot.tmp.cleanOnBoot = true; From ee9bcf7f5210bb07729b17fac2da3b1301bf6e5e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:06:01 +0100 Subject: [PATCH 0785/2308] Use the correct port for ombi --- nixos/package-configs/ombi/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/package-configs/ombi/configuration.nix b/nixos/package-configs/ombi/configuration.nix index e2f411b..a5da7de 100644 --- a/nixos/package-configs/ombi/configuration.nix +++ b/nixos/package-configs/ombi/configuration.nix @@ -6,7 +6,6 @@ users.users = { ombi.extraGroups = ["radarr" "sonarr"]; }; - #uses port 7878 services.ombi = { enable = true; port = 2368; @@ -18,7 +17,7 @@ forceSSL = true; enableACME = true; locations."/" = { - proxyPass = "http://localhost:2386"; + proxyPass = "http://localhost:2368"; }; }; }; From 1761b3ff2ec02172e39208b42ec0b56f08aea8ed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:06:01 +0100 Subject: [PATCH 0786/2308] Use the correct port for ombi --- nixos/package-configs/ombi/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/package-configs/ombi/configuration.nix b/nixos/package-configs/ombi/configuration.nix index e2f411b..a5da7de 100644 --- a/nixos/package-configs/ombi/configuration.nix +++ b/nixos/package-configs/ombi/configuration.nix @@ -6,7 +6,6 @@ users.users = { ombi.extraGroups = ["radarr" "sonarr"]; }; - #uses port 7878 services.ombi = { enable = true; port = 2368; @@ -18,7 +17,7 @@ forceSSL = true; enableACME = true; locations."/" = { - proxyPass = "http://localhost:2386"; + proxyPass = "http://localhost:2368"; }; }; }; From b0131af4c369bef1ef0a24429540a1bc4fe6c95c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:06:21 +0100 Subject: [PATCH 0787/2308] Update flake lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 28d41c8..eb9953e 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1704100519, - "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", + "lastModified": 1704311514, + "narHash": "sha256-j6JsfCv31bW7LzV06q2L/27QZ4k1Zq7lEq2AR9R150A=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e91c5df192395753d8e6d55a0352109cb559790", + "rev": "fcbc70a7ee064f2b65dc1fac1717ca2a9813bbe6", "type": "github" }, "original": { From 07fdca62981ec0b3077825a57aedf216e62bd00d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:06:21 +0100 Subject: [PATCH 0788/2308] Update flake lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 28d41c8..eb9953e 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1704100519, - "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", + "lastModified": 1704311514, + "narHash": "sha256-j6JsfCv31bW7LzV06q2L/27QZ4k1Zq7lEq2AR9R150A=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e91c5df192395753d8e6d55a0352109cb559790", + "rev": "fcbc70a7ee064f2b65dc1fac1717ca2a9813bbe6", "type": "github" }, "original": { From b1d0cbf307a6020b56069ca89782e7e41dbec5e0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:13:11 +0100 Subject: [PATCH 0789/2308] host radarr and sonarr online --- nixos/package-configs/radarr/configuration.nix | 12 ++++++++++++ nixos/package-configs/sonarr/configuration.nix | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/nixos/package-configs/radarr/configuration.nix b/nixos/package-configs/radarr/configuration.nix index db3c170..98046d4 100644 --- a/nixos/package-configs/radarr/configuration.nix +++ b/nixos/package-configs/radarr/configuration.nix @@ -7,4 +7,16 @@ services.radarr = { enable = true; }; + + services.nginx = { + virtualHosts = { + "radarr.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:7878"; + }; + }; + }; + }; } diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix index 0397f8f..b7b1f47 100644 --- a/nixos/package-configs/sonarr/configuration.nix +++ b/nixos/package-configs/sonarr/configuration.nix @@ -7,4 +7,16 @@ services.radarr = { enable = true; }; + + services.nginx = { + virtualHosts = { + "radarr.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:8989"; + }; + }; + }; + }; } From 99d7e48a9747b11c3061e770645decce6a0113f4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:13:11 +0100 Subject: [PATCH 0790/2308] host radarr and sonarr online --- nixos/package-configs/radarr/configuration.nix | 12 ++++++++++++ nixos/package-configs/sonarr/configuration.nix | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/nixos/package-configs/radarr/configuration.nix b/nixos/package-configs/radarr/configuration.nix index db3c170..98046d4 100644 --- a/nixos/package-configs/radarr/configuration.nix +++ b/nixos/package-configs/radarr/configuration.nix @@ -7,4 +7,16 @@ services.radarr = { enable = true; }; + + services.nginx = { + virtualHosts = { + "radarr.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:7878"; + }; + }; + }; + }; } diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix index 0397f8f..b7b1f47 100644 --- a/nixos/package-configs/sonarr/configuration.nix +++ b/nixos/package-configs/sonarr/configuration.nix @@ -7,4 +7,16 @@ services.radarr = { enable = true; }; + + services.nginx = { + virtualHosts = { + "radarr.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:8989"; + }; + }; + }; + }; } From c1aeabe1d51888e2e0cd15ef8b7f0f9e454c26b0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:14:25 +0100 Subject: [PATCH 0791/2308] Fix sonarr host --- nixos/package-configs/sonarr/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix index b7b1f47..1165906 100644 --- a/nixos/package-configs/sonarr/configuration.nix +++ b/nixos/package-configs/sonarr/configuration.nix @@ -10,7 +10,7 @@ services.nginx = { virtualHosts = { - "radarr.gladtherescake.eu" = { + "sonarr.gladtherescake.eu" = { forceSSL = true; enableACME = true; locations."/" = { From 92b55940fac89faa6e0efd4543ac25f3e194ad18 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:14:25 +0100 Subject: [PATCH 0792/2308] Fix sonarr host --- nixos/package-configs/sonarr/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix index b7b1f47..1165906 100644 --- a/nixos/package-configs/sonarr/configuration.nix +++ b/nixos/package-configs/sonarr/configuration.nix @@ -10,7 +10,7 @@ services.nginx = { virtualHosts = { - "radarr.gladtherescake.eu" = { + "sonarr.gladtherescake.eu" = { forceSSL = true; enableACME = true; locations."/" = { From 520f3040f9a252dcce0257b762b3f9bd0ddb7cac Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:17:05 +0100 Subject: [PATCH 0793/2308] Actually hosting sonarr might be smart --- nixos/package-configs/sonarr/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix index 1165906..e7e60c9 100644 --- a/nixos/package-configs/sonarr/configuration.nix +++ b/nixos/package-configs/sonarr/configuration.nix @@ -4,7 +4,7 @@ ... }: { #uses port 8989 - services.radarr = { + services.sonarr = { enable = true; }; From b280f8d9a58e7261aae4353a25bc04cb9a824cc9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Jan 2024 23:17:05 +0100 Subject: [PATCH 0794/2308] Actually hosting sonarr might be smart --- nixos/package-configs/sonarr/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix index 1165906..e7e60c9 100644 --- a/nixos/package-configs/sonarr/configuration.nix +++ b/nixos/package-configs/sonarr/configuration.nix @@ -4,7 +4,7 @@ ... }: { #uses port 8989 - services.radarr = { + services.sonarr = { enable = true; }; From 6dd39df0b501c0b47c7f05656c1787614e1e3d31 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 13:32:13 +0100 Subject: [PATCH 0795/2308] Try and fix the aria2 situation --- nixos/hosts/queen/secrets/sops.yaml | 5 ++-- nixos/package-configs/aria2/configuration.nix | 25 +++++++++++++++++++ nixos/package-configs/ombi/configuration.nix | 2 +- .../package-configs/radarr/configuration.nix | 3 +++ .../package-configs/sonarr/configuration.nix | 3 +++ 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 nixos/package-configs/aria2/configuration.nix diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index df84d54..8c97dd6 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -5,6 +5,7 @@ mailpass: ENC[AES256_GCM,data:UVrc1RUV0xJFPiZ8J4refglR0p35gUd21EvvTSoeXHVE9/xC0b releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/J0AP0o3qw==,iv:zS12xjcNbLaLaLd3VQT8+o9hDqTo1cZdxoPjjhiExDU=,tag:nJFelasEUjebEBpvmfcDEA==,type:str] mssqlpass: ENC[AES256_GCM,data:XEu4bQC5qM5Cm8UDVX3qAzTuL/t3xbx+qcEbZM4h3Hg=,iv:jgpZ93THYBlUvJDC5+YZiIxu/14e7nFSy76J0vc8Hek=,tag:iKsEDp/KZ5juqzmUgtP8iA==,type:str] mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8,iv:oAFna87l3sL/42ljUF1QsRL0xBrP82uYdKLxK/8HcQE=,tag:liFFGHbNPOpOHyMsjnvMOQ==,type:str] +rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8uo8I8ZymVgIMKLI=,tag:Fr8rWIttLz7X8Pri6FBJBQ==,type:str] sops: kms: [] gcp_kms: [] @@ -20,8 +21,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-12-26T15:30:39Z" - mac: ENC[AES256_GCM,data:j0ZX7F0etvbL1Th3I3eO36PSA5/IiXHzPFWJdxeZEUN9N40hshppeRQ/54Nnn//k9uFennC4F/CIFu5fZioBcQJUnxuCy2EmpztWiGSIbiO94+H2ovMy9Wly8NgvG/DnYb1uSBhTEdXJoEDbzJ/ngb/MtvgB1mCZKbhIw88IDM0=,iv:5XcfXAu6mORLd/O2UCfaPhiPQul7b807xy1PyZo3MF0=,tag:mC5JAmb7jgezJjm5AXT+sg==,type:str] + lastmodified: "2024-01-04T12:15:46Z" + mac: ENC[AES256_GCM,data:a9SPOcOGrhB3u2d1Ju9rEFrkS/PjkK3aTmHJSODRtameV6f2h3iuLzpgHVtZZ08MPoajriasAxAYIsZNwfGbRvAffqf+H85TnKy8e115x9MqZB0EFAwHWuxysjRsRwaJLpjFos3HdsYciro4EDrBKfbvLrLLjxNRWf3FwALA6WQ=,iv:VXUTnQN7B+u+g4OCut3YUxqqGb6mTN7yTubZLZpR19w=,tag:NfBfVQkFlcwq+w5/ckQqGA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/package-configs/aria2/configuration.nix b/nixos/package-configs/aria2/configuration.nix new file mode 100644 index 0000000..0bd31a2 --- /dev/null +++ b/nixos/package-configs/aria2/configuration.nix @@ -0,0 +1,25 @@ +{ + config, + pkgs, + ... +}: { + users.users = { + aria2.extraGroups = ["jellyfin" "nextcloud"]; + }; + services.aria2 = { + enable = true; + downloadDir = "/var/lib/media"; + }; + + # services.nginx = { + # virtualHosts = { + # "aria2.gladtherescake.eu" = { + # forceSSL = true; + # enableACME = true; + # locations."/" = { + # proxyPass = "http://localhost:6800"; + # }; + # }; + # }; + # }; +} diff --git a/nixos/package-configs/ombi/configuration.nix b/nixos/package-configs/ombi/configuration.nix index a5da7de..8c79fdf 100644 --- a/nixos/package-configs/ombi/configuration.nix +++ b/nixos/package-configs/ombi/configuration.nix @@ -4,7 +4,7 @@ ... }: { users.users = { - ombi.extraGroups = ["radarr" "sonarr"]; + ombi.extraGroups = ["radarr" "sonarr" "aria2"]; }; services.ombi = { enable = true; diff --git a/nixos/package-configs/radarr/configuration.nix b/nixos/package-configs/radarr/configuration.nix index 98046d4..45a13a5 100644 --- a/nixos/package-configs/radarr/configuration.nix +++ b/nixos/package-configs/radarr/configuration.nix @@ -3,6 +3,9 @@ pkgs, ... }: { + users.users = { + radarr.extraGroups = ["aria2"]; + }; #uses port 7878 services.radarr = { enable = true; diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix index e7e60c9..884cd5a 100644 --- a/nixos/package-configs/sonarr/configuration.nix +++ b/nixos/package-configs/sonarr/configuration.nix @@ -3,6 +3,9 @@ pkgs, ... }: { + users.users = { + sonarr.extraGroups = ["aria2"]; + }; #uses port 8989 services.sonarr = { enable = true; From 84899440edcd364c0128832055bfd4f2a52c7eab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 13:32:13 +0100 Subject: [PATCH 0796/2308] Try and fix the aria2 situation --- nixos/hosts/queen/secrets/sops.yaml | 5 ++-- nixos/package-configs/aria2/configuration.nix | 25 +++++++++++++++++++ nixos/package-configs/ombi/configuration.nix | 2 +- .../package-configs/radarr/configuration.nix | 3 +++ .../package-configs/sonarr/configuration.nix | 3 +++ 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 nixos/package-configs/aria2/configuration.nix diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index df84d54..8c97dd6 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -5,6 +5,7 @@ mailpass: ENC[AES256_GCM,data:UVrc1RUV0xJFPiZ8J4refglR0p35gUd21EvvTSoeXHVE9/xC0b releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/J0AP0o3qw==,iv:zS12xjcNbLaLaLd3VQT8+o9hDqTo1cZdxoPjjhiExDU=,tag:nJFelasEUjebEBpvmfcDEA==,type:str] mssqlpass: ENC[AES256_GCM,data:XEu4bQC5qM5Cm8UDVX3qAzTuL/t3xbx+qcEbZM4h3Hg=,iv:jgpZ93THYBlUvJDC5+YZiIxu/14e7nFSy76J0vc8Hek=,tag:iKsEDp/KZ5juqzmUgtP8iA==,type:str] mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8,iv:oAFna87l3sL/42ljUF1QsRL0xBrP82uYdKLxK/8HcQE=,tag:liFFGHbNPOpOHyMsjnvMOQ==,type:str] +rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8uo8I8ZymVgIMKLI=,tag:Fr8rWIttLz7X8Pri6FBJBQ==,type:str] sops: kms: [] gcp_kms: [] @@ -20,8 +21,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-12-26T15:30:39Z" - mac: ENC[AES256_GCM,data:j0ZX7F0etvbL1Th3I3eO36PSA5/IiXHzPFWJdxeZEUN9N40hshppeRQ/54Nnn//k9uFennC4F/CIFu5fZioBcQJUnxuCy2EmpztWiGSIbiO94+H2ovMy9Wly8NgvG/DnYb1uSBhTEdXJoEDbzJ/ngb/MtvgB1mCZKbhIw88IDM0=,iv:5XcfXAu6mORLd/O2UCfaPhiPQul7b807xy1PyZo3MF0=,tag:mC5JAmb7jgezJjm5AXT+sg==,type:str] + lastmodified: "2024-01-04T12:15:46Z" + mac: ENC[AES256_GCM,data:a9SPOcOGrhB3u2d1Ju9rEFrkS/PjkK3aTmHJSODRtameV6f2h3iuLzpgHVtZZ08MPoajriasAxAYIsZNwfGbRvAffqf+H85TnKy8e115x9MqZB0EFAwHWuxysjRsRwaJLpjFos3HdsYciro4EDrBKfbvLrLLjxNRWf3FwALA6WQ=,iv:VXUTnQN7B+u+g4OCut3YUxqqGb6mTN7yTubZLZpR19w=,tag:NfBfVQkFlcwq+w5/ckQqGA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/package-configs/aria2/configuration.nix b/nixos/package-configs/aria2/configuration.nix new file mode 100644 index 0000000..0bd31a2 --- /dev/null +++ b/nixos/package-configs/aria2/configuration.nix @@ -0,0 +1,25 @@ +{ + config, + pkgs, + ... +}: { + users.users = { + aria2.extraGroups = ["jellyfin" "nextcloud"]; + }; + services.aria2 = { + enable = true; + downloadDir = "/var/lib/media"; + }; + + # services.nginx = { + # virtualHosts = { + # "aria2.gladtherescake.eu" = { + # forceSSL = true; + # enableACME = true; + # locations."/" = { + # proxyPass = "http://localhost:6800"; + # }; + # }; + # }; + # }; +} diff --git a/nixos/package-configs/ombi/configuration.nix b/nixos/package-configs/ombi/configuration.nix index a5da7de..8c79fdf 100644 --- a/nixos/package-configs/ombi/configuration.nix +++ b/nixos/package-configs/ombi/configuration.nix @@ -4,7 +4,7 @@ ... }: { users.users = { - ombi.extraGroups = ["radarr" "sonarr"]; + ombi.extraGroups = ["radarr" "sonarr" "aria2"]; }; services.ombi = { enable = true; diff --git a/nixos/package-configs/radarr/configuration.nix b/nixos/package-configs/radarr/configuration.nix index 98046d4..45a13a5 100644 --- a/nixos/package-configs/radarr/configuration.nix +++ b/nixos/package-configs/radarr/configuration.nix @@ -3,6 +3,9 @@ pkgs, ... }: { + users.users = { + radarr.extraGroups = ["aria2"]; + }; #uses port 7878 services.radarr = { enable = true; diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix index e7e60c9..884cd5a 100644 --- a/nixos/package-configs/sonarr/configuration.nix +++ b/nixos/package-configs/sonarr/configuration.nix @@ -3,6 +3,9 @@ pkgs, ... }: { + users.users = { + sonarr.extraGroups = ["aria2"]; + }; #uses port 8989 services.sonarr = { enable = true; From 1ca82af674bd93400bc480e1ac4198123e8a622a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 13:36:43 +0100 Subject: [PATCH 0797/2308] Ah I changed the port, made it more clear now --- nixos/hosts/queen/configuration.nix | 1 + nixos/package-configs/aria2/configuration.nix | 1 + nixos/package-configs/nextcloud/configuration.nix | 5 ----- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index e065a5e..da90c5f 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -28,6 +28,7 @@ ../../package-configs/ombi/configuration.nix ../../package-configs/radarr/configuration.nix ../../package-configs/sonarr/configuration.nix + ../../package-configs/aria2/configuration.nix ]; boot.tmp.cleanOnBoot = true; diff --git a/nixos/package-configs/aria2/configuration.nix b/nixos/package-configs/aria2/configuration.nix index 0bd31a2..4ffdac2 100644 --- a/nixos/package-configs/aria2/configuration.nix +++ b/nixos/package-configs/aria2/configuration.nix @@ -9,6 +9,7 @@ services.aria2 = { enable = true; downloadDir = "/var/lib/media"; + rpcListenPort = 6969; }; # services.nginx = { diff --git a/nixos/package-configs/nextcloud/configuration.nix b/nixos/package-configs/nextcloud/configuration.nix index 0bfa331..34b1926 100644 --- a/nixos/package-configs/nextcloud/configuration.nix +++ b/nixos/package-configs/nextcloud/configuration.nix @@ -101,11 +101,6 @@ enable = true; }; - services.aria2 = { - enable = true; - rpcListenPort = 6969; - }; - systemd.services."sops-nix.service" = { before = [ "nextcloud-setup.service" From 7f901a2938db2e9d12fd66d6c53f2408771e39a2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 13:36:43 +0100 Subject: [PATCH 0798/2308] Ah I changed the port, made it more clear now --- nixos/hosts/queen/configuration.nix | 1 + nixos/package-configs/aria2/configuration.nix | 1 + nixos/package-configs/nextcloud/configuration.nix | 5 ----- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index e065a5e..da90c5f 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -28,6 +28,7 @@ ../../package-configs/ombi/configuration.nix ../../package-configs/radarr/configuration.nix ../../package-configs/sonarr/configuration.nix + ../../package-configs/aria2/configuration.nix ]; boot.tmp.cleanOnBoot = true; diff --git a/nixos/package-configs/aria2/configuration.nix b/nixos/package-configs/aria2/configuration.nix index 0bd31a2..4ffdac2 100644 --- a/nixos/package-configs/aria2/configuration.nix +++ b/nixos/package-configs/aria2/configuration.nix @@ -9,6 +9,7 @@ services.aria2 = { enable = true; downloadDir = "/var/lib/media"; + rpcListenPort = 6969; }; # services.nginx = { diff --git a/nixos/package-configs/nextcloud/configuration.nix b/nixos/package-configs/nextcloud/configuration.nix index 0bfa331..34b1926 100644 --- a/nixos/package-configs/nextcloud/configuration.nix +++ b/nixos/package-configs/nextcloud/configuration.nix @@ -101,11 +101,6 @@ enable = true; }; - services.aria2 = { - enable = true; - rpcListenPort = 6969; - }; - systemd.services."sops-nix.service" = { before = [ "nextcloud-setup.service" From 02876ce7b3bd136f3281c19f9232be67970d17df Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 14:49:45 +0100 Subject: [PATCH 0799/2308] Small refactor and added prowlarr --- nixos/hosts/queen/configuration.nix | 24 ++++--- nixos/package-configs/ombi/configuration.nix | 25 ------- .../package-configs/radarr/configuration.nix | 25 ------- .../package-configs/sonarr/configuration.nix | 25 ------- .../package-configs/akkoma/configuration.nix | 0 .../package-configs/aria2/configuration.nix | 0 .../package-configs/forgejo/configuration.nix | 0 .../gotosocial/configuration.nix | 0 .../jellyfin/configuration.nix | 0 .../mail-server/configuration.nix | 0 .../nextcloud/configuration.nix | 0 .../package-configs/ombi/configuration.nix | 65 +++++++++++++++++++ .../postgres/configuration.nix | 0 .../package-configs/postgres/upgrade.nix | 0 .../roundcube/configuration.nix | 0 15 files changed, 76 insertions(+), 88 deletions(-) delete mode 100644 nixos/package-configs/ombi/configuration.nix delete mode 100644 nixos/package-configs/radarr/configuration.nix delete mode 100644 nixos/package-configs/sonarr/configuration.nix rename nixos/{ => server}/package-configs/akkoma/configuration.nix (100%) rename nixos/{ => server}/package-configs/aria2/configuration.nix (100%) rename nixos/{ => server}/package-configs/forgejo/configuration.nix (100%) rename nixos/{ => server}/package-configs/gotosocial/configuration.nix (100%) rename nixos/{ => server}/package-configs/jellyfin/configuration.nix (100%) rename nixos/{ => server}/package-configs/mail-server/configuration.nix (100%) rename nixos/{ => server}/package-configs/nextcloud/configuration.nix (100%) create mode 100644 nixos/server/package-configs/ombi/configuration.nix rename nixos/{ => server}/package-configs/postgres/configuration.nix (100%) rename nixos/{ => server}/package-configs/postgres/upgrade.nix (100%) rename nixos/{ => server}/package-configs/roundcube/configuration.nix (100%) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index da90c5f..68c3694 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -16,19 +16,17 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix - ../../package-configs/akkoma/configuration.nix - ../../package-configs/forgejo/configuration.nix - ../../package-configs/gotosocial/configuration.nix - ../../package-configs/mail-server/configuration.nix - ../../package-configs/nextcloud/configuration.nix - ../../package-configs/postgres/configuration.nix - ../../package-configs/postgres/upgrade.nix - ../../package-configs/roundcube/configuration.nix - ../../package-configs/jellyfin/configuration.nix - ../../package-configs/ombi/configuration.nix - ../../package-configs/radarr/configuration.nix - ../../package-configs/sonarr/configuration.nix - ../../package-configs/aria2/configuration.nix + ../../server/package-configs/akkoma/configuration.nix + ../../server/package-configs/forgejo/configuration.nix + ../../server/package-configs/gotosocial/configuration.nix + ../../server/package-configs/mail-server/configuration.nix + ../../server/package-configs/nextcloud/configuration.nix + ../../server/package-configs/postgres/configuration.nix + ../../server/package-configs/postgres/upgrade.nix + ../../server/package-configs/roundcube/configuration.nix + ../../server/package-configs/jellyfin/configuration.nix + ../../server/package-configs/ombi/configuration.nix + ../../server/package-configs/aria2/configuration.nix ]; boot.tmp.cleanOnBoot = true; diff --git a/nixos/package-configs/ombi/configuration.nix b/nixos/package-configs/ombi/configuration.nix deleted file mode 100644 index 8c79fdf..0000000 --- a/nixos/package-configs/ombi/configuration.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - config, - pkgs, - ... -}: { - users.users = { - ombi.extraGroups = ["radarr" "sonarr" "aria2"]; - }; - services.ombi = { - enable = true; - port = 2368; - }; - - services.nginx = { - virtualHosts = { - "ombi.gladtherescake.eu" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:2368"; - }; - }; - }; - }; -} diff --git a/nixos/package-configs/radarr/configuration.nix b/nixos/package-configs/radarr/configuration.nix deleted file mode 100644 index 45a13a5..0000000 --- a/nixos/package-configs/radarr/configuration.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - config, - pkgs, - ... -}: { - users.users = { - radarr.extraGroups = ["aria2"]; - }; - #uses port 7878 - services.radarr = { - enable = true; - }; - - services.nginx = { - virtualHosts = { - "radarr.gladtherescake.eu" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:7878"; - }; - }; - }; - }; -} diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix deleted file mode 100644 index 884cd5a..0000000 --- a/nixos/package-configs/sonarr/configuration.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - config, - pkgs, - ... -}: { - users.users = { - sonarr.extraGroups = ["aria2"]; - }; - #uses port 8989 - services.sonarr = { - enable = true; - }; - - services.nginx = { - virtualHosts = { - "sonarr.gladtherescake.eu" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:8989"; - }; - }; - }; - }; -} diff --git a/nixos/package-configs/akkoma/configuration.nix b/nixos/server/package-configs/akkoma/configuration.nix similarity index 100% rename from nixos/package-configs/akkoma/configuration.nix rename to nixos/server/package-configs/akkoma/configuration.nix diff --git a/nixos/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix similarity index 100% rename from nixos/package-configs/aria2/configuration.nix rename to nixos/server/package-configs/aria2/configuration.nix diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix similarity index 100% rename from nixos/package-configs/forgejo/configuration.nix rename to nixos/server/package-configs/forgejo/configuration.nix diff --git a/nixos/package-configs/gotosocial/configuration.nix b/nixos/server/package-configs/gotosocial/configuration.nix similarity index 100% rename from nixos/package-configs/gotosocial/configuration.nix rename to nixos/server/package-configs/gotosocial/configuration.nix diff --git a/nixos/package-configs/jellyfin/configuration.nix b/nixos/server/package-configs/jellyfin/configuration.nix similarity index 100% rename from nixos/package-configs/jellyfin/configuration.nix rename to nixos/server/package-configs/jellyfin/configuration.nix diff --git a/nixos/package-configs/mail-server/configuration.nix b/nixos/server/package-configs/mail-server/configuration.nix similarity index 100% rename from nixos/package-configs/mail-server/configuration.nix rename to nixos/server/package-configs/mail-server/configuration.nix diff --git a/nixos/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix similarity index 100% rename from nixos/package-configs/nextcloud/configuration.nix rename to nixos/server/package-configs/nextcloud/configuration.nix diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/configuration.nix new file mode 100644 index 0000000..f99c67f --- /dev/null +++ b/nixos/server/package-configs/ombi/configuration.nix @@ -0,0 +1,65 @@ +{ + config, + pkgs, + ... +}: { + users.users = { + ombi.extraGroups = ["radarr" "sonarr" "aria2"]; + }; + services.ombi = { + enable = true; + port = 2368; + }; + + users.users = { + radarr.extraGroups = ["aria2"]; + sonarr.extraGroups = ["aria2"]; + prowlarr.extraGroups = ["aria2"]; + }; + #uses port 7878 + services.radarr = { + enable = true; + }; + + #uses port 8989 + services.sonarr = { + enable = true; + }; + + services.prowlarr = { + enable = true; + }; + + services.nginx = { + virtualHosts = { + "ombi.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:2368"; + }; + }; + "radarr.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:7878"; + }; + }; + "sonarr.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:8989"; + }; + }; + "prowlarr.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:9696"; + }; + }; + }; + }; +} diff --git a/nixos/package-configs/postgres/configuration.nix b/nixos/server/package-configs/postgres/configuration.nix similarity index 100% rename from nixos/package-configs/postgres/configuration.nix rename to nixos/server/package-configs/postgres/configuration.nix diff --git a/nixos/package-configs/postgres/upgrade.nix b/nixos/server/package-configs/postgres/upgrade.nix similarity index 100% rename from nixos/package-configs/postgres/upgrade.nix rename to nixos/server/package-configs/postgres/upgrade.nix diff --git a/nixos/package-configs/roundcube/configuration.nix b/nixos/server/package-configs/roundcube/configuration.nix similarity index 100% rename from nixos/package-configs/roundcube/configuration.nix rename to nixos/server/package-configs/roundcube/configuration.nix From 177ebd23506f44d2daf3a9d1811676191632ee08 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 14:49:45 +0100 Subject: [PATCH 0800/2308] Small refactor and added prowlarr --- nixos/hosts/queen/configuration.nix | 24 ++++--- nixos/package-configs/ombi/configuration.nix | 25 ------- .../package-configs/radarr/configuration.nix | 25 ------- .../package-configs/sonarr/configuration.nix | 25 ------- .../package-configs/akkoma/configuration.nix | 0 .../package-configs/aria2/configuration.nix | 0 .../package-configs/forgejo/configuration.nix | 0 .../gotosocial/configuration.nix | 0 .../jellyfin/configuration.nix | 0 .../mail-server/configuration.nix | 0 .../nextcloud/configuration.nix | 0 .../package-configs/ombi/configuration.nix | 65 +++++++++++++++++++ .../postgres/configuration.nix | 0 .../package-configs/postgres/upgrade.nix | 0 .../roundcube/configuration.nix | 0 15 files changed, 76 insertions(+), 88 deletions(-) delete mode 100644 nixos/package-configs/ombi/configuration.nix delete mode 100644 nixos/package-configs/radarr/configuration.nix delete mode 100644 nixos/package-configs/sonarr/configuration.nix rename nixos/{ => server}/package-configs/akkoma/configuration.nix (100%) rename nixos/{ => server}/package-configs/aria2/configuration.nix (100%) rename nixos/{ => server}/package-configs/forgejo/configuration.nix (100%) rename nixos/{ => server}/package-configs/gotosocial/configuration.nix (100%) rename nixos/{ => server}/package-configs/jellyfin/configuration.nix (100%) rename nixos/{ => server}/package-configs/mail-server/configuration.nix (100%) rename nixos/{ => server}/package-configs/nextcloud/configuration.nix (100%) create mode 100644 nixos/server/package-configs/ombi/configuration.nix rename nixos/{ => server}/package-configs/postgres/configuration.nix (100%) rename nixos/{ => server}/package-configs/postgres/upgrade.nix (100%) rename nixos/{ => server}/package-configs/roundcube/configuration.nix (100%) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index da90c5f..68c3694 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -16,19 +16,17 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix - ../../package-configs/akkoma/configuration.nix - ../../package-configs/forgejo/configuration.nix - ../../package-configs/gotosocial/configuration.nix - ../../package-configs/mail-server/configuration.nix - ../../package-configs/nextcloud/configuration.nix - ../../package-configs/postgres/configuration.nix - ../../package-configs/postgres/upgrade.nix - ../../package-configs/roundcube/configuration.nix - ../../package-configs/jellyfin/configuration.nix - ../../package-configs/ombi/configuration.nix - ../../package-configs/radarr/configuration.nix - ../../package-configs/sonarr/configuration.nix - ../../package-configs/aria2/configuration.nix + ../../server/package-configs/akkoma/configuration.nix + ../../server/package-configs/forgejo/configuration.nix + ../../server/package-configs/gotosocial/configuration.nix + ../../server/package-configs/mail-server/configuration.nix + ../../server/package-configs/nextcloud/configuration.nix + ../../server/package-configs/postgres/configuration.nix + ../../server/package-configs/postgres/upgrade.nix + ../../server/package-configs/roundcube/configuration.nix + ../../server/package-configs/jellyfin/configuration.nix + ../../server/package-configs/ombi/configuration.nix + ../../server/package-configs/aria2/configuration.nix ]; boot.tmp.cleanOnBoot = true; diff --git a/nixos/package-configs/ombi/configuration.nix b/nixos/package-configs/ombi/configuration.nix deleted file mode 100644 index 8c79fdf..0000000 --- a/nixos/package-configs/ombi/configuration.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - config, - pkgs, - ... -}: { - users.users = { - ombi.extraGroups = ["radarr" "sonarr" "aria2"]; - }; - services.ombi = { - enable = true; - port = 2368; - }; - - services.nginx = { - virtualHosts = { - "ombi.gladtherescake.eu" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:2368"; - }; - }; - }; - }; -} diff --git a/nixos/package-configs/radarr/configuration.nix b/nixos/package-configs/radarr/configuration.nix deleted file mode 100644 index 45a13a5..0000000 --- a/nixos/package-configs/radarr/configuration.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - config, - pkgs, - ... -}: { - users.users = { - radarr.extraGroups = ["aria2"]; - }; - #uses port 7878 - services.radarr = { - enable = true; - }; - - services.nginx = { - virtualHosts = { - "radarr.gladtherescake.eu" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:7878"; - }; - }; - }; - }; -} diff --git a/nixos/package-configs/sonarr/configuration.nix b/nixos/package-configs/sonarr/configuration.nix deleted file mode 100644 index 884cd5a..0000000 --- a/nixos/package-configs/sonarr/configuration.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - config, - pkgs, - ... -}: { - users.users = { - sonarr.extraGroups = ["aria2"]; - }; - #uses port 8989 - services.sonarr = { - enable = true; - }; - - services.nginx = { - virtualHosts = { - "sonarr.gladtherescake.eu" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:8989"; - }; - }; - }; - }; -} diff --git a/nixos/package-configs/akkoma/configuration.nix b/nixos/server/package-configs/akkoma/configuration.nix similarity index 100% rename from nixos/package-configs/akkoma/configuration.nix rename to nixos/server/package-configs/akkoma/configuration.nix diff --git a/nixos/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix similarity index 100% rename from nixos/package-configs/aria2/configuration.nix rename to nixos/server/package-configs/aria2/configuration.nix diff --git a/nixos/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix similarity index 100% rename from nixos/package-configs/forgejo/configuration.nix rename to nixos/server/package-configs/forgejo/configuration.nix diff --git a/nixos/package-configs/gotosocial/configuration.nix b/nixos/server/package-configs/gotosocial/configuration.nix similarity index 100% rename from nixos/package-configs/gotosocial/configuration.nix rename to nixos/server/package-configs/gotosocial/configuration.nix diff --git a/nixos/package-configs/jellyfin/configuration.nix b/nixos/server/package-configs/jellyfin/configuration.nix similarity index 100% rename from nixos/package-configs/jellyfin/configuration.nix rename to nixos/server/package-configs/jellyfin/configuration.nix diff --git a/nixos/package-configs/mail-server/configuration.nix b/nixos/server/package-configs/mail-server/configuration.nix similarity index 100% rename from nixos/package-configs/mail-server/configuration.nix rename to nixos/server/package-configs/mail-server/configuration.nix diff --git a/nixos/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix similarity index 100% rename from nixos/package-configs/nextcloud/configuration.nix rename to nixos/server/package-configs/nextcloud/configuration.nix diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/configuration.nix new file mode 100644 index 0000000..f99c67f --- /dev/null +++ b/nixos/server/package-configs/ombi/configuration.nix @@ -0,0 +1,65 @@ +{ + config, + pkgs, + ... +}: { + users.users = { + ombi.extraGroups = ["radarr" "sonarr" "aria2"]; + }; + services.ombi = { + enable = true; + port = 2368; + }; + + users.users = { + radarr.extraGroups = ["aria2"]; + sonarr.extraGroups = ["aria2"]; + prowlarr.extraGroups = ["aria2"]; + }; + #uses port 7878 + services.radarr = { + enable = true; + }; + + #uses port 8989 + services.sonarr = { + enable = true; + }; + + services.prowlarr = { + enable = true; + }; + + services.nginx = { + virtualHosts = { + "ombi.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:2368"; + }; + }; + "radarr.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:7878"; + }; + }; + "sonarr.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:8989"; + }; + }; + "prowlarr.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:9696"; + }; + }; + }; + }; +} diff --git a/nixos/package-configs/postgres/configuration.nix b/nixos/server/package-configs/postgres/configuration.nix similarity index 100% rename from nixos/package-configs/postgres/configuration.nix rename to nixos/server/package-configs/postgres/configuration.nix diff --git a/nixos/package-configs/postgres/upgrade.nix b/nixos/server/package-configs/postgres/upgrade.nix similarity index 100% rename from nixos/package-configs/postgres/upgrade.nix rename to nixos/server/package-configs/postgres/upgrade.nix diff --git a/nixos/package-configs/roundcube/configuration.nix b/nixos/server/package-configs/roundcube/configuration.nix similarity index 100% rename from nixos/package-configs/roundcube/configuration.nix rename to nixos/server/package-configs/roundcube/configuration.nix From c8fb09f13d9e5b8553606a3a1ad687454e65a979 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 14:51:50 +0100 Subject: [PATCH 0801/2308] Group shit --- nixos/server/package-configs/ombi/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/configuration.nix index f99c67f..62477df 100644 --- a/nixos/server/package-configs/ombi/configuration.nix +++ b/nixos/server/package-configs/ombi/configuration.nix @@ -14,7 +14,10 @@ users.users = { radarr.extraGroups = ["aria2"]; sonarr.extraGroups = ["aria2"]; - prowlarr.extraGroups = ["aria2"]; + prowlarr = { + group = "prowlarr"; + extraGroups = ["aria2"]; + }; }; #uses port 7878 services.radarr = { From bdaec9c77193026787cbbe0a472f3c52e9234aaf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 14:51:50 +0100 Subject: [PATCH 0802/2308] Group shit --- nixos/server/package-configs/ombi/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/configuration.nix index f99c67f..62477df 100644 --- a/nixos/server/package-configs/ombi/configuration.nix +++ b/nixos/server/package-configs/ombi/configuration.nix @@ -14,7 +14,10 @@ users.users = { radarr.extraGroups = ["aria2"]; sonarr.extraGroups = ["aria2"]; - prowlarr.extraGroups = ["aria2"]; + prowlarr = { + group = "prowlarr"; + extraGroups = ["aria2"]; + }; }; #uses port 7878 services.radarr = { From 8605bfff925a0211500cb6a9f48489418ab8a380 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 14:52:39 +0100 Subject: [PATCH 0803/2308] Doesn't seem to be a user anyway --- nixos/server/package-configs/ombi/configuration.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/configuration.nix index 62477df..35fc708 100644 --- a/nixos/server/package-configs/ombi/configuration.nix +++ b/nixos/server/package-configs/ombi/configuration.nix @@ -14,10 +14,6 @@ users.users = { radarr.extraGroups = ["aria2"]; sonarr.extraGroups = ["aria2"]; - prowlarr = { - group = "prowlarr"; - extraGroups = ["aria2"]; - }; }; #uses port 7878 services.radarr = { From 054b621bdb6fb77584f1faa8edb004bb4737a45e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 14:52:39 +0100 Subject: [PATCH 0804/2308] Doesn't seem to be a user anyway --- nixos/server/package-configs/ombi/configuration.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/configuration.nix index 62477df..35fc708 100644 --- a/nixos/server/package-configs/ombi/configuration.nix +++ b/nixos/server/package-configs/ombi/configuration.nix @@ -14,10 +14,6 @@ users.users = { radarr.extraGroups = ["aria2"]; sonarr.extraGroups = ["aria2"]; - prowlarr = { - group = "prowlarr"; - extraGroups = ["aria2"]; - }; }; #uses port 7878 services.radarr = { From 64ed7e570387564e1308ab79e1d179cac52047b1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 15:41:47 +0100 Subject: [PATCH 0805/2308] make jellyfin see aria2 files --- nixos/server/package-configs/jellyfin/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/jellyfin/configuration.nix b/nixos/server/package-configs/jellyfin/configuration.nix index 7231059..71885a7 100644 --- a/nixos/server/package-configs/jellyfin/configuration.nix +++ b/nixos/server/package-configs/jellyfin/configuration.nix @@ -6,7 +6,7 @@ pkgs, ... }: { - users.users.jellyfin.extraGroups = ["nextcloud"]; + users.users.jellyfin.extraGroups = ["nextcloud" "aria2"]; services.nginx = { virtualHosts = { From a792691707d448dfb0ec1a69eeff98e5ce331d77 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 15:41:47 +0100 Subject: [PATCH 0806/2308] make jellyfin see aria2 files --- nixos/server/package-configs/jellyfin/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/jellyfin/configuration.nix b/nixos/server/package-configs/jellyfin/configuration.nix index 7231059..71885a7 100644 --- a/nixos/server/package-configs/jellyfin/configuration.nix +++ b/nixos/server/package-configs/jellyfin/configuration.nix @@ -6,7 +6,7 @@ pkgs, ... }: { - users.users.jellyfin.extraGroups = ["nextcloud"]; + users.users.jellyfin.extraGroups = ["nextcloud" "aria2"]; services.nginx = { virtualHosts = { From 1cc6ff768b64029ba5231f24e928e036ff43d905 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 15:46:25 +0100 Subject: [PATCH 0807/2308] Add sonarr and radarr to nextcloud --- nixos/server/package-configs/ombi/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/configuration.nix index 35fc708..0037cbe 100644 --- a/nixos/server/package-configs/ombi/configuration.nix +++ b/nixos/server/package-configs/ombi/configuration.nix @@ -12,8 +12,8 @@ }; users.users = { - radarr.extraGroups = ["aria2"]; - sonarr.extraGroups = ["aria2"]; + radarr.extraGroups = ["aria2" "nextcloud"]; + sonarr.extraGroups = ["aria2" "nextcloud"]; }; #uses port 7878 services.radarr = { From 5c949734456571fd9cb5f5654f2d9e2fa98847d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 15:46:25 +0100 Subject: [PATCH 0808/2308] Add sonarr and radarr to nextcloud --- nixos/server/package-configs/ombi/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/configuration.nix index 35fc708..0037cbe 100644 --- a/nixos/server/package-configs/ombi/configuration.nix +++ b/nixos/server/package-configs/ombi/configuration.nix @@ -12,8 +12,8 @@ }; users.users = { - radarr.extraGroups = ["aria2"]; - sonarr.extraGroups = ["aria2"]; + radarr.extraGroups = ["aria2" "nextcloud"]; + sonarr.extraGroups = ["aria2" "nextcloud"]; }; #uses port 7878 services.radarr = { From 28655acfc421ff228c2b8441dbd7f24deb42aab6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 19:24:58 +0100 Subject: [PATCH 0809/2308] small refactor of the ombi file --- .../package-configs/ombi/configuration.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/configuration.nix index 0037cbe..7065ae5 100644 --- a/nixos/server/package-configs/ombi/configuration.nix +++ b/nixos/server/package-configs/ombi/configuration.nix @@ -4,7 +4,7 @@ ... }: { users.users = { - ombi.extraGroups = ["radarr" "sonarr" "aria2"]; + ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"]; }; services.ombi = { enable = true; @@ -15,18 +15,13 @@ radarr.extraGroups = ["aria2" "nextcloud"]; sonarr.extraGroups = ["aria2" "nextcloud"]; }; - #uses port 7878 - services.radarr = { - enable = true; - }; - #uses port 8989 - services.sonarr = { - enable = true; - }; - - services.prowlarr = { - enable = true; + services = { + #uses port 7878 + radarr.enable = true; + #uses port 8989 + sonarr.enable = true; + prowlarr.enable = true; }; services.nginx = { From 31b4ac5d297adbac1f269c5e1a271fc8cac8642f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 19:24:58 +0100 Subject: [PATCH 0810/2308] small refactor of the ombi file --- .../package-configs/ombi/configuration.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/configuration.nix index 0037cbe..7065ae5 100644 --- a/nixos/server/package-configs/ombi/configuration.nix +++ b/nixos/server/package-configs/ombi/configuration.nix @@ -4,7 +4,7 @@ ... }: { users.users = { - ombi.extraGroups = ["radarr" "sonarr" "aria2"]; + ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"]; }; services.ombi = { enable = true; @@ -15,18 +15,13 @@ radarr.extraGroups = ["aria2" "nextcloud"]; sonarr.extraGroups = ["aria2" "nextcloud"]; }; - #uses port 7878 - services.radarr = { - enable = true; - }; - #uses port 8989 - services.sonarr = { - enable = true; - }; - - services.prowlarr = { - enable = true; + services = { + #uses port 7878 + radarr.enable = true; + #uses port 8989 + sonarr.enable = true; + prowlarr.enable = true; }; services.nginx = { From 4480804831c4e4563ed60713b8d953be166a5cd4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 19:25:46 +0100 Subject: [PATCH 0811/2308] nix flake update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index eb9953e..b4e690f 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1704311514, - "narHash": "sha256-j6JsfCv31bW7LzV06q2L/27QZ4k1Zq7lEq2AR9R150A=", + "lastModified": 1704383912, + "narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=", "owner": "nix-community", "repo": "home-manager", - "rev": "fcbc70a7ee064f2b65dc1fac1717ca2a9813bbe6", + "rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704008649, - "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=", + "lastModified": 1704161960, + "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7", + "rev": "63143ac2c9186be6d9da6035fa22620018c85932", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { From 042cf81ab02f73a9e520a1d740c934917e05be87 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 19:25:46 +0100 Subject: [PATCH 0812/2308] nix flake update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index eb9953e..b4e690f 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1704311514, - "narHash": "sha256-j6JsfCv31bW7LzV06q2L/27QZ4k1Zq7lEq2AR9R150A=", + "lastModified": 1704383912, + "narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=", "owner": "nix-community", "repo": "home-manager", - "rev": "fcbc70a7ee064f2b65dc1fac1717ca2a9813bbe6", + "rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704008649, - "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=", + "lastModified": 1704161960, + "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7", + "rev": "63143ac2c9186be6d9da6035fa22620018c85932", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { From 7012b5b9f1ad18a77431503483e788cdd216ffd9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 19:30:17 +0100 Subject: [PATCH 0813/2308] Update jovian nixos --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f82fb7c..949c87f 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -11,7 +11,7 @@ ( # Put the most recent revision here: let - revision = "4d24d2ff927a8b8a698bbacdb1966045bcadf872"; + revision = "1962ff3135b1468ae473a196da01d0ebf38c144e"; in builtins.fetchTarball { url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz"; From 5b2f58f98ae0b976e74c1fa971ddb3eee1554fd4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 19:30:17 +0100 Subject: [PATCH 0814/2308] Update jovian nixos --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f82fb7c..949c87f 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -11,7 +11,7 @@ ( # Put the most recent revision here: let - revision = "4d24d2ff927a8b8a698bbacdb1966045bcadf872"; + revision = "1962ff3135b1468ae473a196da01d0ebf38c144e"; in builtins.fetchTarball { url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz"; From da59b78cbf93f541893261adcecdffe439559f28 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 19:30:52 +0100 Subject: [PATCH 0815/2308] Update sha --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 949c87f..e283694 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -16,7 +16,7 @@ builtins.fetchTarball { url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz"; # Update the hash as needed: - sha256 = "sha256:1bj0vm734jllsl7kyicdjlcpm30q6syzavr3im89m0f5bpnzkj7l"; + sha256 = "sha256:1iicb42dy4k440ddarysbb82bc7k5dv94xhg38jfcwh0wpq0rbdc"; } + "/modules" ) From af8e3095000449e58dec04e907fec917ab7d7df8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 19:30:52 +0100 Subject: [PATCH 0816/2308] Update sha --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 949c87f..e283694 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -16,7 +16,7 @@ builtins.fetchTarball { url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz"; # Update the hash as needed: - sha256 = "sha256:1bj0vm734jllsl7kyicdjlcpm30q6syzavr3im89m0f5bpnzkj7l"; + sha256 = "sha256:1iicb42dy4k440ddarysbb82bc7k5dv94xhg38jfcwh0wpq0rbdc"; } + "/modules" ) From be18666f922cdd674a1850c1c966495788ca7c5f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 20:15:51 +0100 Subject: [PATCH 0817/2308] Enable websocket proxy for jellyfin --- nixos/server/package-configs/jellyfin/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/jellyfin/configuration.nix b/nixos/server/package-configs/jellyfin/configuration.nix index 71885a7..f61461e 100644 --- a/nixos/server/package-configs/jellyfin/configuration.nix +++ b/nixos/server/package-configs/jellyfin/configuration.nix @@ -15,6 +15,7 @@ enableACME = true; locations."/" = { proxyPass = "http://localhost:8096"; + proxyWebsockets = true; # needed if you need to use WebSocket }; }; }; From 81b39fa48e532a0bc4bd37d21dd7d3f9e24307fb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 20:15:51 +0100 Subject: [PATCH 0818/2308] Enable websocket proxy for jellyfin --- nixos/server/package-configs/jellyfin/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/jellyfin/configuration.nix b/nixos/server/package-configs/jellyfin/configuration.nix index 71885a7..f61461e 100644 --- a/nixos/server/package-configs/jellyfin/configuration.nix +++ b/nixos/server/package-configs/jellyfin/configuration.nix @@ -15,6 +15,7 @@ enableACME = true; locations."/" = { proxyPass = "http://localhost:8096"; + proxyWebsockets = true; # needed if you need to use WebSocket }; }; }; From 74e53e59253d07be90a402d35f6fcbe4f2fb9816 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:25:34 +0100 Subject: [PATCH 0819/2308] Enable vpn for aria2 --- nixos/hosts/queen/secrets/sops.yaml | 5 +- .../package-configs/aria2/configuration.nix | 70 ++++++++++++++----- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index 8c97dd6..1eba722 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -6,6 +6,7 @@ releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/ mssqlpass: ENC[AES256_GCM,data:XEu4bQC5qM5Cm8UDVX3qAzTuL/t3xbx+qcEbZM4h3Hg=,iv:jgpZ93THYBlUvJDC5+YZiIxu/14e7nFSy76J0vc8Hek=,tag:iKsEDp/KZ5juqzmUgtP8iA==,type:str] mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8,iv:oAFna87l3sL/42ljUF1QsRL0xBrP82uYdKLxK/8HcQE=,tag:liFFGHbNPOpOHyMsjnvMOQ==,type:str] rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8uo8I8ZymVgIMKLI=,tag:Fr8rWIttLz7X8Pri6FBJBQ==,type:str] +wg-private: ENC[AES256_GCM,data:6BEuNqqG//p5UhRmQ4RPEze6jZdvzK4PEXxlbX2ANYIhFpacj0aZnCr9o/A=,iv:tPlwYdV4I5oA8qG+bfVi1Dpbf7xedByantqsmylZXKQ=,tag:k1BqKqlayOWz5QW1XiAjqQ==,type:str] sops: kms: [] gcp_kms: [] @@ -21,8 +22,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-04T12:15:46Z" - mac: ENC[AES256_GCM,data:a9SPOcOGrhB3u2d1Ju9rEFrkS/PjkK3aTmHJSODRtameV6f2h3iuLzpgHVtZZ08MPoajriasAxAYIsZNwfGbRvAffqf+H85TnKy8e115x9MqZB0EFAwHWuxysjRsRwaJLpjFos3HdsYciro4EDrBKfbvLrLLjxNRWf3FwALA6WQ=,iv:VXUTnQN7B+u+g4OCut3YUxqqGb6mTN7yTubZLZpR19w=,tag:NfBfVQkFlcwq+w5/ckQqGA==,type:str] + lastmodified: "2024-01-04T21:18:00Z" + mac: ENC[AES256_GCM,data:ZHXg541BI94kwvLJ/CFHS7UauQN6LimqNK9rU60dil1RIArDy5xHtRki/p5uajKeGhM+Bv1t9SWAehk1n3U0PiynLGLm3npraIxItBPiRf7hyqDXmc8kG4U7BBcbIf3qvkvxVVd5auWfnPobKsRhKA+gC1Z11ylPqK37yIgK5Sw=,iv:EKacOHhgwjFDw2ioraxlyfXt89VpT+B4D/a/rC+ulNM=,tag:YvgctOLxmojg2uOAlKihkQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 4ffdac2..dd7fb5d 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -3,24 +3,56 @@ pkgs, ... }: { - users.users = { - aria2.extraGroups = ["jellyfin" "nextcloud"]; - }; - services.aria2 = { - enable = true; - downloadDir = "/var/lib/media"; - rpcListenPort = 6969; - }; + sops.secrets."nextcloudadmin".mode = "0440"; + sops.secrets."nextcloudadmin".owner = config.users.users.aria2.name; + containers.aria2 = { + forwardPorts = { + hostPort = 6969; + protocol = "tcp"; + }; + bindmounts = { + "/var/lib/media" = { + hostPath = "/var/lib/media"; + isReadOnly = false; + }; + "/var/lib/wg/private-key" = { + hostPath = sops.secrets."nextcloudadmin".path; + isReadOnly = true; + }; + }; + autoStart = true; + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; + config = { + config, + pkgs, + ... + }: { + users.users = { + aria2.extraGroups = ["jellyfin" "nextcloud"]; + }; + services.aria2 = { + enable = true; + downloadDir = "/var/lib/media"; + rpcListenPort = 6969; + }; + networking.wg-quick.interfaces = { + wg0 = { + address = ["10.2.0.2/32"]; + dns = ["10.2.0.1"]; + privateKeyFile = "/var/lib/wg/private-key"; - # services.nginx = { - # virtualHosts = { - # "aria2.gladtherescake.eu" = { - # forceSSL = true; - # enableACME = true; - # locations."/" = { - # proxyPass = "http://localhost:6800"; - # }; - # }; - # }; - # }; + peers = [ + { + publicKey = "7A19/lMrfmpFZARivC7FS8DcGxMn5uUq9LcOqFjzlDo="; + allowedIPs = ["0.0.0.0/0"]; + endpoint = "185.159.158.182:51820"; + persistentKeepalive = 25; + } + ]; + }; + }; + }; + }; } From 1009d99034d4db3507fa38860b3d3ff58b57287e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:25:34 +0100 Subject: [PATCH 0820/2308] Enable vpn for aria2 --- nixos/hosts/queen/secrets/sops.yaml | 5 +- .../package-configs/aria2/configuration.nix | 70 ++++++++++++++----- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index 8c97dd6..1eba722 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -6,6 +6,7 @@ releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/ mssqlpass: ENC[AES256_GCM,data:XEu4bQC5qM5Cm8UDVX3qAzTuL/t3xbx+qcEbZM4h3Hg=,iv:jgpZ93THYBlUvJDC5+YZiIxu/14e7nFSy76J0vc8Hek=,tag:iKsEDp/KZ5juqzmUgtP8iA==,type:str] mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8,iv:oAFna87l3sL/42ljUF1QsRL0xBrP82uYdKLxK/8HcQE=,tag:liFFGHbNPOpOHyMsjnvMOQ==,type:str] rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8uo8I8ZymVgIMKLI=,tag:Fr8rWIttLz7X8Pri6FBJBQ==,type:str] +wg-private: ENC[AES256_GCM,data:6BEuNqqG//p5UhRmQ4RPEze6jZdvzK4PEXxlbX2ANYIhFpacj0aZnCr9o/A=,iv:tPlwYdV4I5oA8qG+bfVi1Dpbf7xedByantqsmylZXKQ=,tag:k1BqKqlayOWz5QW1XiAjqQ==,type:str] sops: kms: [] gcp_kms: [] @@ -21,8 +22,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-04T12:15:46Z" - mac: ENC[AES256_GCM,data:a9SPOcOGrhB3u2d1Ju9rEFrkS/PjkK3aTmHJSODRtameV6f2h3iuLzpgHVtZZ08MPoajriasAxAYIsZNwfGbRvAffqf+H85TnKy8e115x9MqZB0EFAwHWuxysjRsRwaJLpjFos3HdsYciro4EDrBKfbvLrLLjxNRWf3FwALA6WQ=,iv:VXUTnQN7B+u+g4OCut3YUxqqGb6mTN7yTubZLZpR19w=,tag:NfBfVQkFlcwq+w5/ckQqGA==,type:str] + lastmodified: "2024-01-04T21:18:00Z" + mac: ENC[AES256_GCM,data:ZHXg541BI94kwvLJ/CFHS7UauQN6LimqNK9rU60dil1RIArDy5xHtRki/p5uajKeGhM+Bv1t9SWAehk1n3U0PiynLGLm3npraIxItBPiRf7hyqDXmc8kG4U7BBcbIf3qvkvxVVd5auWfnPobKsRhKA+gC1Z11ylPqK37yIgK5Sw=,iv:EKacOHhgwjFDw2ioraxlyfXt89VpT+B4D/a/rC+ulNM=,tag:YvgctOLxmojg2uOAlKihkQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 4ffdac2..dd7fb5d 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -3,24 +3,56 @@ pkgs, ... }: { - users.users = { - aria2.extraGroups = ["jellyfin" "nextcloud"]; - }; - services.aria2 = { - enable = true; - downloadDir = "/var/lib/media"; - rpcListenPort = 6969; - }; + sops.secrets."nextcloudadmin".mode = "0440"; + sops.secrets."nextcloudadmin".owner = config.users.users.aria2.name; + containers.aria2 = { + forwardPorts = { + hostPort = 6969; + protocol = "tcp"; + }; + bindmounts = { + "/var/lib/media" = { + hostPath = "/var/lib/media"; + isReadOnly = false; + }; + "/var/lib/wg/private-key" = { + hostPath = sops.secrets."nextcloudadmin".path; + isReadOnly = true; + }; + }; + autoStart = true; + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; + config = { + config, + pkgs, + ... + }: { + users.users = { + aria2.extraGroups = ["jellyfin" "nextcloud"]; + }; + services.aria2 = { + enable = true; + downloadDir = "/var/lib/media"; + rpcListenPort = 6969; + }; + networking.wg-quick.interfaces = { + wg0 = { + address = ["10.2.0.2/32"]; + dns = ["10.2.0.1"]; + privateKeyFile = "/var/lib/wg/private-key"; - # services.nginx = { - # virtualHosts = { - # "aria2.gladtherescake.eu" = { - # forceSSL = true; - # enableACME = true; - # locations."/" = { - # proxyPass = "http://localhost:6800"; - # }; - # }; - # }; - # }; + peers = [ + { + publicKey = "7A19/lMrfmpFZARivC7FS8DcGxMn5uUq9LcOqFjzlDo="; + allowedIPs = ["0.0.0.0/0"]; + endpoint = "185.159.158.182:51820"; + persistentKeepalive = 25; + } + ]; + }; + }; + }; + }; } From 23cf7cbd6dcb6c02918736ceced750ab06435fc2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:27:42 +0100 Subject: [PATCH 0821/2308] Fix the sops file location hopefully --- nixos/server/package-configs/aria2/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index dd7fb5d..bb023e5 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -3,8 +3,8 @@ pkgs, ... }: { - sops.secrets."nextcloudadmin".mode = "0440"; - sops.secrets."nextcloudadmin".owner = config.users.users.aria2.name; + sops.secrets."wg-private".mode = "0440"; + sops.secrets."wg-private".owner = config.users.users.aria2.name; containers.aria2 = { forwardPorts = { hostPort = 6969; @@ -16,7 +16,7 @@ isReadOnly = false; }; "/var/lib/wg/private-key" = { - hostPath = sops.secrets."nextcloudadmin".path; + hostPath = config.sops.secrets."wg-private".path; isReadOnly = true; }; }; From 35a3d6e7abb20105e4694d37b72309541735ee98 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:27:42 +0100 Subject: [PATCH 0822/2308] Fix the sops file location hopefully --- nixos/server/package-configs/aria2/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index dd7fb5d..bb023e5 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -3,8 +3,8 @@ pkgs, ... }: { - sops.secrets."nextcloudadmin".mode = "0440"; - sops.secrets."nextcloudadmin".owner = config.users.users.aria2.name; + sops.secrets."wg-private".mode = "0440"; + sops.secrets."wg-private".owner = config.users.users.aria2.name; containers.aria2 = { forwardPorts = { hostPort = 6969; @@ -16,7 +16,7 @@ isReadOnly = false; }; "/var/lib/wg/private-key" = { - hostPath = sops.secrets."nextcloudadmin".path; + hostPath = config.sops.secrets."wg-private".path; isReadOnly = true; }; }; From f76d2a0496370b1649e34e9fc1524a58c9b58bda Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:28:38 +0100 Subject: [PATCH 0823/2308] Wrong capitalisation on bindMounts --- nixos/server/package-configs/aria2/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index bb023e5..33c332d 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -10,7 +10,7 @@ hostPort = 6969; protocol = "tcp"; }; - bindmounts = { + bindMounts = { "/var/lib/media" = { hostPath = "/var/lib/media"; isReadOnly = false; From 4b91bc3f432e0f0c876b6e354accf79453609aff Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:28:38 +0100 Subject: [PATCH 0824/2308] Wrong capitalisation on bindMounts --- nixos/server/package-configs/aria2/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index bb023e5..33c332d 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -10,7 +10,7 @@ hostPort = 6969; protocol = "tcp"; }; - bindmounts = { + bindMounts = { "/var/lib/media" = { hostPath = "/var/lib/media"; isReadOnly = false; From a8fb2c16a0025ff17944eab1c117f4dcbb0982c0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:30:38 +0100 Subject: [PATCH 0825/2308] Create aria2 user since it's containerised now --- nixos/server/package-configs/aria2/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 33c332d..9cad877 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -3,6 +3,10 @@ pkgs, ... }: { + users.users.aria2.group = "aria2"; + users.groups.aria2 = {}; + users.users.aria2.isSystemUser = true; + sops.secrets."wg-private".mode = "0440"; sops.secrets."wg-private".owner = config.users.users.aria2.name; containers.aria2 = { From 811e0d5805c4f1246d0c3777a7a19edfa00694e5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:30:38 +0100 Subject: [PATCH 0826/2308] Create aria2 user since it's containerised now --- nixos/server/package-configs/aria2/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 33c332d..9cad877 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -3,6 +3,10 @@ pkgs, ... }: { + users.users.aria2.group = "aria2"; + users.groups.aria2 = {}; + users.users.aria2.isSystemUser = true; + sops.secrets."wg-private".mode = "0440"; sops.secrets."wg-private".owner = config.users.users.aria2.name; containers.aria2 = { From 18208929b0302afbd3924a88004939ba790f03ea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:33:04 +0100 Subject: [PATCH 0827/2308] Set state version and fix forward ports --- nixos/server/package-configs/aria2/configuration.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 9cad877..b57fa03 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -10,10 +10,13 @@ sops.secrets."wg-private".mode = "0440"; sops.secrets."wg-private".owner = config.users.users.aria2.name; containers.aria2 = { - forwardPorts = { - hostPort = 6969; - protocol = "tcp"; - }; + system.stateVersion = "23.11"; + forwardPorts = [ + { + hostPort = 6969; + protocol = "tcp"; + } + ]; bindMounts = { "/var/lib/media" = { hostPath = "/var/lib/media"; From de915349c78b1e3cd4f813fabd0f483124a7e21c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:33:04 +0100 Subject: [PATCH 0828/2308] Set state version and fix forward ports --- nixos/server/package-configs/aria2/configuration.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 9cad877..b57fa03 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -10,10 +10,13 @@ sops.secrets."wg-private".mode = "0440"; sops.secrets."wg-private".owner = config.users.users.aria2.name; containers.aria2 = { - forwardPorts = { - hostPort = 6969; - protocol = "tcp"; - }; + system.stateVersion = "23.11"; + forwardPorts = [ + { + hostPort = 6969; + protocol = "tcp"; + } + ]; bindMounts = { "/var/lib/media" = { hostPath = "/var/lib/media"; From 6faf2bc249ea6992ecb6f3f6d718c81a6d36a2ea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:34:03 +0100 Subject: [PATCH 0829/2308] Wrong place to do stateversion --- nixos/server/package-configs/aria2/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index b57fa03..5f7e81e 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -10,7 +10,6 @@ sops.secrets."wg-private".mode = "0440"; sops.secrets."wg-private".owner = config.users.users.aria2.name; containers.aria2 = { - system.stateVersion = "23.11"; forwardPorts = [ { hostPort = 6969; @@ -36,6 +35,7 @@ pkgs, ... }: { + system.stateVersion = "23.11"; users.users = { aria2.extraGroups = ["jellyfin" "nextcloud"]; }; From 94031ebc5a107b75727631e4b449ce4101da5c2f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 22:34:03 +0100 Subject: [PATCH 0830/2308] Wrong place to do stateversion --- nixos/server/package-configs/aria2/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index b57fa03..5f7e81e 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -10,7 +10,6 @@ sops.secrets."wg-private".mode = "0440"; sops.secrets."wg-private".owner = config.users.users.aria2.name; containers.aria2 = { - system.stateVersion = "23.11"; forwardPorts = [ { hostPort = 6969; @@ -36,6 +35,7 @@ pkgs, ... }: { + system.stateVersion = "23.11"; users.users = { aria2.extraGroups = ["jellyfin" "nextcloud"]; }; From b6e45b652ecd2b9565cba38751f455ba01af0471 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 23:21:53 +0100 Subject: [PATCH 0831/2308] Open port in container firewall maybe --- nixos/server/package-configs/aria2/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 5f7e81e..43d0b58 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -12,6 +12,7 @@ containers.aria2 = { forwardPorts = [ { + containerPort = 6969; hostPort = 6969; protocol = "tcp"; } @@ -36,6 +37,7 @@ ... }: { system.stateVersion = "23.11"; + networking.firewall.allowedTCPPorts = [6969]; users.users = { aria2.extraGroups = ["jellyfin" "nextcloud"]; }; From b6f7813cf805275d4eb271b26fc7a25d77d90d10 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 23:21:53 +0100 Subject: [PATCH 0832/2308] Open port in container firewall maybe --- nixos/server/package-configs/aria2/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 5f7e81e..43d0b58 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -12,6 +12,7 @@ containers.aria2 = { forwardPorts = [ { + containerPort = 6969; hostPort = 6969; protocol = "tcp"; } @@ -36,6 +37,7 @@ ... }: { system.stateVersion = "23.11"; + networking.firewall.allowedTCPPorts = [6969]; users.users = { aria2.extraGroups = ["jellyfin" "nextcloud"]; }; From d5f7649b88985365d5f7f1b5614a33178ad7b202 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 23:25:08 +0100 Subject: [PATCH 0833/2308] Add ipv6 address --- nixos/server/package-configs/aria2/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 43d0b58..aa26f0e 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -31,6 +31,8 @@ privateNetwork = true; hostAddress = "192.168.100.10"; localAddress = "192.168.100.11"; + hostAddress6 = "fc00::1"; + localAddress6 = "fc00::2"; config = { config, pkgs, From 4c878c1ecb1f79ab4a43440285f5ad164aeb0e3f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 23:25:08 +0100 Subject: [PATCH 0834/2308] Add ipv6 address --- nixos/server/package-configs/aria2/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 43d0b58..aa26f0e 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -31,6 +31,8 @@ privateNetwork = true; hostAddress = "192.168.100.10"; localAddress = "192.168.100.11"; + hostAddress6 = "fc00::1"; + localAddress6 = "fc00::2"; config = { config, pkgs, From ebe57de26d13c3e93c76be72f3a8f509517bfade Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 23:35:52 +0100 Subject: [PATCH 0835/2308] Enable networking for the container --- nixos/hosts/queen/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 68c3694..aca8cb0 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -128,6 +128,9 @@ # Enable networking networking.networkmanager.enable = true; + networking.nat.enable = true; + networking.nat.internalInterfaces = ["ve-+"]; + networking.nat.externalInterface = "ens18"; networking.firewall.enable = true; From 9fe9d0bb092e3b34fcf66b9734ba181c11afc586 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jan 2024 23:35:52 +0100 Subject: [PATCH 0836/2308] Enable networking for the container --- nixos/hosts/queen/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 68c3694..aca8cb0 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -128,6 +128,9 @@ # Enable networking networking.networkmanager.enable = true; + networking.nat.enable = true; + networking.nat.internalInterfaces = ["ve-+"]; + networking.nat.externalInterface = "ens18"; networking.firewall.enable = true; From 515410b391cb62705ab62d48bf52071d2b65bf55 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 11:24:45 +0100 Subject: [PATCH 0837/2308] Add legendary-gl --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index e283694..c1e1916 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -117,6 +117,7 @@ #Gaming: heroic-unwrapped + legendary-gl ]; #Enable steam deck steam interface From 50d50564fa45b2d01dc9369b3b098ed35c9012ae Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 11:24:45 +0100 Subject: [PATCH 0838/2308] Add legendary-gl --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index e283694..c1e1916 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -117,6 +117,7 @@ #Gaming: heroic-unwrapped + legendary-gl ]; #Enable steam deck steam interface From 435ebdb793bf4eb1f3cefc6ce982d4d5d6061201 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 11:29:45 +0100 Subject: [PATCH 0839/2308] add rare (a gui for legendary) --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index c1e1916..d2d15d4 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -118,6 +118,7 @@ #Gaming: heroic-unwrapped legendary-gl + rare ]; #Enable steam deck steam interface From e1ea076048914de22dfa10e561867b01ac1a4620 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 11:29:45 +0100 Subject: [PATCH 0840/2308] add rare (a gui for legendary) --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index c1e1916..d2d15d4 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -118,6 +118,7 @@ #Gaming: heroic-unwrapped legendary-gl + rare ]; #Enable steam deck steam interface From d600265b79efaa921bd4ade055c614f70455011f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 12:39:37 +0100 Subject: [PATCH 0841/2308] Change heroic-unwrapped to heroic --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index d2d15d4..80f20f0 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -116,7 +116,7 @@ libportal-qt5 #Gaming: - heroic-unwrapped + heroic legendary-gl rare ]; From 7d828117ccd253fc9c615b75ab53581ee83b209f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 12:39:37 +0100 Subject: [PATCH 0842/2308] Change heroic-unwrapped to heroic --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index d2d15d4..80f20f0 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -116,7 +116,7 @@ libportal-qt5 #Gaming: - heroic-unwrapped + heroic legendary-gl rare ]; From 661c8da1fa68929de3f0b55fd7fee175bf555485 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 12:41:08 +0100 Subject: [PATCH 0843/2308] Same but for GLaDOS --- home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index e6b32ab..ca41b94 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -22,7 +22,7 @@ ]; home.packages = with pkgs; [ - heroic-unwrapped + heroic ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From 7e8dfb4f2e4745575712bf8b4eb8a4bb8587e63f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 12:41:08 +0100 Subject: [PATCH 0844/2308] Same but for GLaDOS --- home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index e6b32ab..ca41b94 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -22,7 +22,7 @@ ]; home.packages = with pkgs; [ - heroic-unwrapped + heroic ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From 776eaca1af3101913cc5e8fe8ce15290ea47e1b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 20:39:29 +0100 Subject: [PATCH 0845/2308] Add qtvirtualkeyboard to shodan (for sddm login) --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 80f20f0..41817be 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -99,6 +99,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh + qtvirtualkeyboard rsync wget zsh From 3cf1776aab1671cd43dd98c92ce2dbf4b48a0ace Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 20:39:29 +0100 Subject: [PATCH 0846/2308] Add qtvirtualkeyboard to shodan (for sddm login) --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 80f20f0..41817be 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -99,6 +99,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh + qtvirtualkeyboard rsync wget zsh From 7803e299cf543796168b0907e0750db7bb79f456 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 20:43:38 +0100 Subject: [PATCH 0847/2308] Wrong package name, fixed --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 41817be..fe5e976 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -99,7 +99,6 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - qtvirtualkeyboard rsync wget zsh @@ -114,6 +113,7 @@ libsForQt5.krunner-ssh libsForQt5.krunner-symbols libsForQt5.packagekit-qt + libsForQt5.qt5.qtvirtualkeyboard libportal-qt5 #Gaming: From 742907a0b6d8803dfa6e0f9675ea6ed8a1060b66 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Jan 2024 20:43:38 +0100 Subject: [PATCH 0848/2308] Wrong package name, fixed --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 41817be..fe5e976 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -99,7 +99,6 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - qtvirtualkeyboard rsync wget zsh @@ -114,6 +113,7 @@ libsForQt5.krunner-ssh libsForQt5.krunner-symbols libsForQt5.packagekit-qt + libsForQt5.qt5.qtvirtualkeyboard libportal-qt5 #Gaming: From d6eb8a9f5ff85b46d94f5b4cc6616acf298c1601 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:14:46 +0100 Subject: [PATCH 0849/2308] Update everything to unstable/24.05 --- home-manager/hosts/EDI/EDI-Lillian.nix | 2 +- home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 2 +- home-manager/hosts/queen/queen-Lillian.nix | 2 +- home-manager/hosts/shodan/shodan-Lillian.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- nixos/server/package-configs/aria2/configuration.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/hosts/EDI/EDI-Lillian.nix b/home-manager/hosts/EDI/EDI-Lillian.nix index b59fd8c..196022c 100644 --- a/home-manager/hosts/EDI/EDI-Lillian.nix +++ b/home-manager/hosts/EDI/EDI-Lillian.nix @@ -22,5 +22,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; } diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index ca41b94..6f85def 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -26,5 +26,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; } diff --git a/home-manager/hosts/queen/queen-Lillian.nix b/home-manager/hosts/queen/queen-Lillian.nix index 97d97ad..00fa021 100644 --- a/home-manager/hosts/queen/queen-Lillian.nix +++ b/home-manager/hosts/queen/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; } diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 3d2f798..3dd8382 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -91,5 +91,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; } diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index aca8cb0..efec8dd 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -196,5 +196,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.11"; + system.stateVersion = "unstable"; } diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index aa26f0e..2926b28 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -38,7 +38,7 @@ pkgs, ... }: { - system.stateVersion = "23.11"; + system.stateVersion = "unstable"; networking.firewall.allowedTCPPorts = [6969]; users.users = { aria2.extraGroups = ["jellyfin" "nextcloud"]; From 6be0773a8972b08a6732d9a0694dd10a31f149ce Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:14:46 +0100 Subject: [PATCH 0850/2308] Update everything to unstable/24.05 --- home-manager/hosts/EDI/EDI-Lillian.nix | 2 +- home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 2 +- home-manager/hosts/queen/queen-Lillian.nix | 2 +- home-manager/hosts/shodan/shodan-Lillian.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- nixos/server/package-configs/aria2/configuration.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/hosts/EDI/EDI-Lillian.nix b/home-manager/hosts/EDI/EDI-Lillian.nix index b59fd8c..196022c 100644 --- a/home-manager/hosts/EDI/EDI-Lillian.nix +++ b/home-manager/hosts/EDI/EDI-Lillian.nix @@ -22,5 +22,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; } diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index ca41b94..6f85def 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -26,5 +26,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; } diff --git a/home-manager/hosts/queen/queen-Lillian.nix b/home-manager/hosts/queen/queen-Lillian.nix index 97d97ad..00fa021 100644 --- a/home-manager/hosts/queen/queen-Lillian.nix +++ b/home-manager/hosts/queen/queen-Lillian.nix @@ -49,5 +49,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; } diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 3d2f798..3dd8382 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -91,5 +91,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; } diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index aca8cb0..efec8dd 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -196,5 +196,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.11"; + system.stateVersion = "unstable"; } diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index aa26f0e..2926b28 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -38,7 +38,7 @@ pkgs, ... }: { - system.stateVersion = "23.11"; + system.stateVersion = "unstable"; networking.firewall.allowedTCPPorts = [6969]; users.users = { aria2.extraGroups = ["jellyfin" "nextcloud"]; From a7a6250f877018d16699ec421afa4c9d1501b55d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:27:48 +0100 Subject: [PATCH 0851/2308] Maybe aria2 uses udp? --- nixos/server/package-configs/aria2/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 2926b28..4b031a7 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -14,7 +14,7 @@ { containerPort = 6969; hostPort = 6969; - protocol = "tcp"; + protocol = "udp"; } ]; bindMounts = { From c77d0f6e638d2063df6c2b76cb7a2b6ca8d6e7da Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:27:48 +0100 Subject: [PATCH 0852/2308] Maybe aria2 uses udp? --- nixos/server/package-configs/aria2/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 2926b28..4b031a7 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -14,7 +14,7 @@ { containerPort = 6969; hostPort = 6969; - protocol = "tcp"; + protocol = "udp"; } ]; bindMounts = { From 43ede3f74842eb9c44d9cf8bbc610337acbdafbb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:32:16 +0100 Subject: [PATCH 0853/2308] Allow udp through too --- nixos/server/package-configs/aria2/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 4b031a7..71c6b1d 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -40,6 +40,7 @@ }: { system.stateVersion = "unstable"; networking.firewall.allowedTCPPorts = [6969]; + networking.firewall.allowedUDPPorts = [6969]; users.users = { aria2.extraGroups = ["jellyfin" "nextcloud"]; }; From f60f11e220fe57398b0d8a2a9f2a87842eda4b70 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:32:16 +0100 Subject: [PATCH 0854/2308] Allow udp through too --- nixos/server/package-configs/aria2/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 4b031a7..71c6b1d 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -40,6 +40,7 @@ }: { system.stateVersion = "unstable"; networking.firewall.allowedTCPPorts = [6969]; + networking.firewall.allowedUDPPorts = [6969]; users.users = { aria2.extraGroups = ["jellyfin" "nextcloud"]; }; From c53a24e77f9e9641621112ab86cc399555a497a2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:48:52 +0100 Subject: [PATCH 0855/2308] try this postup postdown setting --- .../package-configs/aria2/configuration.nix | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 71c6b1d..4c9196d 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -40,7 +40,7 @@ }: { system.stateVersion = "unstable"; networking.firewall.allowedTCPPorts = [6969]; - networking.firewall.allowedUDPPorts = [6969]; + networking.firewall.allowedUDPPorts = [6969 51820]; users.users = { aria2.extraGroups = ["jellyfin" "nextcloud"]; }; @@ -51,6 +51,41 @@ }; networking.wg-quick.interfaces = { wg0 = { + postUp = '' + # Mark packets on the wg0 interface + wg set wg0 fwmark 51820 + + # Forbid anything else which doesn't go through wireguard VPN on + # ipV4 and ipV6 + ${pkgs.iptables}/bin/iptables -A OUTPUT \ + ! -d 192.168.0.0/16 \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/ip6tables -A OUTPUT \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/iptables -I OUTPUT -o lo -p tcp \ + --dport 8112 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -I OUTPUT -s 192.168.100.10/24 -d 192.168.100.11/24 \ + -j ACCEPT + ''; + postDown = '' + ${pkgs.iptables}/bin/iptables -D OUTPUT \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/ip6tables -D OUTPUT \ + ! -o wg0 -m mark \ + ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ''; + address = ["10.2.0.2/32"]; dns = ["10.2.0.1"]; privateKeyFile = "/var/lib/wg/private-key"; From 1d2fe4b2dbfba937a9a3594d26d8cfea827803a8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:48:52 +0100 Subject: [PATCH 0856/2308] try this postup postdown setting --- .../package-configs/aria2/configuration.nix | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 71c6b1d..4c9196d 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -40,7 +40,7 @@ }: { system.stateVersion = "unstable"; networking.firewall.allowedTCPPorts = [6969]; - networking.firewall.allowedUDPPorts = [6969]; + networking.firewall.allowedUDPPorts = [6969 51820]; users.users = { aria2.extraGroups = ["jellyfin" "nextcloud"]; }; @@ -51,6 +51,41 @@ }; networking.wg-quick.interfaces = { wg0 = { + postUp = '' + # Mark packets on the wg0 interface + wg set wg0 fwmark 51820 + + # Forbid anything else which doesn't go through wireguard VPN on + # ipV4 and ipV6 + ${pkgs.iptables}/bin/iptables -A OUTPUT \ + ! -d 192.168.0.0/16 \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/ip6tables -A OUTPUT \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/iptables -I OUTPUT -o lo -p tcp \ + --dport 8112 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -I OUTPUT -s 192.168.100.10/24 -d 192.168.100.11/24 \ + -j ACCEPT + ''; + postDown = '' + ${pkgs.iptables}/bin/iptables -D OUTPUT \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/ip6tables -D OUTPUT \ + ! -o wg0 -m mark \ + ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ''; + address = ["10.2.0.2/32"]; dns = ["10.2.0.1"]; privateKeyFile = "/var/lib/wg/private-key"; From c727773a140ffcbfda1f04bf4e48065003462bbc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:51:03 +0100 Subject: [PATCH 0857/2308] Probably good to exclude the right port from wireguard --- nixos/server/package-configs/aria2/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 4c9196d..6d2fc82 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -69,7 +69,7 @@ -m addrtype ! --dst-type LOCAL \ -j REJECT ${pkgs.iptables}/bin/iptables -I OUTPUT -o lo -p tcp \ - --dport 8112 -m state --state NEW,ESTABLISHED -j ACCEPT + --dport 6969 -m state --state NEW,ESTABLISHED -j ACCEPT ${pkgs.iptables}/bin/iptables -I OUTPUT -s 192.168.100.10/24 -d 192.168.100.11/24 \ -j ACCEPT ''; From eab0373be877680059826f8f7e16f0004728e5c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:51:03 +0100 Subject: [PATCH 0858/2308] Probably good to exclude the right port from wireguard --- nixos/server/package-configs/aria2/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 4c9196d..6d2fc82 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -69,7 +69,7 @@ -m addrtype ! --dst-type LOCAL \ -j REJECT ${pkgs.iptables}/bin/iptables -I OUTPUT -o lo -p tcp \ - --dport 8112 -m state --state NEW,ESTABLISHED -j ACCEPT + --dport 6969 -m state --state NEW,ESTABLISHED -j ACCEPT ${pkgs.iptables}/bin/iptables -I OUTPUT -s 192.168.100.10/24 -d 192.168.100.11/24 \ -j ACCEPT ''; From e43963c6c3216a6b845a5824833ba71ea916c91d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:54:15 +0100 Subject: [PATCH 0859/2308] The container shit ain't working, oh well --- .../package-configs/aria2/configuration.nix | 98 +--------------- .../package-configs/aria2/container.nix | 105 ++++++++++++++++++ 2 files changed, 109 insertions(+), 94 deletions(-) create mode 100644 nixos/server/package-configs/aria2/container.nix diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 6d2fc82..6cf7791 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -7,99 +7,9 @@ users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; - sops.secrets."wg-private".mode = "0440"; - sops.secrets."wg-private".owner = config.users.users.aria2.name; - containers.aria2 = { - forwardPorts = [ - { - containerPort = 6969; - hostPort = 6969; - protocol = "udp"; - } - ]; - bindMounts = { - "/var/lib/media" = { - hostPath = "/var/lib/media"; - isReadOnly = false; - }; - "/var/lib/wg/private-key" = { - hostPath = config.sops.secrets."wg-private".path; - isReadOnly = true; - }; - }; - autoStart = true; - privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.11"; - hostAddress6 = "fc00::1"; - localAddress6 = "fc00::2"; - config = { - config, - pkgs, - ... - }: { - system.stateVersion = "unstable"; - networking.firewall.allowedTCPPorts = [6969]; - networking.firewall.allowedUDPPorts = [6969 51820]; - users.users = { - aria2.extraGroups = ["jellyfin" "nextcloud"]; - }; - services.aria2 = { - enable = true; - downloadDir = "/var/lib/media"; - rpcListenPort = 6969; - }; - networking.wg-quick.interfaces = { - wg0 = { - postUp = '' - # Mark packets on the wg0 interface - wg set wg0 fwmark 51820 - - # Forbid anything else which doesn't go through wireguard VPN on - # ipV4 and ipV6 - ${pkgs.iptables}/bin/iptables -A OUTPUT \ - ! -d 192.168.0.0/16 \ - ! -o wg0 \ - -m mark ! --mark $(wg show wg0 fwmark) \ - -m addrtype ! --dst-type LOCAL \ - -j REJECT - ${pkgs.iptables}/bin/ip6tables -A OUTPUT \ - ! -o wg0 \ - -m mark ! --mark $(wg show wg0 fwmark) \ - -m addrtype ! --dst-type LOCAL \ - -j REJECT - ${pkgs.iptables}/bin/iptables -I OUTPUT -o lo -p tcp \ - --dport 6969 -m state --state NEW,ESTABLISHED -j ACCEPT - ${pkgs.iptables}/bin/iptables -I OUTPUT -s 192.168.100.10/24 -d 192.168.100.11/24 \ - -j ACCEPT - ''; - postDown = '' - ${pkgs.iptables}/bin/iptables -D OUTPUT \ - ! -o wg0 \ - -m mark ! --mark $(wg show wg0 fwmark) \ - -m addrtype ! --dst-type LOCAL \ - -j REJECT - ${pkgs.iptables}/bin/ip6tables -D OUTPUT \ - ! -o wg0 -m mark \ - ! --mark $(wg show wg0 fwmark) \ - -m addrtype ! --dst-type LOCAL \ - -j REJECT - ''; - - address = ["10.2.0.2/32"]; - dns = ["10.2.0.1"]; - privateKeyFile = "/var/lib/wg/private-key"; - - peers = [ - { - publicKey = "7A19/lMrfmpFZARivC7FS8DcGxMn5uUq9LcOqFjzlDo="; - allowedIPs = ["0.0.0.0/0"]; - endpoint = "185.159.158.182:51820"; - persistentKeepalive = 25; - } - ]; - }; - }; - }; + services.aria2 = { + enable = true; + downloadDir = "/var/lib/media"; + rpcListenPort = 6969; }; } diff --git a/nixos/server/package-configs/aria2/container.nix b/nixos/server/package-configs/aria2/container.nix new file mode 100644 index 0000000..6d2fc82 --- /dev/null +++ b/nixos/server/package-configs/aria2/container.nix @@ -0,0 +1,105 @@ +{ + config, + pkgs, + ... +}: { + users.users.aria2.group = "aria2"; + users.groups.aria2 = {}; + users.users.aria2.isSystemUser = true; + + sops.secrets."wg-private".mode = "0440"; + sops.secrets."wg-private".owner = config.users.users.aria2.name; + containers.aria2 = { + forwardPorts = [ + { + containerPort = 6969; + hostPort = 6969; + protocol = "udp"; + } + ]; + bindMounts = { + "/var/lib/media" = { + hostPath = "/var/lib/media"; + isReadOnly = false; + }; + "/var/lib/wg/private-key" = { + hostPath = config.sops.secrets."wg-private".path; + isReadOnly = true; + }; + }; + autoStart = true; + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; + hostAddress6 = "fc00::1"; + localAddress6 = "fc00::2"; + config = { + config, + pkgs, + ... + }: { + system.stateVersion = "unstable"; + networking.firewall.allowedTCPPorts = [6969]; + networking.firewall.allowedUDPPorts = [6969 51820]; + users.users = { + aria2.extraGroups = ["jellyfin" "nextcloud"]; + }; + services.aria2 = { + enable = true; + downloadDir = "/var/lib/media"; + rpcListenPort = 6969; + }; + networking.wg-quick.interfaces = { + wg0 = { + postUp = '' + # Mark packets on the wg0 interface + wg set wg0 fwmark 51820 + + # Forbid anything else which doesn't go through wireguard VPN on + # ipV4 and ipV6 + ${pkgs.iptables}/bin/iptables -A OUTPUT \ + ! -d 192.168.0.0/16 \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/ip6tables -A OUTPUT \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/iptables -I OUTPUT -o lo -p tcp \ + --dport 6969 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -I OUTPUT -s 192.168.100.10/24 -d 192.168.100.11/24 \ + -j ACCEPT + ''; + postDown = '' + ${pkgs.iptables}/bin/iptables -D OUTPUT \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/ip6tables -D OUTPUT \ + ! -o wg0 -m mark \ + ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ''; + + address = ["10.2.0.2/32"]; + dns = ["10.2.0.1"]; + privateKeyFile = "/var/lib/wg/private-key"; + + peers = [ + { + publicKey = "7A19/lMrfmpFZARivC7FS8DcGxMn5uUq9LcOqFjzlDo="; + allowedIPs = ["0.0.0.0/0"]; + endpoint = "185.159.158.182:51820"; + persistentKeepalive = 25; + } + ]; + }; + }; + }; + }; +} From a2505a50f34efbed0547f30c93d93809b158a068 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:54:15 +0100 Subject: [PATCH 0860/2308] The container shit ain't working, oh well --- .../package-configs/aria2/configuration.nix | 98 +--------------- .../package-configs/aria2/container.nix | 105 ++++++++++++++++++ 2 files changed, 109 insertions(+), 94 deletions(-) create mode 100644 nixos/server/package-configs/aria2/container.nix diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 6d2fc82..6cf7791 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -7,99 +7,9 @@ users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; - sops.secrets."wg-private".mode = "0440"; - sops.secrets."wg-private".owner = config.users.users.aria2.name; - containers.aria2 = { - forwardPorts = [ - { - containerPort = 6969; - hostPort = 6969; - protocol = "udp"; - } - ]; - bindMounts = { - "/var/lib/media" = { - hostPath = "/var/lib/media"; - isReadOnly = false; - }; - "/var/lib/wg/private-key" = { - hostPath = config.sops.secrets."wg-private".path; - isReadOnly = true; - }; - }; - autoStart = true; - privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.11"; - hostAddress6 = "fc00::1"; - localAddress6 = "fc00::2"; - config = { - config, - pkgs, - ... - }: { - system.stateVersion = "unstable"; - networking.firewall.allowedTCPPorts = [6969]; - networking.firewall.allowedUDPPorts = [6969 51820]; - users.users = { - aria2.extraGroups = ["jellyfin" "nextcloud"]; - }; - services.aria2 = { - enable = true; - downloadDir = "/var/lib/media"; - rpcListenPort = 6969; - }; - networking.wg-quick.interfaces = { - wg0 = { - postUp = '' - # Mark packets on the wg0 interface - wg set wg0 fwmark 51820 - - # Forbid anything else which doesn't go through wireguard VPN on - # ipV4 and ipV6 - ${pkgs.iptables}/bin/iptables -A OUTPUT \ - ! -d 192.168.0.0/16 \ - ! -o wg0 \ - -m mark ! --mark $(wg show wg0 fwmark) \ - -m addrtype ! --dst-type LOCAL \ - -j REJECT - ${pkgs.iptables}/bin/ip6tables -A OUTPUT \ - ! -o wg0 \ - -m mark ! --mark $(wg show wg0 fwmark) \ - -m addrtype ! --dst-type LOCAL \ - -j REJECT - ${pkgs.iptables}/bin/iptables -I OUTPUT -o lo -p tcp \ - --dport 6969 -m state --state NEW,ESTABLISHED -j ACCEPT - ${pkgs.iptables}/bin/iptables -I OUTPUT -s 192.168.100.10/24 -d 192.168.100.11/24 \ - -j ACCEPT - ''; - postDown = '' - ${pkgs.iptables}/bin/iptables -D OUTPUT \ - ! -o wg0 \ - -m mark ! --mark $(wg show wg0 fwmark) \ - -m addrtype ! --dst-type LOCAL \ - -j REJECT - ${pkgs.iptables}/bin/ip6tables -D OUTPUT \ - ! -o wg0 -m mark \ - ! --mark $(wg show wg0 fwmark) \ - -m addrtype ! --dst-type LOCAL \ - -j REJECT - ''; - - address = ["10.2.0.2/32"]; - dns = ["10.2.0.1"]; - privateKeyFile = "/var/lib/wg/private-key"; - - peers = [ - { - publicKey = "7A19/lMrfmpFZARivC7FS8DcGxMn5uUq9LcOqFjzlDo="; - allowedIPs = ["0.0.0.0/0"]; - endpoint = "185.159.158.182:51820"; - persistentKeepalive = 25; - } - ]; - }; - }; - }; + services.aria2 = { + enable = true; + downloadDir = "/var/lib/media"; + rpcListenPort = 6969; }; } diff --git a/nixos/server/package-configs/aria2/container.nix b/nixos/server/package-configs/aria2/container.nix new file mode 100644 index 0000000..6d2fc82 --- /dev/null +++ b/nixos/server/package-configs/aria2/container.nix @@ -0,0 +1,105 @@ +{ + config, + pkgs, + ... +}: { + users.users.aria2.group = "aria2"; + users.groups.aria2 = {}; + users.users.aria2.isSystemUser = true; + + sops.secrets."wg-private".mode = "0440"; + sops.secrets."wg-private".owner = config.users.users.aria2.name; + containers.aria2 = { + forwardPorts = [ + { + containerPort = 6969; + hostPort = 6969; + protocol = "udp"; + } + ]; + bindMounts = { + "/var/lib/media" = { + hostPath = "/var/lib/media"; + isReadOnly = false; + }; + "/var/lib/wg/private-key" = { + hostPath = config.sops.secrets."wg-private".path; + isReadOnly = true; + }; + }; + autoStart = true; + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; + hostAddress6 = "fc00::1"; + localAddress6 = "fc00::2"; + config = { + config, + pkgs, + ... + }: { + system.stateVersion = "unstable"; + networking.firewall.allowedTCPPorts = [6969]; + networking.firewall.allowedUDPPorts = [6969 51820]; + users.users = { + aria2.extraGroups = ["jellyfin" "nextcloud"]; + }; + services.aria2 = { + enable = true; + downloadDir = "/var/lib/media"; + rpcListenPort = 6969; + }; + networking.wg-quick.interfaces = { + wg0 = { + postUp = '' + # Mark packets on the wg0 interface + wg set wg0 fwmark 51820 + + # Forbid anything else which doesn't go through wireguard VPN on + # ipV4 and ipV6 + ${pkgs.iptables}/bin/iptables -A OUTPUT \ + ! -d 192.168.0.0/16 \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/ip6tables -A OUTPUT \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/iptables -I OUTPUT -o lo -p tcp \ + --dport 6969 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -I OUTPUT -s 192.168.100.10/24 -d 192.168.100.11/24 \ + -j ACCEPT + ''; + postDown = '' + ${pkgs.iptables}/bin/iptables -D OUTPUT \ + ! -o wg0 \ + -m mark ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ${pkgs.iptables}/bin/ip6tables -D OUTPUT \ + ! -o wg0 -m mark \ + ! --mark $(wg show wg0 fwmark) \ + -m addrtype ! --dst-type LOCAL \ + -j REJECT + ''; + + address = ["10.2.0.2/32"]; + dns = ["10.2.0.1"]; + privateKeyFile = "/var/lib/wg/private-key"; + + peers = [ + { + publicKey = "7A19/lMrfmpFZARivC7FS8DcGxMn5uUq9LcOqFjzlDo="; + allowedIPs = ["0.0.0.0/0"]; + endpoint = "185.159.158.182:51820"; + persistentKeepalive = 25; + } + ]; + }; + }; + }; + }; +} From 9b372b47474e0cb103c1a4085ee733a99165aa90 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:54:58 +0100 Subject: [PATCH 0861/2308] Disable akkoma as well to save resources --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index efec8dd..dacb2bd 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -16,7 +16,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix - ../../server/package-configs/akkoma/configuration.nix + #../../server/package-configs/akkoma/configuration.nix ../../server/package-configs/forgejo/configuration.nix ../../server/package-configs/gotosocial/configuration.nix ../../server/package-configs/mail-server/configuration.nix From de91fd648d777fbd97063315fdacfdf147b0cd9a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 16:54:58 +0100 Subject: [PATCH 0862/2308] Disable akkoma as well to save resources --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index efec8dd..dacb2bd 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -16,7 +16,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix - ../../server/package-configs/akkoma/configuration.nix + #../../server/package-configs/akkoma/configuration.nix ../../server/package-configs/forgejo/configuration.nix ../../server/package-configs/gotosocial/configuration.nix ../../server/package-configs/mail-server/configuration.nix From 8c7756948364755db4bb44a862168b7cf44c4f1d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 17:05:16 +0100 Subject: [PATCH 0863/2308] Add GLaDOS ssh key --- nixos/hosts/queen/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index dacb2bd..1ee63f0 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -171,7 +171,10 @@ users.users = { lillian = { - openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + ]; isNormalUser = true; extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; From 32143ad00125bbb7e04d13daf02cb0bb0d773ea4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 17:05:16 +0100 Subject: [PATCH 0864/2308] Add GLaDOS ssh key --- nixos/hosts/queen/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index dacb2bd..1ee63f0 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -171,7 +171,10 @@ users.users = { lillian = { - openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + ]; isNormalUser = true; extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; From b8cf987fdfee5345787b085eacbe51579ce88362 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 19:49:04 +0100 Subject: [PATCH 0865/2308] Update git e-mail --- home-manager/desktop/configuration.nix | 2 +- home-manager/hosts/shodan/shodan-Lillian.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index b26fcb5..8313c56 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -127,7 +127,7 @@ programs.home-manager.enable = true; programs.git = { enable = true; - userEmail = "git@gladtherescake.eu"; + userEmail = "info@lillianviolet.dev"; userName = "Lillian-Violet"; }; diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 3dd8382..eb06cd6 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -86,7 +86,7 @@ programs.home-manager.enable = true; programs.git = { enable = true; - userEmail = "git@gladtherescake.eu"; + userEmail = "info@lillianviolet.dev"; userName = "Lillian-Violet"; }; From f597ee33c40c5909c4a760832b2d0b017f438d53 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 19:49:04 +0100 Subject: [PATCH 0866/2308] Update git e-mail --- home-manager/desktop/configuration.nix | 2 +- home-manager/hosts/shodan/shodan-Lillian.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index b26fcb5..8313c56 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -127,7 +127,7 @@ programs.home-manager.enable = true; programs.git = { enable = true; - userEmail = "git@gladtherescake.eu"; + userEmail = "info@lillianviolet.dev"; userName = "Lillian-Violet"; }; diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 3dd8382..eb06cd6 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -86,7 +86,7 @@ programs.home-manager.enable = true; programs.git = { enable = true; - userEmail = "git@gladtherescake.eu"; + userEmail = "info@lillianviolet.dev"; userName = "Lillian-Violet"; }; From 2dbe16d37108ca0be9ba900f8914efd0e7c543f8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 19:50:28 +0100 Subject: [PATCH 0867/2308] Update flake lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b4e690f..abdf839 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1704383912, - "narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=", + "lastModified": 1704498488, + "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", "owner": "nix-community", "repo": "home-manager", - "rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7", + "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", "type": "github" }, "original": { From 11f1061c5d033a2ca93725a7efce959b8ff7932e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 19:50:28 +0100 Subject: [PATCH 0868/2308] Update flake lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b4e690f..abdf839 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1704383912, - "narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=", + "lastModified": 1704498488, + "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", "owner": "nix-community", "repo": "home-manager", - "rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7", + "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", "type": "github" }, "original": { From 3079815551cf0728b5e7691a98d95551dad3767c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 23:41:44 +0100 Subject: [PATCH 0869/2308] Switch out element for schildi --- home-manager/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 8313c56..fec55cf 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -61,7 +61,7 @@ kate # Chat applications: - element-desktop + schildichat-desktop-wayland signal-desktop webcord-vencord From 3de74bcb6bea7494c1c35f9c93fcd99484f45307 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 23:41:44 +0100 Subject: [PATCH 0870/2308] Switch out element for schildi --- home-manager/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 8313c56..fec55cf 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -61,7 +61,7 @@ kate # Chat applications: - element-desktop + schildichat-desktop-wayland signal-desktop webcord-vencord From e1e5eb81fc5969962a67b3b3fa366e33360ad9c3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 23:42:54 +0100 Subject: [PATCH 0871/2308] Never mind that shit ain't updated --- home-manager/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index fec55cf..8313c56 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -61,7 +61,7 @@ kate # Chat applications: - schildichat-desktop-wayland + element-desktop signal-desktop webcord-vencord From 33b13f58f301e999cc8e268c86690927ca94737f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Jan 2024 23:42:54 +0100 Subject: [PATCH 0872/2308] Never mind that shit ain't updated --- home-manager/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index fec55cf..8313c56 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -61,7 +61,7 @@ kate # Chat applications: - schildichat-desktop-wayland + element-desktop signal-desktop webcord-vencord From 4a967a6bab07851c08fe2560f8b9b7ba060851bd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 7 Jan 2024 12:55:00 +0100 Subject: [PATCH 0873/2308] Remove unfreepredicate workaround --- home-manager/desktop/configuration.nix | 2 -- home-manager/hosts/queen/queen-Lillian.nix | 2 -- home-manager/hosts/shodan/shodan-Lillian.nix | 2 -- 3 files changed, 6 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 8313c56..e588954 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -40,8 +40,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; }; }; diff --git a/home-manager/hosts/queen/queen-Lillian.nix b/home-manager/hosts/queen/queen-Lillian.nix index 00fa021..35137f9 100644 --- a/home-manager/hosts/queen/queen-Lillian.nix +++ b/home-manager/hosts/queen/queen-Lillian.nix @@ -43,8 +43,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; }; }; diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index eb06cd6..b0cb6f4 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -42,8 +42,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; }; }; From 633748ee99e7fa5f1afaa7efb3735a6c48138815 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 7 Jan 2024 12:55:00 +0100 Subject: [PATCH 0874/2308] Remove unfreepredicate workaround --- home-manager/desktop/configuration.nix | 2 -- home-manager/hosts/queen/queen-Lillian.nix | 2 -- home-manager/hosts/shodan/shodan-Lillian.nix | 2 -- 3 files changed, 6 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 8313c56..e588954 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -40,8 +40,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; }; }; diff --git a/home-manager/hosts/queen/queen-Lillian.nix b/home-manager/hosts/queen/queen-Lillian.nix index 00fa021..35137f9 100644 --- a/home-manager/hosts/queen/queen-Lillian.nix +++ b/home-manager/hosts/queen/queen-Lillian.nix @@ -43,8 +43,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; }; }; diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index eb06cd6..b0cb6f4 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -42,8 +42,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; }; }; From d4ae132157c6505f443a024bd149be7378f952b0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 00:46:04 +0100 Subject: [PATCH 0875/2308] Add a dex file (probably useless) and make onlyoffice be able to edit nextcloud files --- .../package-configs/dex/configuration.nix | 31 +++++++++++++++++++ .../nextcloud/configuration.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 nixos/server/package-configs/dex/configuration.nix diff --git a/nixos/server/package-configs/dex/configuration.nix b/nixos/server/package-configs/dex/configuration.nix new file mode 100644 index 0000000..7779479 --- /dev/null +++ b/nixos/server/package-configs/dex/configuration.nix @@ -0,0 +1,31 @@ +{ + config, + pkgs, + ... +}: { + services.dex = { + enable = true; + # You can add secret files here + environmentFile = null; + settings = { + # External url + issuer = "http://127.0.0.1:5556/dex"; + storage = { + type = "postgres"; + config.host = "/var/run/postgres"; + }; + web = { + http = "127.0.0.1:5556"; + }; + enablePasswordDB = true; + staticClients = [ + { + id = "oidcclient"; + name = "Client"; + redirectURIs = ["https://example.com/callback"]; + secretFile = "/etc/dex/oidcclient"; # The content of `secretFile` will be written into to the config as `secret`. + } + ]; + }; + }; +} diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix index 34b1926..057d588 100644 --- a/nixos/server/package-configs/nextcloud/configuration.nix +++ b/nixos/server/package-configs/nextcloud/configuration.nix @@ -13,6 +13,7 @@ users.users = { nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; aria2.extraGroups = ["nextcloud"]; + onlyoffice.extraGroups = ["nextcloud"]; }; # Enable Nginx From 5b45fc513f016b21bb64cf1901669c01fb4a8c8c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 00:46:04 +0100 Subject: [PATCH 0876/2308] Add a dex file (probably useless) and make onlyoffice be able to edit nextcloud files --- .../package-configs/dex/configuration.nix | 31 +++++++++++++++++++ .../nextcloud/configuration.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 nixos/server/package-configs/dex/configuration.nix diff --git a/nixos/server/package-configs/dex/configuration.nix b/nixos/server/package-configs/dex/configuration.nix new file mode 100644 index 0000000..7779479 --- /dev/null +++ b/nixos/server/package-configs/dex/configuration.nix @@ -0,0 +1,31 @@ +{ + config, + pkgs, + ... +}: { + services.dex = { + enable = true; + # You can add secret files here + environmentFile = null; + settings = { + # External url + issuer = "http://127.0.0.1:5556/dex"; + storage = { + type = "postgres"; + config.host = "/var/run/postgres"; + }; + web = { + http = "127.0.0.1:5556"; + }; + enablePasswordDB = true; + staticClients = [ + { + id = "oidcclient"; + name = "Client"; + redirectURIs = ["https://example.com/callback"]; + secretFile = "/etc/dex/oidcclient"; # The content of `secretFile` will be written into to the config as `secret`. + } + ]; + }; + }; +} diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix index 34b1926..057d588 100644 --- a/nixos/server/package-configs/nextcloud/configuration.nix +++ b/nixos/server/package-configs/nextcloud/configuration.nix @@ -13,6 +13,7 @@ users.users = { nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; aria2.extraGroups = ["nextcloud"]; + onlyoffice.extraGroups = ["nextcloud"]; }; # Enable Nginx From 0809cee86d2751ad64083c8312cbf0d7fc89eaf4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 15:58:04 +0100 Subject: [PATCH 0877/2308] Add wheatley (rpi2b/pihole) to configs --- flake.nix | 10 + .../hosts/wheatley/wheatley-Lillian.nix | 51 ++++++ nixos/hosts/wheatley/configuration.nix | 172 ++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 home-manager/hosts/wheatley/wheatley-Lillian.nix create mode 100644 nixos/hosts/wheatley/configuration.nix diff --git a/flake.nix b/flake.nix index 0e3b28d..8e0e071 100644 --- a/flake.nix +++ b/flake.nix @@ -103,5 +103,15 @@ ]; }; }; + nixosConfigurations = { + wheatley = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main nixos configuration file < + ./nixos/hosts/GLaDOS/configuration.nix + sops-nix.nixosModules.sops + ]; + }; + }; }; } diff --git a/home-manager/hosts/wheatley/wheatley-Lillian.nix b/home-manager/hosts/wheatley/wheatley-Lillian.nix new file mode 100644 index 0000000..35137f9 --- /dev/null +++ b/home-manager/hosts/wheatley/wheatley-Lillian.nix @@ -0,0 +1,51 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ../../package-configs/zsh.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "24.05"; +} diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix new file mode 100644 index 0000000..6eb918d --- /dev/null +++ b/nixos/hosts/wheatley/configuration.nix @@ -0,0 +1,172 @@ +{ + config, + pkgs, + lib, + ... +}: { + # NixOS wants to enable GRUB by default + boot.loader.grub.enable = false; + # Enables the generation of /boot/extlinux/extlinux.conf + boot.loader.generic-extlinux-compatible.enable = true; + + # !!! This is only for ARMv6 / ARMv7. Don't enable this on AArch64, cache.nixos.org works there. + nix.binaryCaches = lib.mkForce ["https://cache.armv7l.xyz"]; + nix.binaryCachePublicKeys = ["cache.armv7l.xyz-1:kBY/eGnBAYiqYfg0fy0inWhshUo+pGFM3Pj7kIkmlBk="]; + + # nixos-generate-config should normally set up file systems correctly + imports = [./hardware-configuration.nix]; + + environment.systemPackages = with pkgs; [ + age + git + ]; + + virtualisation.oci-containers.backend = "podman"; + virtualisation.oci-containers.containers.pihole = { + image = "pihole/pihole:2024.01.0"; + ports = [ + "53:53/udp" + "53:53/tcp" + "80:80/tcp" + ]; + environment = { + TZ = config.time.timeZone; + WEB_PORT = "80"; + WEBPASSWORD = "toor"; + #VIRTUAL_HOST = "192.168.1.114"; + PIHOLE_DNS_ = "127.0.0.1#5353"; + REV_SERVER = "true"; + REV_SERVER_DOMAIN = "router.lan"; + REV_SERVER_TARGET = "192.168.1.1"; + REV_SERVER_CIDR = "192.168.1.0/16"; + DNSMASQ_LISTENING = "local"; + }; + extraOptions = [ + "--network=host" + ]; + }; + + systemd.services."podman-pihole".postStart = '' + sleep 300s + + podman exec pihole pihole -a adlist add "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" + podman exec pihole pihole -a adlist add "https://adaway.org/hosts.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/AdguardDNS.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Admiral.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easylist.txt" + podman exec pihole pihole -a adlist add "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/static/w3kbl.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Shalla-mal.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt" + podman exec pihole pihole -a adlist add "https://someonewhocares.org/hosts/zero/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/HorusTeknoloji/TR-PhishingList/master/url-lists.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easyprivacy.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Ads.txt" + podman exec pihole pihole -a adlist add "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt" + podman exec pihole pihole -a adlist add "https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt" + podman exec pihole pihole -a adlist add "https://hostfiles.frogeye.fr/multiparty-trackers-hosts.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/android-tracking.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/AmazonFireTV.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/RooneyMcNibNug/pihole-stuff/master/SNAFU.txt" + podman exec pihole pihole -a adlist add "https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt" + podman exec pihole pihole -a adlist add "https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt" + podman exec pihole pihole -a adlist add "https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt" + podman exec pihole pihole -a adlist add "https://phishing.army/download/phishing_army_blocklist_extended.txt" + podman exec pihole pihole -a adlist add "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts" + podman exec pihole pihole -a adlist add "https://urlhaus.abuse.ch/downloads/hostfile/" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Malware.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/gambling-porn/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/chadmayfield/my-pihole-blocklists/master/lists/pi_blocklist_porn_all.list" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Crypto.txt" + podman exec pihole pihole -a adlist add "https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser" + + podman exec pihole pihole -g + ''; + + services.openssh = { + enable = true; + }; + + system.autoUpgrade = { + enable = true; + allowReboot = true; + + # Prevent silencing of build output + flags = lib.mkForce []; + }; + + nix.gc = { + automatic = true; + options = "-d"; + }; + nix.autoOptimiseStore = true; + + # Enable networking + networking.networkmanager.enable = true; + + networking.firewall.enable = true; + + networking.firewall.allowedTCPPorts = [22 80 443]; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + programs.zsh = { + enable = true; + }; + + programs.git = { + enable = true; + }; + + users.users = { + lillian = { + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + ]; + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + shell = pkgs.zsh; + }; + }; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../../home-manager/hosts/wheatley/wheatley-Lillian.nix; + }; + }; + + networking.hostName = "wheatley"; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "unstable"; +} From a5a86fd9f7fc5e3273c955cdc75141f48653645b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 15:58:04 +0100 Subject: [PATCH 0878/2308] Add wheatley (rpi2b/pihole) to configs --- flake.nix | 10 + .../hosts/wheatley/wheatley-Lillian.nix | 51 ++++++ nixos/hosts/wheatley/configuration.nix | 172 ++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 home-manager/hosts/wheatley/wheatley-Lillian.nix create mode 100644 nixos/hosts/wheatley/configuration.nix diff --git a/flake.nix b/flake.nix index 0e3b28d..8e0e071 100644 --- a/flake.nix +++ b/flake.nix @@ -103,5 +103,15 @@ ]; }; }; + nixosConfigurations = { + wheatley = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + # > Our main nixos configuration file < + ./nixos/hosts/GLaDOS/configuration.nix + sops-nix.nixosModules.sops + ]; + }; + }; }; } diff --git a/home-manager/hosts/wheatley/wheatley-Lillian.nix b/home-manager/hosts/wheatley/wheatley-Lillian.nix new file mode 100644 index 0000000..35137f9 --- /dev/null +++ b/home-manager/hosts/wheatley/wheatley-Lillian.nix @@ -0,0 +1,51 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ../../package-configs/zsh.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "24.05"; +} diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix new file mode 100644 index 0000000..6eb918d --- /dev/null +++ b/nixos/hosts/wheatley/configuration.nix @@ -0,0 +1,172 @@ +{ + config, + pkgs, + lib, + ... +}: { + # NixOS wants to enable GRUB by default + boot.loader.grub.enable = false; + # Enables the generation of /boot/extlinux/extlinux.conf + boot.loader.generic-extlinux-compatible.enable = true; + + # !!! This is only for ARMv6 / ARMv7. Don't enable this on AArch64, cache.nixos.org works there. + nix.binaryCaches = lib.mkForce ["https://cache.armv7l.xyz"]; + nix.binaryCachePublicKeys = ["cache.armv7l.xyz-1:kBY/eGnBAYiqYfg0fy0inWhshUo+pGFM3Pj7kIkmlBk="]; + + # nixos-generate-config should normally set up file systems correctly + imports = [./hardware-configuration.nix]; + + environment.systemPackages = with pkgs; [ + age + git + ]; + + virtualisation.oci-containers.backend = "podman"; + virtualisation.oci-containers.containers.pihole = { + image = "pihole/pihole:2024.01.0"; + ports = [ + "53:53/udp" + "53:53/tcp" + "80:80/tcp" + ]; + environment = { + TZ = config.time.timeZone; + WEB_PORT = "80"; + WEBPASSWORD = "toor"; + #VIRTUAL_HOST = "192.168.1.114"; + PIHOLE_DNS_ = "127.0.0.1#5353"; + REV_SERVER = "true"; + REV_SERVER_DOMAIN = "router.lan"; + REV_SERVER_TARGET = "192.168.1.1"; + REV_SERVER_CIDR = "192.168.1.0/16"; + DNSMASQ_LISTENING = "local"; + }; + extraOptions = [ + "--network=host" + ]; + }; + + systemd.services."podman-pihole".postStart = '' + sleep 300s + + podman exec pihole pihole -a adlist add "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" + podman exec pihole pihole -a adlist add "https://adaway.org/hosts.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/AdguardDNS.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Admiral.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easylist.txt" + podman exec pihole pihole -a adlist add "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/static/w3kbl.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Shalla-mal.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt" + podman exec pihole pihole -a adlist add "https://someonewhocares.org/hosts/zero/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/HorusTeknoloji/TR-PhishingList/master/url-lists.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easyprivacy.txt" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Ads.txt" + podman exec pihole pihole -a adlist add "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt" + podman exec pihole pihole -a adlist add "https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt" + podman exec pihole pihole -a adlist add "https://hostfiles.frogeye.fr/multiparty-trackers-hosts.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/android-tracking.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/AmazonFireTV.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/RooneyMcNibNug/pihole-stuff/master/SNAFU.txt" + podman exec pihole pihole -a adlist add "https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt" + podman exec pihole pihole -a adlist add "https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt" + podman exec pihole pihole -a adlist add "https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt" + podman exec pihole pihole -a adlist add "https://phishing.army/download/phishing_army_blocklist_extended.txt" + podman exec pihole pihole -a adlist add "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts" + podman exec pihole pihole -a adlist add "https://urlhaus.abuse.ch/downloads/hostfile/" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Malware.txt" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/gambling-porn/hosts" + podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/chadmayfield/my-pihole-blocklists/master/lists/pi_blocklist_porn_all.list" + podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Crypto.txt" + podman exec pihole pihole -a adlist add "https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser" + + podman exec pihole pihole -g + ''; + + services.openssh = { + enable = true; + }; + + system.autoUpgrade = { + enable = true; + allowReboot = true; + + # Prevent silencing of build output + flags = lib.mkForce []; + }; + + nix.gc = { + automatic = true; + options = "-d"; + }; + nix.autoOptimiseStore = true; + + # Enable networking + networking.networkmanager.enable = true; + + networking.firewall.enable = true; + + networking.firewall.allowedTCPPorts = [22 80 443]; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + programs.zsh = { + enable = true; + }; + + programs.git = { + enable = true; + }; + + users.users = { + lillian = { + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + ]; + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; + shell = pkgs.zsh; + }; + }; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../../home-manager/hosts/wheatley/wheatley-Lillian.nix; + }; + }; + + networking.hostName = "wheatley"; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "unstable"; +} From b45af9a8258935c8eddaa644f64b21377723ad59 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 16:02:08 +0100 Subject: [PATCH 0879/2308] Update flake lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index abdf839..8a75a53 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1703950681, - "narHash": "sha256-veU5bE4eLOmi7aOzhE7LfZXcSOONRMay0BKv01WHojo=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0aad9113182747452dbfc68b93c86e168811fa6c", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "type": "github" }, "original": { @@ -122,11 +122,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703499205, - "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", + "lastModified": 1704161960, + "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", + "rev": "63143ac2c9186be6d9da6035fa22620018c85932", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1703991717, - "narHash": "sha256-XfBg2dmDJXPQEB8EdNBnzybvnhswaiAkUeeDj7fa/hQ=", + "lastModified": 1704596510, + "narHash": "sha256-tupdwwg1WeX2hNMOQrvtyafTaTVty0QC/gQp7yaYJic=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cfdbaf68d00bc2f9e071f17ae77be4b27ff72fa6", + "rev": "f5fbcc0f50e7fc60c4f806fa7a09abccf0826d8a", "type": "github" }, "original": { From 31a482c335f790fce10b04a39463a444636adf24 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 16:02:08 +0100 Subject: [PATCH 0880/2308] Update flake lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index abdf839..8a75a53 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1703950681, - "narHash": "sha256-veU5bE4eLOmi7aOzhE7LfZXcSOONRMay0BKv01WHojo=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0aad9113182747452dbfc68b93c86e168811fa6c", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "type": "github" }, "original": { @@ -122,11 +122,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703499205, - "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", + "lastModified": 1704161960, + "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", + "rev": "63143ac2c9186be6d9da6035fa22620018c85932", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1703991717, - "narHash": "sha256-XfBg2dmDJXPQEB8EdNBnzybvnhswaiAkUeeDj7fa/hQ=", + "lastModified": 1704596510, + "narHash": "sha256-tupdwwg1WeX2hNMOQrvtyafTaTVty0QC/gQp7yaYJic=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cfdbaf68d00bc2f9e071f17ae77be4b27ff72fa6", + "rev": "f5fbcc0f50e7fc60c4f806fa7a09abccf0826d8a", "type": "github" }, "original": { From 82186c0b8fc10ff72c6c1a48ee3ae1bb3ce48c99 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 16:24:38 +0100 Subject: [PATCH 0881/2308] Forgot some settings in wheatley, fixed now --- nixos/hosts/wheatley/configuration.nix | 58 ++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 6eb918d..acc6d63 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -14,13 +14,63 @@ nix.binaryCachePublicKeys = ["cache.armv7l.xyz-1:kBY/eGnBAYiqYfg0fy0inWhshUo+pGFM3Pj7kIkmlBk="]; # nixos-generate-config should normally set up file systems correctly - imports = [./hardware-configuration.nix]; + imports = [ + inputs.home-manager.nixosModules.home-manager + + ./hardware-configuration.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; environment.systemPackages = with pkgs; [ age git ]; + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; virtualisation.oci-containers.backend = "podman"; virtualisation.oci-containers.containers.pihole = { image = "pihole/pihole:2024.01.0"; @@ -106,12 +156,6 @@ flags = lib.mkForce []; }; - nix.gc = { - automatic = true; - options = "-d"; - }; - nix.autoOptimiseStore = true; - # Enable networking networking.networkmanager.enable = true; From d13d0c6b28648b989517e65b7224d0b77c9e437a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 16:24:38 +0100 Subject: [PATCH 0882/2308] Forgot some settings in wheatley, fixed now --- nixos/hosts/wheatley/configuration.nix | 58 ++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 6eb918d..acc6d63 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -14,13 +14,63 @@ nix.binaryCachePublicKeys = ["cache.armv7l.xyz-1:kBY/eGnBAYiqYfg0fy0inWhshUo+pGFM3Pj7kIkmlBk="]; # nixos-generate-config should normally set up file systems correctly - imports = [./hardware-configuration.nix]; + imports = [ + inputs.home-manager.nixosModules.home-manager + + ./hardware-configuration.nix + ]; + + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + + # You can also add overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # Or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; environment.systemPackages = with pkgs; [ age git ]; + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; virtualisation.oci-containers.backend = "podman"; virtualisation.oci-containers.containers.pihole = { image = "pihole/pihole:2024.01.0"; @@ -106,12 +156,6 @@ flags = lib.mkForce []; }; - nix.gc = { - automatic = true; - options = "-d"; - }; - nix.autoOptimiseStore = true; - # Enable networking networking.networkmanager.enable = true; From 94622239f69a5f509b07d3e95ecf6a7ee8916346 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 16:28:12 +0100 Subject: [PATCH 0883/2308] Add wheatley hardware-configuration.nix --- .../hosts/wheatley/hardware-configuration.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 nixos/hosts/wheatley/hardware-configuration.nix diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix new file mode 100644 index 0000000..c795cbd --- /dev/null +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -0,0 +1,28 @@ +# 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, ... }: + +{ + imports = + [ + ]; + + boot.initrd.availableKernelModules = [ "usbhid" ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2178-694E"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + nix.maxJobs = lib.mkDefault 4; +} From be285f0534ce4db507134c281352d44ea6759f71 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 16:28:12 +0100 Subject: [PATCH 0884/2308] Add wheatley hardware-configuration.nix --- .../hosts/wheatley/hardware-configuration.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 nixos/hosts/wheatley/hardware-configuration.nix diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix new file mode 100644 index 0000000..c795cbd --- /dev/null +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -0,0 +1,28 @@ +# 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, ... }: + +{ + imports = + [ + ]; + + boot.initrd.availableKernelModules = [ "usbhid" ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2178-694E"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + nix.maxJobs = lib.mkDefault 4; +} From b8b52c567b5da9b0bd9f313920acbb573bdf7ba7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 16:32:21 +0100 Subject: [PATCH 0885/2308] Forget about auto update for now --- nixos/hosts/wheatley/configuration.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index acc6d63..698a35e 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -148,14 +148,6 @@ enable = true; }; - system.autoUpgrade = { - enable = true; - allowReboot = true; - - # Prevent silencing of build output - flags = lib.mkForce []; - }; - # Enable networking networking.networkmanager.enable = true; From 3fcf18f35b81bd448f16a2a0cbb49d39161640ec Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 16:32:21 +0100 Subject: [PATCH 0886/2308] Forget about auto update for now --- nixos/hosts/wheatley/configuration.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index acc6d63..698a35e 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -148,14 +148,6 @@ enable = true; }; - system.autoUpgrade = { - enable = true; - allowReboot = true; - - # Prevent silencing of build output - flags = lib.mkForce []; - }; - # Enable networking networking.networkmanager.enable = true; From 44f4dea7d58dc67245caaee5485b363f10093b33 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 17:45:34 +0100 Subject: [PATCH 0887/2308] Changed hardware config, new version --- .../hosts/wheatley/hardware-configuration.nix | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index c795cbd..ed7b123 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -1,28 +1,38 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: - { - imports = - [ - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "usbhid" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["usbhid"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/2178-694E"; - fsType = "vfat"; - }; + swapDevices = []; - swapDevices = [ ]; + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enu1u1.useDHCP = lib.mkDefault true; + # networking.interfaces.ip6tnl0.useDHCP = lib.mkDefault true; + # networking.interfaces.sit0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - nix.maxJobs = lib.mkDefault 4; + nixpkgs.hostPlatform = lib.mkDefault "armv7l-linux"; } From c3a67c68d1d4be9360f61c7428e72868327a607b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 17:45:34 +0100 Subject: [PATCH 0888/2308] Changed hardware config, new version --- .../hosts/wheatley/hardware-configuration.nix | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index c795cbd..ed7b123 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -1,28 +1,38 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: - { - imports = - [ - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "usbhid" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["usbhid"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/2178-694E"; - fsType = "vfat"; - }; + swapDevices = []; - swapDevices = [ ]; + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enu1u1.useDHCP = lib.mkDefault true; + # networking.interfaces.ip6tnl0.useDHCP = lib.mkDefault true; + # networking.interfaces.sit0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - nix.maxJobs = lib.mkDefault 4; + nixpkgs.hostPlatform = lib.mkDefault "armv7l-linux"; } From 539c6b09c4a7afb2f4add00e60bd414f557b7c40 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:00:25 +0100 Subject: [PATCH 0889/2308] Add armv7 to flake.nix --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 8e0e071..d2f10bc 100644 --- a/flake.nix +++ b/flake.nix @@ -33,9 +33,11 @@ # Supported systems for your flake packages, shell, etc. systems = [ "aarch64-linux" + "armv7l-linux" "i686-linux" "x86_64-linux" "aarch64-darwin" + "armv7l-darwin" "x86_64-darwin" ]; # This is a function that generates an attribute by calling a function you From 5e21cf26d3d809948c24fe177304c6ccce53865c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:00:25 +0100 Subject: [PATCH 0890/2308] Add armv7 to flake.nix --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 8e0e071..d2f10bc 100644 --- a/flake.nix +++ b/flake.nix @@ -33,9 +33,11 @@ # Supported systems for your flake packages, shell, etc. systems = [ "aarch64-linux" + "armv7l-linux" "i686-linux" "x86_64-linux" "aarch64-darwin" + "armv7l-darwin" "x86_64-darwin" ]; # This is a function that generates an attribute by calling a function you From 7dbfdf77240cb0f1e12db1e9273a9eb05b0205c1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:20:26 +0100 Subject: [PATCH 0891/2308] Try adding legacypackages to the end of the nixpkgs flake config? --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d2f10bc..2a971ea 100644 --- a/flake.nix +++ b/flake.nix @@ -106,7 +106,7 @@ }; }; nixosConfigurations = { - wheatley = nixpkgs.lib.nixosSystem { + wheatley = nixpkgs.legacyPackages.armv7l-linux.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < From 16c75de368cce6296ddfebb6804114f0ca56c2af Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:20:26 +0100 Subject: [PATCH 0892/2308] Try adding legacypackages to the end of the nixpkgs flake config? --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d2f10bc..2a971ea 100644 --- a/flake.nix +++ b/flake.nix @@ -106,7 +106,7 @@ }; }; nixosConfigurations = { - wheatley = nixpkgs.lib.nixosSystem { + wheatley = nixpkgs.legacyPackages.armv7l-linux.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < From 97140c9201008fdfeb81dc33de9721ce5ebbb357 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:21:10 +0100 Subject: [PATCH 0893/2308] Without lib? --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2a971ea..eae5ffe 100644 --- a/flake.nix +++ b/flake.nix @@ -106,7 +106,7 @@ }; }; nixosConfigurations = { - wheatley = nixpkgs.legacyPackages.armv7l-linux.lib.nixosSystem { + wheatley = nixpkgs.legacyPackages.armv7l-linux.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < From 20aaf994bf2fe0beaaec2ac79267fe306619a8d4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:21:10 +0100 Subject: [PATCH 0894/2308] Without lib? --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2a971ea..eae5ffe 100644 --- a/flake.nix +++ b/flake.nix @@ -106,7 +106,7 @@ }; }; nixosConfigurations = { - wheatley = nixpkgs.legacyPackages.armv7l-linux.lib.nixosSystem { + wheatley = nixpkgs.legacyPackages.armv7l-linux.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < From df6af9895a48758b75f1d643fe0451391d5c7dc4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:23:08 +0100 Subject: [PATCH 0895/2308] Never mind that --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index eae5ffe..d2f10bc 100644 --- a/flake.nix +++ b/flake.nix @@ -106,7 +106,7 @@ }; }; nixosConfigurations = { - wheatley = nixpkgs.legacyPackages.armv7l-linux.nixosSystem { + wheatley = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < From f2f9f40530a43385ca37c802e5cb934a9f5c97ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:23:08 +0100 Subject: [PATCH 0896/2308] Never mind that --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index eae5ffe..d2f10bc 100644 --- a/flake.nix +++ b/flake.nix @@ -106,7 +106,7 @@ }; }; nixosConfigurations = { - wheatley = nixpkgs.legacyPackages.armv7l-linux.nixosSystem { + wheatley = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < From 6782a2917a1e7716b564b328f921988d4f6cab97 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:27:21 +0100 Subject: [PATCH 0897/2308] Let's just ignore sops and home manager for now and see if that works --- flake.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index d2f10bc..a64f949 100644 --- a/flake.nix +++ b/flake.nix @@ -111,7 +111,7 @@ modules = [ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix - sops-nix.nixosModules.sops + #sops-nix.nixosModules.sops ]; }; }; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 698a35e..9e08784 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -15,7 +15,7 @@ # nixos-generate-config should normally set up file systems correctly imports = [ - inputs.home-manager.nixosModules.home-manager + #inputs.home-manager.nixosModules.home-manager ./hardware-configuration.nix ]; From 02d5ea8c9b9ff25549f0bb37e588039de29dd524 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:27:21 +0100 Subject: [PATCH 0898/2308] Let's just ignore sops and home manager for now and see if that works --- flake.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index d2f10bc..a64f949 100644 --- a/flake.nix +++ b/flake.nix @@ -111,7 +111,7 @@ modules = [ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix - sops-nix.nixosModules.sops + #sops-nix.nixosModules.sops ]; }; }; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 698a35e..9e08784 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -15,7 +15,7 @@ # nixos-generate-config should normally set up file systems correctly imports = [ - inputs.home-manager.nixosModules.home-manager + #inputs.home-manager.nixosModules.home-manager ./hardware-configuration.nix ]; From 7a6b27e2e029c9d91496ebdc633dc27cc0f7d956 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:41:17 +0100 Subject: [PATCH 0899/2308] Add system definition maybe? --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index a64f949..8153813 100644 --- a/flake.nix +++ b/flake.nix @@ -107,6 +107,7 @@ }; nixosConfigurations = { wheatley = nixpkgs.lib.nixosSystem { + system = "armv7l-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < From faab84bf0a0b0a0adc7df3a6a507969b43caa39d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:41:17 +0100 Subject: [PATCH 0900/2308] Add system definition maybe? --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index a64f949..8153813 100644 --- a/flake.nix +++ b/flake.nix @@ -107,6 +107,7 @@ }; nixosConfigurations = { wheatley = nixpkgs.lib.nixosSystem { + system = "armv7l-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < From b1a61026b47c70a474ea325e9522fdd207130310 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:48:00 +0100 Subject: [PATCH 0901/2308] Saw someone say commenting this out fixes it? --- nixos/hosts/wheatley/configuration.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 9e08784..e3995b0 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -7,11 +7,7 @@ # NixOS wants to enable GRUB by default boot.loader.grub.enable = false; # Enables the generation of /boot/extlinux/extlinux.conf - boot.loader.generic-extlinux-compatible.enable = true; - - # !!! This is only for ARMv6 / ARMv7. Don't enable this on AArch64, cache.nixos.org works there. - nix.binaryCaches = lib.mkForce ["https://cache.armv7l.xyz"]; - nix.binaryCachePublicKeys = ["cache.armv7l.xyz-1:kBY/eGnBAYiqYfg0fy0inWhshUo+pGFM3Pj7kIkmlBk="]; + #boot.loader.generic-extlinux-compatible.enable = true; # nixos-generate-config should normally set up file systems correctly imports = [ From e81263cf398b57eda34d505f00534015f604641d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 18:48:00 +0100 Subject: [PATCH 0902/2308] Saw someone say commenting this out fixes it? --- nixos/hosts/wheatley/configuration.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 9e08784..e3995b0 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -7,11 +7,7 @@ # NixOS wants to enable GRUB by default boot.loader.grub.enable = false; # Enables the generation of /boot/extlinux/extlinux.conf - boot.loader.generic-extlinux-compatible.enable = true; - - # !!! This is only for ARMv6 / ARMv7. Don't enable this on AArch64, cache.nixos.org works there. - nix.binaryCaches = lib.mkForce ["https://cache.armv7l.xyz"]; - nix.binaryCachePublicKeys = ["cache.armv7l.xyz-1:kBY/eGnBAYiqYfg0fy0inWhshUo+pGFM3Pj7kIkmlBk="]; + #boot.loader.generic-extlinux-compatible.enable = true; # nixos-generate-config should normally set up file systems correctly imports = [ From 192d552731553bc759521b523a8769121bbaaa12 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 19:11:16 +0100 Subject: [PATCH 0903/2308] Let's try this, stop building all the things --- flake.nix | 36 ++++++++++++++------------ nixos/hosts/wheatley/configuration.nix | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 8153813..c9a0573 100644 --- a/flake.nix +++ b/flake.nix @@ -31,25 +31,25 @@ } @ inputs: let inherit (self) outputs; # Supported systems for your flake packages, shell, etc. - systems = [ - "aarch64-linux" - "armv7l-linux" - "i686-linux" - "x86_64-linux" - "aarch64-darwin" - "armv7l-darwin" - "x86_64-darwin" - ]; - # This is a function that generates an attribute by calling a function you - # pass to it, with each system as an argument - forAllSystems = nixpkgs.lib.genAttrs systems; + # systems = [ + # "aarch64-linux" + # "armv7l-linux" + # "i686-linux" + # "x86_64-linux" + # "aarch64-darwin" + # "armv7l-darwin" + # "x86_64-darwin" + # ]; + # # This is a function that generates an attribute by calling a function you + # # pass to it, with each system as an argument + # forAllSystems = nixpkgs.lib.genAttrs systems; in { # Your custom packages # Acessible through 'nix build', 'nix shell', etc - packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - # Formatter for your nix files, available through 'nix fmt' - # Other options beside 'alejandra' include 'nixpkgs-fmt' - formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + # packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # # Formatter for your nix files, available through 'nix fmt' + # # Other options beside 'alejandra' include 'nixpkgs-fmt' + # formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); # Your custom packages and modifications, exported as overlays overlays = import ./overlays {inherit inputs;}; @@ -64,6 +64,7 @@ # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { EDI = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < @@ -75,6 +76,7 @@ nixosConfigurations = { GLaDOS = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < @@ -86,6 +88,7 @@ nixosConfigurations = { queen = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < @@ -97,6 +100,7 @@ nixosConfigurations = { shodan = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index e3995b0..157456a 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -7,7 +7,7 @@ # NixOS wants to enable GRUB by default boot.loader.grub.enable = false; # Enables the generation of /boot/extlinux/extlinux.conf - #boot.loader.generic-extlinux-compatible.enable = true; + boot.loader.generic-extlinux-compatible.enable = true; # nixos-generate-config should normally set up file systems correctly imports = [ From 155d7dc0fd51038351e0006abd558c489659c096 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 19:11:16 +0100 Subject: [PATCH 0904/2308] Let's try this, stop building all the things --- flake.nix | 36 ++++++++++++++------------ nixos/hosts/wheatley/configuration.nix | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 8153813..c9a0573 100644 --- a/flake.nix +++ b/flake.nix @@ -31,25 +31,25 @@ } @ inputs: let inherit (self) outputs; # Supported systems for your flake packages, shell, etc. - systems = [ - "aarch64-linux" - "armv7l-linux" - "i686-linux" - "x86_64-linux" - "aarch64-darwin" - "armv7l-darwin" - "x86_64-darwin" - ]; - # This is a function that generates an attribute by calling a function you - # pass to it, with each system as an argument - forAllSystems = nixpkgs.lib.genAttrs systems; + # systems = [ + # "aarch64-linux" + # "armv7l-linux" + # "i686-linux" + # "x86_64-linux" + # "aarch64-darwin" + # "armv7l-darwin" + # "x86_64-darwin" + # ]; + # # This is a function that generates an attribute by calling a function you + # # pass to it, with each system as an argument + # forAllSystems = nixpkgs.lib.genAttrs systems; in { # Your custom packages # Acessible through 'nix build', 'nix shell', etc - packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - # Formatter for your nix files, available through 'nix fmt' - # Other options beside 'alejandra' include 'nixpkgs-fmt' - formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + # packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # # Formatter for your nix files, available through 'nix fmt' + # # Other options beside 'alejandra' include 'nixpkgs-fmt' + # formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); # Your custom packages and modifications, exported as overlays overlays = import ./overlays {inherit inputs;}; @@ -64,6 +64,7 @@ # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { EDI = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < @@ -75,6 +76,7 @@ nixosConfigurations = { GLaDOS = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < @@ -86,6 +88,7 @@ nixosConfigurations = { queen = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < @@ -97,6 +100,7 @@ nixosConfigurations = { shodan = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index e3995b0..157456a 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -7,7 +7,7 @@ # NixOS wants to enable GRUB by default boot.loader.grub.enable = false; # Enables the generation of /boot/extlinux/extlinux.conf - #boot.loader.generic-extlinux-compatible.enable = true; + boot.loader.generic-extlinux-compatible.enable = true; # nixos-generate-config should normally set up file systems correctly imports = [ From bc416515011a608f64550c8d3d7f737c8bd3bac8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 22:43:04 +0100 Subject: [PATCH 0905/2308] Simplification refactor --- flake.nix | 35 +------------------------------- modules/home-manager/default.nix | 6 ------ modules/nixos/default.nix | 6 ------ overlays/default.nix | 23 --------------------- pkgs/default.nix | 5 ----- 5 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 modules/home-manager/default.nix delete mode 100644 modules/nixos/default.nix delete mode 100644 overlays/default.nix delete mode 100644 pkgs/default.nix diff --git a/flake.nix b/flake.nix index c9a0573..0663bf6 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,6 @@ extest.url = "github:chaorace/extest-nix"; # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; - - # Shameless plug: looking for a way to nixify your themes and make - # everything match nicely? Try nix-colors! - # nix-colors.url = "github:misterio77/nix-colors"; }; outputs = { @@ -30,36 +26,7 @@ ... } @ inputs: let inherit (self) outputs; - # Supported systems for your flake packages, shell, etc. - # systems = [ - # "aarch64-linux" - # "armv7l-linux" - # "i686-linux" - # "x86_64-linux" - # "aarch64-darwin" - # "armv7l-darwin" - # "x86_64-darwin" - # ]; - # # This is a function that generates an attribute by calling a function you - # # pass to it, with each system as an argument - # forAllSystems = nixpkgs.lib.genAttrs systems; in { - # Your custom packages - # Acessible through 'nix build', 'nix shell', etc - # packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - # # Formatter for your nix files, available through 'nix fmt' - # # Other options beside 'alejandra' include 'nixpkgs-fmt' - # formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - - # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs;}; - # Reusable nixos modules you might want to export - # These are usually stuff you would upstream into nixpkgs - nixosModules = import ./modules/nixos; - # Reusable home-manager modules you might want to export - # These are usually stuff you would upstream into home-manager - homeManagerModules = import ./modules/home-manager; - # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { @@ -116,7 +83,7 @@ modules = [ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix - #sops-nix.nixosModules.sops + sops-nix.nixosModules.sops ]; }; }; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix deleted file mode 100644 index 45aae31..0000000 --- a/modules/home-manager/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Add your reusable home-manager modules to this directory, on their own file (https://nixos.wiki/wiki/Module). -# These should be stuff you would like to share with others, not your personal configurations. -{ - # List your module files here - # my-module = import ./my-module.nix; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix deleted file mode 100644 index 8605069..0000000 --- a/modules/nixos/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module). -# These should be stuff you would like to share with others, not your personal configurations. -{ - # List your module files here - # my-module = import ./my-module.nix; -} diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index a13ea3c..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file defines overlays -{inputs, ...}: { - # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: import ../pkgs {pkgs = final;}; - - # This one contains whatever you want to overlay - # You can change versions, add patches, set compilation flags, anything really. - # https://nixos.wiki/wiki/Overlays - modifications = final: prev: { - # example = prev.example.overrideAttrs (oldAttrs: rec { - # ... - # }); - }; - - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { - system = final.system; - config.allowUnfree = true; - }; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index 3d9e23c..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -# Custom packages, that can be defined similarly to ones from nixpkgs -# You can build them using 'nix build .#example' -pkgs: { - # example = pkgs.callPackage ./example { }; -} From 7528a5c4c9ffdf2b6a682233aabbdb73ec066ec6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 22:43:04 +0100 Subject: [PATCH 0906/2308] Simplification refactor --- flake.nix | 35 +------------------------------- modules/home-manager/default.nix | 6 ------ modules/nixos/default.nix | 6 ------ overlays/default.nix | 23 --------------------- pkgs/default.nix | 5 ----- 5 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 modules/home-manager/default.nix delete mode 100644 modules/nixos/default.nix delete mode 100644 overlays/default.nix delete mode 100644 pkgs/default.nix diff --git a/flake.nix b/flake.nix index c9a0573..0663bf6 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,6 @@ extest.url = "github:chaorace/extest-nix"; # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; - - # Shameless plug: looking for a way to nixify your themes and make - # everything match nicely? Try nix-colors! - # nix-colors.url = "github:misterio77/nix-colors"; }; outputs = { @@ -30,36 +26,7 @@ ... } @ inputs: let inherit (self) outputs; - # Supported systems for your flake packages, shell, etc. - # systems = [ - # "aarch64-linux" - # "armv7l-linux" - # "i686-linux" - # "x86_64-linux" - # "aarch64-darwin" - # "armv7l-darwin" - # "x86_64-darwin" - # ]; - # # This is a function that generates an attribute by calling a function you - # # pass to it, with each system as an argument - # forAllSystems = nixpkgs.lib.genAttrs systems; in { - # Your custom packages - # Acessible through 'nix build', 'nix shell', etc - # packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - # # Formatter for your nix files, available through 'nix fmt' - # # Other options beside 'alejandra' include 'nixpkgs-fmt' - # formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - - # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs;}; - # Reusable nixos modules you might want to export - # These are usually stuff you would upstream into nixpkgs - nixosModules = import ./modules/nixos; - # Reusable home-manager modules you might want to export - # These are usually stuff you would upstream into home-manager - homeManagerModules = import ./modules/home-manager; - # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { @@ -116,7 +83,7 @@ modules = [ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix - #sops-nix.nixosModules.sops + sops-nix.nixosModules.sops ]; }; }; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix deleted file mode 100644 index 45aae31..0000000 --- a/modules/home-manager/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Add your reusable home-manager modules to this directory, on their own file (https://nixos.wiki/wiki/Module). -# These should be stuff you would like to share with others, not your personal configurations. -{ - # List your module files here - # my-module = import ./my-module.nix; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix deleted file mode 100644 index 8605069..0000000 --- a/modules/nixos/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module). -# These should be stuff you would like to share with others, not your personal configurations. -{ - # List your module files here - # my-module = import ./my-module.nix; -} diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index a13ea3c..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file defines overlays -{inputs, ...}: { - # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: import ../pkgs {pkgs = final;}; - - # This one contains whatever you want to overlay - # You can change versions, add patches, set compilation flags, anything really. - # https://nixos.wiki/wiki/Overlays - modifications = final: prev: { - # example = prev.example.overrideAttrs (oldAttrs: rec { - # ... - # }); - }; - - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { - system = final.system; - config.allowUnfree = true; - }; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index 3d9e23c..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -# Custom packages, that can be defined similarly to ones from nixpkgs -# You can build them using 'nix build .#example' -pkgs: { - # example = pkgs.callPackage ./example { }; -} From 50a2a850ba0aa0d1a8b77711c75a2221f577b687 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 22:48:12 +0100 Subject: [PATCH 0907/2308] Removed references to the overlay and pkgs folder --- nixos/desktop/configuration.nix | 3 --- nixos/hosts/queen/configuration.nix | 5 ----- nixos/hosts/shodan/configuration.nix | 4 ---- 3 files changed, 12 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 9d722f7..40b0b9a 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -12,9 +12,6 @@ # You can add overlays here overlays = [ # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1ee63f0..fdc2161 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -37,11 +37,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index fe5e976..1a35430 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -39,10 +39,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages inputs.extest.overlays.default # You can also add overlays exported from other flakes: From 69d585c0179f4fc75c04ff5840ba6807ab995882 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 22:48:12 +0100 Subject: [PATCH 0908/2308] Removed references to the overlay and pkgs folder --- nixos/desktop/configuration.nix | 3 --- nixos/hosts/queen/configuration.nix | 5 ----- nixos/hosts/shodan/configuration.nix | 4 ---- 3 files changed, 12 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 9d722f7..40b0b9a 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -12,9 +12,6 @@ # You can add overlays here overlays = [ # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1ee63f0..fdc2161 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -37,11 +37,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index fe5e976..1a35430 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -39,10 +39,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages inputs.extest.overlays.default # You can also add overlays exported from other flakes: From 95800bb9bbbbaf877778c43a04d3c43a979ba25c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 22:48:58 +0100 Subject: [PATCH 0909/2308] From wheatley as well --- home-manager/hosts/wheatley/wheatley-Lillian.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/home-manager/hosts/wheatley/wheatley-Lillian.nix b/home-manager/hosts/wheatley/wheatley-Lillian.nix index 35137f9..016bbf5 100644 --- a/home-manager/hosts/wheatley/wheatley-Lillian.nix +++ b/home-manager/hosts/wheatley/wheatley-Lillian.nix @@ -24,11 +24,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default From f440830429ab97f49953fe8267dc98b5960e8d85 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 22:48:58 +0100 Subject: [PATCH 0910/2308] From wheatley as well --- home-manager/hosts/wheatley/wheatley-Lillian.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/home-manager/hosts/wheatley/wheatley-Lillian.nix b/home-manager/hosts/wheatley/wheatley-Lillian.nix index 35137f9..016bbf5 100644 --- a/home-manager/hosts/wheatley/wheatley-Lillian.nix +++ b/home-manager/hosts/wheatley/wheatley-Lillian.nix @@ -24,11 +24,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default From e35487296c794e6dee5d715922cdae36e7a09c7a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 22:52:29 +0100 Subject: [PATCH 0911/2308] Doing it for home-manager too --- home-manager/desktop/configuration.nix | 5 ----- home-manager/hosts/queen/queen-Lillian.nix | 5 ----- nixos/hosts/wheatley/configuration.nix | 5 ----- 3 files changed, 15 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index e588954..96e7e85 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -21,11 +21,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/home-manager/hosts/queen/queen-Lillian.nix b/home-manager/hosts/queen/queen-Lillian.nix index 35137f9..016bbf5 100644 --- a/home-manager/hosts/queen/queen-Lillian.nix +++ b/home-manager/hosts/queen/queen-Lillian.nix @@ -24,11 +24,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 157456a..bcc75ce 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -19,11 +19,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default From 2e18c6f98efbf0e6936a5972a8539c7850916a48 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 22:52:29 +0100 Subject: [PATCH 0912/2308] Doing it for home-manager too --- home-manager/desktop/configuration.nix | 5 ----- home-manager/hosts/queen/queen-Lillian.nix | 5 ----- nixos/hosts/wheatley/configuration.nix | 5 ----- 3 files changed, 15 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index e588954..96e7e85 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -21,11 +21,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/home-manager/hosts/queen/queen-Lillian.nix b/home-manager/hosts/queen/queen-Lillian.nix index 35137f9..016bbf5 100644 --- a/home-manager/hosts/queen/queen-Lillian.nix +++ b/home-manager/hosts/queen/queen-Lillian.nix @@ -24,11 +24,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 157456a..bcc75ce 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -19,11 +19,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default From 71da80f32efe2760d9f5d55ed21b24dfc8390c33 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:40:03 +0100 Subject: [PATCH 0913/2308] Change time to en_DK --- nixos/desktop/configuration.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 40b0b9a..2141924 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -106,7 +106,7 @@ LC_NUMERIC = "nl_NL.UTF-8"; LC_PAPER = "nl_NL.UTF-8"; LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; + LC_TIME = "en_DK.UTF-8"; }; # Enable the X11 windowing system. diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 1a35430..0893a00 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -187,7 +187,7 @@ LC_NUMERIC = "nl_NL.UTF-8"; LC_PAPER = "nl_NL.UTF-8"; LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; + LC_TIME = "en_DK.UTF8"; }; # Enable CUPS to print documents. From 3b728d6acbf222a2bf190f3e4eca23ef08342972 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:40:03 +0100 Subject: [PATCH 0914/2308] Change time to en_DK --- nixos/desktop/configuration.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 40b0b9a..2141924 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -106,7 +106,7 @@ LC_NUMERIC = "nl_NL.UTF-8"; LC_PAPER = "nl_NL.UTF-8"; LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; + LC_TIME = "en_DK.UTF-8"; }; # Enable the X11 windowing system. diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 1a35430..0893a00 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -187,7 +187,7 @@ LC_NUMERIC = "nl_NL.UTF-8"; LC_PAPER = "nl_NL.UTF-8"; LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; + LC_TIME = "en_DK.UTF8"; }; # Enable CUPS to print documents. From f5bdb73993751a4bac2102d2e9232b055054e767 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:40:25 +0100 Subject: [PATCH 0915/2308] And from these too --- nixos/hosts/queen/configuration.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index fdc2161..785e5c2 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -146,7 +146,7 @@ LC_NUMERIC = "nl_NL.UTF-8"; LC_PAPER = "nl_NL.UTF-8"; LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; + LC_TIME = "en_DK.UTF-8"; }; programs.zsh = { diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index bcc75ce..a285a43 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -161,7 +161,7 @@ LC_NUMERIC = "nl_NL.UTF-8"; LC_PAPER = "nl_NL.UTF-8"; LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; + LC_TIME = "en_DK.UTF-8"; }; programs.zsh = { From 1e989dbe4f6ff04503a0dde4ca2ea7abff882f11 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:40:25 +0100 Subject: [PATCH 0916/2308] And from these too --- nixos/hosts/queen/configuration.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index fdc2161..785e5c2 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -146,7 +146,7 @@ LC_NUMERIC = "nl_NL.UTF-8"; LC_PAPER = "nl_NL.UTF-8"; LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; + LC_TIME = "en_DK.UTF-8"; }; programs.zsh = { diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index bcc75ce..a285a43 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -161,7 +161,7 @@ LC_NUMERIC = "nl_NL.UTF-8"; LC_PAPER = "nl_NL.UTF-8"; LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; + LC_TIME = "en_DK.UTF-8"; }; programs.zsh = { From 32379262c98452150844eadfcce0c2f95770cb24 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:48:14 +0100 Subject: [PATCH 0917/2308] Update zsh-nix-shell version --- home-manager/package-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index f4da504..5ef359b 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -15,7 +15,7 @@ src = pkgs.fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; - rev = "v0.7.0"; + rev = "v0.8.0"; sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; }; } From 8e5777a98ffde234882dd9980982ed094c81e1e9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:48:14 +0100 Subject: [PATCH 0918/2308] Update zsh-nix-shell version --- home-manager/package-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index f4da504..5ef359b 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -15,7 +15,7 @@ src = pkgs.fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; - rev = "v0.7.0"; + rev = "v0.8.0"; sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; }; } From 0c3ef36f162ed26b6bb57cbb38f11ddebdd3f047 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:54:04 +0100 Subject: [PATCH 0919/2308] Change checksum --- home-manager/package-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 5ef359b..047b0e9 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -16,7 +16,7 @@ owner = "chisui"; repo = "zsh-nix-shell"; rev = "v0.8.0"; - sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + sha256 = "8b86281cf9e9ef9f207433dd8b36d157dd48d50a"; }; } ]; From 8763f946c3a67c17c1d81c8e989a6d5134608bbb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:54:04 +0100 Subject: [PATCH 0920/2308] Change checksum --- home-manager/package-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 5ef359b..047b0e9 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -16,7 +16,7 @@ owner = "chisui"; repo = "zsh-nix-shell"; rev = "v0.8.0"; - sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + sha256 = "8b86281cf9e9ef9f207433dd8b36d157dd48d50a"; }; } ]; From b33a07daeecfb4d7ae521de721956239aa49d8e1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:55:37 +0100 Subject: [PATCH 0921/2308] Change to 0 --- home-manager/package-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 047b0e9..7ec6b85 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -16,7 +16,7 @@ owner = "chisui"; repo = "zsh-nix-shell"; rev = "v0.8.0"; - sha256 = "8b86281cf9e9ef9f207433dd8b36d157dd48d50a"; + sha256 = "0000000000000000000000000000000000000000000000000000"; }; } ]; From 92f4334017fdd5770880f4c2b62d45b01d9cea92 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:55:37 +0100 Subject: [PATCH 0922/2308] Change to 0 --- home-manager/package-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 047b0e9..7ec6b85 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -16,7 +16,7 @@ owner = "chisui"; repo = "zsh-nix-shell"; rev = "v0.8.0"; - sha256 = "8b86281cf9e9ef9f207433dd8b36d157dd48d50a"; + sha256 = "0000000000000000000000000000000000000000000000000000"; }; } ]; From a3d4cd35fb6fd7a3b16ff9a22ac286036ae9a2ed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:56:27 +0100 Subject: [PATCH 0923/2308] Correct hash now --- home-manager/package-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 7ec6b85..3a4cfd8 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -16,7 +16,7 @@ owner = "chisui"; repo = "zsh-nix-shell"; rev = "v0.8.0"; - sha256 = "0000000000000000000000000000000000000000000000000000"; + sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM="; }; } ]; From fa15c3151c0a3f362e86050568eb04fb6d476ce9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 23:56:27 +0100 Subject: [PATCH 0924/2308] Correct hash now --- home-manager/package-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 7ec6b85..3a4cfd8 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -16,7 +16,7 @@ owner = "chisui"; repo = "zsh-nix-shell"; rev = "v0.8.0"; - sha256 = "0000000000000000000000000000000000000000000000000000"; + sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM="; }; } ]; From 40996b28c0762a3d39e02c80a9f7324d3788f6c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 00:40:07 +0100 Subject: [PATCH 0925/2308] Update home-manager/hosts/shodan/shodan-Lillian.nix --- home-manager/hosts/shodan/shodan-Lillian.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index b0cb6f4..09e2474 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -23,11 +23,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default From 930a47479ee901d772ab62044649f5024d7a2264 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Tue, 9 Jan 2024 00:40:07 +0100 Subject: [PATCH 0926/2308] Update home-manager/hosts/shodan/shodan-Lillian.nix --- home-manager/hosts/shodan/shodan-Lillian.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index b0cb6f4..09e2474 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -23,11 +23,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default From 9ae34a4b5115b0640aee71b39e257a27d2b63d94 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 09:56:40 +0100 Subject: [PATCH 0927/2308] Add desktop ssh key to shodan --- nixos/hosts/shodan/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 0893a00..679958e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -224,7 +224,10 @@ users.users = { lillian = { - openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + ]; isNormalUser = true; extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "decky"]; shell = pkgs.zsh; From 6d70aa2b317507233b2145e0b64bb9280c00b5b9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 09:56:40 +0100 Subject: [PATCH 0928/2308] Add desktop ssh key to shodan --- nixos/hosts/shodan/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 0893a00..679958e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -224,7 +224,10 @@ users.users = { lillian = { - openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"]; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + ]; isNormalUser = true; extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "decky"]; shell = pkgs.zsh; From ca1ef1636f3dddc26ad3babcaccb50c2706ce56c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 10:02:46 +0100 Subject: [PATCH 0929/2308] Add some comments to desktop nix to partition a bit clearer --- nixos/desktop/configuration.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 2141924..d375717 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -53,12 +53,21 @@ }; environment.systemPackages = with pkgs; [ + # System tools age alejandra docker docker-compose git-filter-repo home-manager + oh-my-zsh + pciutils + rsync + sqlfluff + wget + zsh + + # KDE/QT krunner-translator libsForQt5.discover libsForQt5.kcalc @@ -69,16 +78,14 @@ libsForQt5.krunner-symbols libsForQt5.packagekit-qt libportal-qt5 + + # System libraries noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji + + # User tools noisetorch - oh-my-zsh - pciutils - rsync - sqlfluff - wget - zsh ]; # Enable networking From 5874b5c57d10dc8e86c0062c98fca28384701d6b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 10:02:46 +0100 Subject: [PATCH 0930/2308] Add some comments to desktop nix to partition a bit clearer --- nixos/desktop/configuration.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 2141924..d375717 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -53,12 +53,21 @@ }; environment.systemPackages = with pkgs; [ + # System tools age alejandra docker docker-compose git-filter-repo home-manager + oh-my-zsh + pciutils + rsync + sqlfluff + wget + zsh + + # KDE/QT krunner-translator libsForQt5.discover libsForQt5.kcalc @@ -69,16 +78,14 @@ libsForQt5.krunner-symbols libsForQt5.packagekit-qt libportal-qt5 + + # System libraries noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji + + # User tools noisetorch - oh-my-zsh - pciutils - rsync - sqlfluff - wget - zsh ]; # Enable networking From 090b75d9e749bbbfdb86309ac4b98d7e2debc237 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 11:05:58 +0100 Subject: [PATCH 0931/2308] Change git email to be consistent with the git repo --- home-manager/desktop/configuration.nix | 2 +- home-manager/hosts/shodan/shodan-Lillian.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 96e7e85..3d465dc 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -120,7 +120,7 @@ programs.home-manager.enable = true; programs.git = { enable = true; - userEmail = "info@lillianviolet.dev"; + userEmail = "git@lillianviolet.dev"; userName = "Lillian-Violet"; }; diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 09e2474..720cf2b 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -79,7 +79,7 @@ programs.home-manager.enable = true; programs.git = { enable = true; - userEmail = "info@lillianviolet.dev"; + userEmail = "git@lillianviolet.dev"; userName = "Lillian-Violet"; }; From a9cad282008c039d57552a9e09915d9e664acc45 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 11:05:58 +0100 Subject: [PATCH 0932/2308] Change git email to be consistent with the git repo --- home-manager/desktop/configuration.nix | 2 +- home-manager/hosts/shodan/shodan-Lillian.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 96e7e85..3d465dc 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -120,7 +120,7 @@ programs.home-manager.enable = true; programs.git = { enable = true; - userEmail = "info@lillianviolet.dev"; + userEmail = "git@lillianviolet.dev"; userName = "Lillian-Violet"; }; diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 09e2474..720cf2b 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -79,7 +79,7 @@ programs.home-manager.enable = true; programs.git = { enable = true; - userEmail = "info@lillianviolet.dev"; + userEmail = "git@lillianviolet.dev"; userName = "Lillian-Violet"; }; From 35eb1935af177f409ce518d4cca50f559dafed8d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 11:14:04 +0100 Subject: [PATCH 0933/2308] Update flake lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8a75a53..28e629f 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1704626572, + "narHash": "sha256-VwRTEKzK4wSSv64G+g3RLF3t6yBHrhR2VK3kZ5UWisU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "24fe8bb4f552ad3926274d29e083b79d84707da6", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704596510, - "narHash": "sha256-tupdwwg1WeX2hNMOQrvtyafTaTVty0QC/gQp7yaYJic=", + "lastModified": 1704753304, + "narHash": "sha256-9shh5fYLfLJrxr4NnIoWcO9T3bTFuO5QW9v/wDpq9Xg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f5fbcc0f50e7fc60c4f806fa7a09abccf0826d8a", + "rev": "0ded57412079011f1210c2fcc10e112427d4c0e6", "type": "github" }, "original": { From e66151b26c6890dc33955aa30f9491f4612300bc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 11:14:04 +0100 Subject: [PATCH 0934/2308] Update flake lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8a75a53..28e629f 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1704626572, + "narHash": "sha256-VwRTEKzK4wSSv64G+g3RLF3t6yBHrhR2VK3kZ5UWisU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "24fe8bb4f552ad3926274d29e083b79d84707da6", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704596510, - "narHash": "sha256-tupdwwg1WeX2hNMOQrvtyafTaTVty0QC/gQp7yaYJic=", + "lastModified": 1704753304, + "narHash": "sha256-9shh5fYLfLJrxr4NnIoWcO9T3bTFuO5QW9v/wDpq9Xg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f5fbcc0f50e7fc60c4f806fa7a09abccf0826d8a", + "rev": "0ded57412079011f1210c2fcc10e112427d4c0e6", "type": "github" }, "original": { From d76d21a39b2a76851ac181509525f33c61637eb2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 11:59:30 +0100 Subject: [PATCH 0935/2308] Enable bluetooth by default on EDI --- nixos/hosts/EDI/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 9423047..8f8eea4 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -38,6 +38,9 @@ networking.hostName = "EDI"; + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } From db25845e98d16c62082501f244dadbf3f9d52c1d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 11:59:30 +0100 Subject: [PATCH 0936/2308] Enable bluetooth by default on EDI --- nixos/hosts/EDI/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 9423047..8f8eea4 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -38,6 +38,9 @@ networking.hostName = "EDI"; + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } From 808ab9fea5169f6d587aff05fd3e17e6fb56c336 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 13:19:42 +0100 Subject: [PATCH 0937/2308] Small refactor to make locale a global setting --- nixos/desktop/configuration.nix | 18 +++--------------- nixos/hosts/queen/configuration.nix | 19 ++++--------------- nixos/hosts/shodan/configuration.nix | 18 +++--------------- nixos/hosts/wheatley/configuration.nix | 19 +++---------------- nixos/shared/locale/configuration.nix | 23 +++++++++++++++++++++++ 5 files changed, 36 insertions(+), 61 deletions(-) create mode 100644 nixos/shared/locale/configuration.nix diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index d375717..f50a040 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -8,6 +8,9 @@ pkgs, ... }: { + imports = [ + ../shared/locale/configuration.nix + ]; nixpkgs = { # You can add overlays here overlays = [ @@ -101,21 +104,6 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "en_DK.UTF-8"; - }; - # Enable the X11 windowing system. services.xserver.enable = true; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 785e5c2..b8d0f59 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -16,6 +16,10 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix + + # Import locale settings + ../../shared/locale/configuration.nix + #../../server/package-configs/akkoma/configuration.nix ../../server/package-configs/forgejo/configuration.nix ../../server/package-configs/gotosocial/configuration.nix @@ -134,21 +138,6 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "en_DK.UTF-8"; - }; - programs.zsh = { enable = true; }; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 679958e..ab3fae2 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -26,6 +26,9 @@ # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default + # Import the locale settings + ../../shared/locale/configuration.nix + # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix @@ -175,21 +178,6 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "en_DK.UTF8"; - }; - # Enable CUPS to print documents. services.printing.enable = true; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index a285a43..fbf15bc 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -11,7 +11,9 @@ # nixos-generate-config should normally set up file systems correctly imports = [ - #inputs.home-manager.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager + # Import locale settings + ../../shared/locale/configuration.nix ./hardware-configuration.nix ]; @@ -149,21 +151,6 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "en_DK.UTF-8"; - }; - programs.zsh = { enable = true; }; diff --git a/nixos/shared/locale/configuration.nix b/nixos/shared/locale/configuration.nix new file mode 100644 index 0000000..2444204 --- /dev/null +++ b/nixos/shared/locale/configuration.nix @@ -0,0 +1,23 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "en_DK.UTF8"; + }; +} From 42582b92312fc3dc5a134e81e4dc306da83f8556 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 13:19:42 +0100 Subject: [PATCH 0938/2308] Small refactor to make locale a global setting --- nixos/desktop/configuration.nix | 18 +++--------------- nixos/hosts/queen/configuration.nix | 19 ++++--------------- nixos/hosts/shodan/configuration.nix | 18 +++--------------- nixos/hosts/wheatley/configuration.nix | 19 +++---------------- nixos/shared/locale/configuration.nix | 23 +++++++++++++++++++++++ 5 files changed, 36 insertions(+), 61 deletions(-) create mode 100644 nixos/shared/locale/configuration.nix diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index d375717..f50a040 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -8,6 +8,9 @@ pkgs, ... }: { + imports = [ + ../shared/locale/configuration.nix + ]; nixpkgs = { # You can add overlays here overlays = [ @@ -101,21 +104,6 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "en_DK.UTF-8"; - }; - # Enable the X11 windowing system. services.xserver.enable = true; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 785e5c2..b8d0f59 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -16,6 +16,10 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix + + # Import locale settings + ../../shared/locale/configuration.nix + #../../server/package-configs/akkoma/configuration.nix ../../server/package-configs/forgejo/configuration.nix ../../server/package-configs/gotosocial/configuration.nix @@ -134,21 +138,6 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "en_DK.UTF-8"; - }; - programs.zsh = { enable = true; }; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 679958e..ab3fae2 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -26,6 +26,9 @@ # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default + # Import the locale settings + ../../shared/locale/configuration.nix + # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix @@ -175,21 +178,6 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "en_DK.UTF8"; - }; - # Enable CUPS to print documents. services.printing.enable = true; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index a285a43..fbf15bc 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -11,7 +11,9 @@ # nixos-generate-config should normally set up file systems correctly imports = [ - #inputs.home-manager.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager + # Import locale settings + ../../shared/locale/configuration.nix ./hardware-configuration.nix ]; @@ -149,21 +151,6 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "en_DK.UTF-8"; - }; - programs.zsh = { enable = true; }; diff --git a/nixos/shared/locale/configuration.nix b/nixos/shared/locale/configuration.nix new file mode 100644 index 0000000..2444204 --- /dev/null +++ b/nixos/shared/locale/configuration.nix @@ -0,0 +1,23 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "en_DK.UTF8"; + }; +} From 358c68416a14d1abb62f5b0f5745d1781a5fcf83 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 15:48:49 +0100 Subject: [PATCH 0939/2308] Add openvscode to queen --- .../vscode-server/configuration.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 nixos/server/package-configs/vscode-server/configuration.nix diff --git a/nixos/server/package-configs/vscode-server/configuration.nix b/nixos/server/package-configs/vscode-server/configuration.nix new file mode 100644 index 0000000..944108e --- /dev/null +++ b/nixos/server/package-configs/vscode-server/configuration.nix @@ -0,0 +1,24 @@ +{ + config, + pkgs, + lib, + ... +}: { + services.openvscode = { + enable = true; + port = 7773; + telemetryLevel = "off"; + withoutConnectionToken = true; + }; + services.nginx = { + virtualHosts = { + "code.lillianviolet.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:7773"; + }; + }; + }; + }; +} From dda5588f179fa3f87a4daf2429d40f8cc56b21a2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 9 Jan 2024 15:48:49 +0100 Subject: [PATCH 0940/2308] Add openvscode to queen --- .../vscode-server/configuration.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 nixos/server/package-configs/vscode-server/configuration.nix diff --git a/nixos/server/package-configs/vscode-server/configuration.nix b/nixos/server/package-configs/vscode-server/configuration.nix new file mode 100644 index 0000000..944108e --- /dev/null +++ b/nixos/server/package-configs/vscode-server/configuration.nix @@ -0,0 +1,24 @@ +{ + config, + pkgs, + lib, + ... +}: { + services.openvscode = { + enable = true; + port = 7773; + telemetryLevel = "off"; + withoutConnectionToken = true; + }; + services.nginx = { + virtualHosts = { + "code.lillianviolet.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:7773"; + }; + }; + }; + }; +} From 9dd64f0af8a27961a030f6d63f3fa7f615b05088 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 10:21:31 +0100 Subject: [PATCH 0941/2308] Enable vscode server --- nixos/hosts/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index b8d0f59..c2712cc 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -31,6 +31,7 @@ ../../server/package-configs/jellyfin/configuration.nix ../../server/package-configs/ombi/configuration.nix ../../server/package-configs/aria2/configuration.nix + ../../server/package-configs/vscode-server/configuration.nix ]; boot.tmp.cleanOnBoot = true; From 9478c5ba5e70dac2eb90edc9f4bd1cc3977b4ecd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 10:21:31 +0100 Subject: [PATCH 0942/2308] Enable vscode server --- nixos/hosts/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index b8d0f59..c2712cc 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -31,6 +31,7 @@ ../../server/package-configs/jellyfin/configuration.nix ../../server/package-configs/ombi/configuration.nix ../../server/package-configs/aria2/configuration.nix + ../../server/package-configs/vscode-server/configuration.nix ]; boot.tmp.cleanOnBoot = true; From c48747f36168c9bb3dd9b984ee76c6a08579ff0e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 10:24:47 +0100 Subject: [PATCH 0943/2308] Should probably install the package and use the right package name --- nixos/hosts/queen/configuration.nix | 1 + nixos/server/package-configs/vscode-server/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index c2712cc..b15bb60 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -111,6 +111,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver + openvscode-server postgresql_16 python3 rsync diff --git a/nixos/server/package-configs/vscode-server/configuration.nix b/nixos/server/package-configs/vscode-server/configuration.nix index 944108e..af58c42 100644 --- a/nixos/server/package-configs/vscode-server/configuration.nix +++ b/nixos/server/package-configs/vscode-server/configuration.nix @@ -4,7 +4,7 @@ lib, ... }: { - services.openvscode = { + services.openvscode-server = { enable = true; port = 7773; telemetryLevel = "off"; From 212a675cb1ba8945dc1ab32481462a0d6627fe45 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 10:24:47 +0100 Subject: [PATCH 0944/2308] Should probably install the package and use the right package name --- nixos/hosts/queen/configuration.nix | 1 + nixos/server/package-configs/vscode-server/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index c2712cc..b15bb60 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -111,6 +111,7 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver + openvscode-server postgresql_16 python3 rsync diff --git a/nixos/server/package-configs/vscode-server/configuration.nix b/nixos/server/package-configs/vscode-server/configuration.nix index 944108e..af58c42 100644 --- a/nixos/server/package-configs/vscode-server/configuration.nix +++ b/nixos/server/package-configs/vscode-server/configuration.nix @@ -4,7 +4,7 @@ lib, ... }: { - services.openvscode = { + services.openvscode-server = { enable = true; port = 7773; telemetryLevel = "off"; From eb5202f93366df5618f80a0b2d758e90b918a4ef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 11:17:18 +0100 Subject: [PATCH 0945/2308] Don't think I want this anyway --- nixos/desktop/configuration.nix | 3 ++- nixos/hosts/queen/configuration.nix | 2 -- .../vscode-server/configuration.nix | 24 ------------------- 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 nixos/server/package-configs/vscode-server/configuration.nix diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index f50a040..6c38e2e 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -118,9 +118,10 @@ services.packagekit.enable = true; # Configure keymap in X11 - services.xserver = { + services.xserver.xkb = { layout = "us"; xkbVariant = ""; + options = "terminate:ctrl_alt_bksp,compose:caps_toggle"; }; # Enable CUPS to print documents. diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index b15bb60..b8d0f59 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -31,7 +31,6 @@ ../../server/package-configs/jellyfin/configuration.nix ../../server/package-configs/ombi/configuration.nix ../../server/package-configs/aria2/configuration.nix - ../../server/package-configs/vscode-server/configuration.nix ]; boot.tmp.cleanOnBoot = true; @@ -111,7 +110,6 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - openvscode-server postgresql_16 python3 rsync diff --git a/nixos/server/package-configs/vscode-server/configuration.nix b/nixos/server/package-configs/vscode-server/configuration.nix deleted file mode 100644 index af58c42..0000000 --- a/nixos/server/package-configs/vscode-server/configuration.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: { - services.openvscode-server = { - enable = true; - port = 7773; - telemetryLevel = "off"; - withoutConnectionToken = true; - }; - services.nginx = { - virtualHosts = { - "code.lillianviolet.dev" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:7773"; - }; - }; - }; - }; -} From 05fdaeea5d0fadc79b5717a14830059dbcee693e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 11:17:18 +0100 Subject: [PATCH 0946/2308] Don't think I want this anyway --- nixos/desktop/configuration.nix | 3 ++- nixos/hosts/queen/configuration.nix | 2 -- .../vscode-server/configuration.nix | 24 ------------------- 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 nixos/server/package-configs/vscode-server/configuration.nix diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index f50a040..6c38e2e 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -118,9 +118,10 @@ services.packagekit.enable = true; # Configure keymap in X11 - services.xserver = { + services.xserver.xkb = { layout = "us"; xkbVariant = ""; + options = "terminate:ctrl_alt_bksp,compose:caps_toggle"; }; # Enable CUPS to print documents. diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index b15bb60..b8d0f59 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -31,7 +31,6 @@ ../../server/package-configs/jellyfin/configuration.nix ../../server/package-configs/ombi/configuration.nix ../../server/package-configs/aria2/configuration.nix - ../../server/package-configs/vscode-server/configuration.nix ]; boot.tmp.cleanOnBoot = true; @@ -111,7 +110,6 @@ noto-fonts-emoji oh-my-zsh onlyoffice-documentserver - openvscode-server postgresql_16 python3 rsync diff --git a/nixos/server/package-configs/vscode-server/configuration.nix b/nixos/server/package-configs/vscode-server/configuration.nix deleted file mode 100644 index af58c42..0000000 --- a/nixos/server/package-configs/vscode-server/configuration.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: { - services.openvscode-server = { - enable = true; - port = 7773; - telemetryLevel = "off"; - withoutConnectionToken = true; - }; - services.nginx = { - virtualHosts = { - "code.lillianviolet.dev" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:7773"; - }; - }; - }; - }; -} From 043c77ab1729efa133350cf7b0102e43584b1cf1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 11:22:11 +0100 Subject: [PATCH 0947/2308] Does this fix the phone region? --- nixos/server/package-configs/nextcloud/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix index 057d588..594ab4b 100644 --- a/nixos/server/package-configs/nextcloud/configuration.nix +++ b/nixos/server/package-configs/nextcloud/configuration.nix @@ -61,11 +61,12 @@ configureRedis = true; maxUploadSize = "16G"; + defaultPhoneRegion = "NL"; + #Increase opcache string buffer phpOptions."opcache.interned_strings_buffer" = "23"; # Further forces Nextcloud to use HTTPS extraOptions = { - defaultPhoneRegion = "NL"; overwriteprotocol = "https"; }; appstoreEnable = true; From 4d495dbdc5f7ef4df44abe5616fbf5406269975f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 11:22:11 +0100 Subject: [PATCH 0948/2308] Does this fix the phone region? --- nixos/server/package-configs/nextcloud/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix index 057d588..594ab4b 100644 --- a/nixos/server/package-configs/nextcloud/configuration.nix +++ b/nixos/server/package-configs/nextcloud/configuration.nix @@ -61,11 +61,12 @@ configureRedis = true; maxUploadSize = "16G"; + defaultPhoneRegion = "NL"; + #Increase opcache string buffer phpOptions."opcache.interned_strings_buffer" = "23"; # Further forces Nextcloud to use HTTPS extraOptions = { - defaultPhoneRegion = "NL"; overwriteprotocol = "https"; }; appstoreEnable = true; From fbabd8615aa21ff3a5e324617e166f5734c40527 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 11:22:54 +0100 Subject: [PATCH 0949/2308] Ah it has to go here according to the site --- nixos/server/package-configs/nextcloud/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix index 594ab4b..840d8a5 100644 --- a/nixos/server/package-configs/nextcloud/configuration.nix +++ b/nixos/server/package-configs/nextcloud/configuration.nix @@ -61,8 +61,6 @@ configureRedis = true; maxUploadSize = "16G"; - defaultPhoneRegion = "NL"; - #Increase opcache string buffer phpOptions."opcache.interned_strings_buffer" = "23"; # Further forces Nextcloud to use HTTPS @@ -85,6 +83,7 @@ dbname = "nextcloud"; dbpassFile = config.sops.secrets."nextclouddb".path; + defaultPhoneRegion = "NL"; adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "GLaDTheresCake"; }; From 266e4c792d40a08921f1dedec1683d24e3fb321b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 11:22:54 +0100 Subject: [PATCH 0950/2308] Ah it has to go here according to the site --- nixos/server/package-configs/nextcloud/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix index 594ab4b..840d8a5 100644 --- a/nixos/server/package-configs/nextcloud/configuration.nix +++ b/nixos/server/package-configs/nextcloud/configuration.nix @@ -61,8 +61,6 @@ configureRedis = true; maxUploadSize = "16G"; - defaultPhoneRegion = "NL"; - #Increase opcache string buffer phpOptions."opcache.interned_strings_buffer" = "23"; # Further forces Nextcloud to use HTTPS @@ -85,6 +83,7 @@ dbname = "nextcloud"; dbpassFile = config.sops.secrets."nextclouddb".path; + defaultPhoneRegion = "NL"; adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "GLaDTheresCake"; }; From 6bafd9a3d70aa9625d4c8b2374721089123a2f59 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 11:23:58 +0100 Subject: [PATCH 0951/2308] OK, the issue was a tpyo --- nixos/server/package-configs/nextcloud/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix index 840d8a5..4767bd5 100644 --- a/nixos/server/package-configs/nextcloud/configuration.nix +++ b/nixos/server/package-configs/nextcloud/configuration.nix @@ -66,6 +66,7 @@ # Further forces Nextcloud to use HTTPS extraOptions = { overwriteprotocol = "https"; + default_phone_region = "NL"; }; appstoreEnable = true; extraAppsEnable = true; @@ -83,7 +84,6 @@ dbname = "nextcloud"; dbpassFile = config.sops.secrets."nextclouddb".path; - defaultPhoneRegion = "NL"; adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "GLaDTheresCake"; }; From 0555ee7ce4fc94b87e6c1e7959de7faf35001aca Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Jan 2024 11:23:58 +0100 Subject: [PATCH 0952/2308] OK, the issue was a tpyo --- nixos/server/package-configs/nextcloud/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix index 840d8a5..4767bd5 100644 --- a/nixos/server/package-configs/nextcloud/configuration.nix +++ b/nixos/server/package-configs/nextcloud/configuration.nix @@ -66,6 +66,7 @@ # Further forces Nextcloud to use HTTPS extraOptions = { overwriteprotocol = "https"; + default_phone_region = "NL"; }; appstoreEnable = true; extraAppsEnable = true; @@ -83,7 +84,6 @@ dbname = "nextcloud"; dbpassFile = config.sops.secrets."nextclouddb".path; - defaultPhoneRegion = "NL"; adminpassFile = config.sops.secrets."nextcloudadmin".path; adminuser = "GLaDTheresCake"; }; From a433e98f0b588af94e6a7f55efc9871bc3ff941e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 13:24:48 +0100 Subject: [PATCH 0953/2308] Change jovian nixos to a flake import instead of a normal import --- flake.nix | 2 ++ nixos/hosts/shodan/configuration.nix | 13 +------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 0663bf6..4885fc4 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,8 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. + jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; + # Home manager home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index ab3fae2..a73682d 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -8,18 +8,7 @@ }: { imports = [ #Jovian Nixos - ( - # Put the most recent revision here: - let - revision = "1962ff3135b1468ae473a196da01d0ebf38c144e"; - in - builtins.fetchTarball { - url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz"; - # Update the hash as needed: - sha256 = "sha256:1iicb42dy4k440ddarysbb82bc7k5dv94xhg38jfcwh0wpq0rbdc"; - } - + "/modules" - ) + inputs.jovian.nixosModules.jovian # If you want to use modules your own flake exports (from modules/home-manager): # outputs.homeManagerModules.example inputs.home-manager.nixosModules.home-manager From 366f4a125357259ee440e6446b697a4c34384692 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 13:24:48 +0100 Subject: [PATCH 0954/2308] Change jovian nixos to a flake import instead of a normal import --- flake.nix | 2 ++ nixos/hosts/shodan/configuration.nix | 13 +------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 0663bf6..4885fc4 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,8 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. + jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; + # Home manager home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index ab3fae2..a73682d 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -8,18 +8,7 @@ }: { imports = [ #Jovian Nixos - ( - # Put the most recent revision here: - let - revision = "1962ff3135b1468ae473a196da01d0ebf38c144e"; - in - builtins.fetchTarball { - url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz"; - # Update the hash as needed: - sha256 = "sha256:1iicb42dy4k440ddarysbb82bc7k5dv94xhg38jfcwh0wpq0rbdc"; - } - + "/modules" - ) + inputs.jovian.nixosModules.jovian # If you want to use modules your own flake exports (from modules/home-manager): # outputs.homeManagerModules.example inputs.home-manager.nixosModules.home-manager From ebd5f60dfaa80efc81c570f543c28c50d0f45e40 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 14:06:03 +0100 Subject: [PATCH 0955/2308] Update flake lock --- flake.lock | 94 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 28e629f..ddca4cd 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1704498488, - "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "lastModified": 1704809957, + "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", "owner": "nix-community", "repo": "home-manager", - "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", "type": "github" }, "original": { @@ -56,13 +56,54 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1704665257, + "narHash": "sha256-Cycz00I26e8QZ9sZtCz0uIz6Cad5ld3zM7N2I+5beqI=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "8951673c6c216ddd6bac3db3e88e3f2281b3511a", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1704626572, - "narHash": "sha256-VwRTEKzK4wSSv64G+g3RLF3t6yBHrhR2VK3kZ5UWisU=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "24fe8bb4f552ad3926274d29e083b79d84707da6", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -90,11 +131,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1704538339, - "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { @@ -106,11 +147,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1704538339, - "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { @@ -120,7 +177,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1704161960, "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", @@ -140,22 +197,23 @@ "inputs": { "extest": "extest", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", + "jovian": "jovian", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704753304, - "narHash": "sha256-9shh5fYLfLJrxr4NnIoWcO9T3bTFuO5QW9v/wDpq9Xg=", + "lastModified": 1704908274, + "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0ded57412079011f1210c2fcc10e112427d4c0e6", + "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", "type": "github" }, "original": { From 832c9de8e286e773b4a3a8737e2ccc722d0f741e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 14:06:03 +0100 Subject: [PATCH 0956/2308] Update flake lock --- flake.lock | 94 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 28e629f..ddca4cd 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1704498488, - "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "lastModified": 1704809957, + "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", "owner": "nix-community", "repo": "home-manager", - "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", "type": "github" }, "original": { @@ -56,13 +56,54 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1704665257, + "narHash": "sha256-Cycz00I26e8QZ9sZtCz0uIz6Cad5ld3zM7N2I+5beqI=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "8951673c6c216ddd6bac3db3e88e3f2281b3511a", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1704626572, - "narHash": "sha256-VwRTEKzK4wSSv64G+g3RLF3t6yBHrhR2VK3kZ5UWisU=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "24fe8bb4f552ad3926274d29e083b79d84707da6", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -90,11 +131,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1704538339, - "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { @@ -106,11 +147,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1704538339, - "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { @@ -120,7 +177,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1704161960, "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", @@ -140,22 +197,23 @@ "inputs": { "extest": "extest", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", + "jovian": "jovian", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704753304, - "narHash": "sha256-9shh5fYLfLJrxr4NnIoWcO9T3bTFuO5QW9v/wDpq9Xg=", + "lastModified": 1704908274, + "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0ded57412079011f1210c2fcc10e112427d4c0e6", + "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", "type": "github" }, "original": { From 0250dd7181db0cac12a79ad913d7e72ac29d3047 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 14:10:24 +0100 Subject: [PATCH 0957/2308] Change the typo --- nixos/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 6c38e2e..cc615c7 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -120,7 +120,7 @@ # Configure keymap in X11 services.xserver.xkb = { layout = "us"; - xkbVariant = ""; + variant = ""; options = "terminate:ctrl_alt_bksp,compose:caps_toggle"; }; From bb149491f39a233f215088a099d3e3854899ebb0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 14:10:24 +0100 Subject: [PATCH 0958/2308] Change the typo --- nixos/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 6c38e2e..cc615c7 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -120,7 +120,7 @@ # Configure keymap in X11 services.xserver.xkb = { layout = "us"; - xkbVariant = ""; + variant = ""; options = "terminate:ctrl_alt_bksp,compose:caps_toggle"; }; From 2003f52a8f0cc77977b5cc119e9d6b1405883b98 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 14:51:11 +0100 Subject: [PATCH 0959/2308] Copied some configs from here for wheatley https://gitlab.com/misuzu/nixos-configuration/-/blob/main/hosts/megumi/configuration.nix?ref_type=heads --- nixos/hosts/wheatley/configuration.nix | 44 ++++++++++++++++++-------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index fbf15bc..b4ad703 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -1,23 +1,26 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, - lib, ... }: { - # NixOS wants to enable GRUB by default - boot.loader.grub.enable = false; - # Enables the generation of /boot/extlinux/extlinux.conf - boot.loader.generic-extlinux-compatible.enable = true; - - # nixos-generate-config should normally set up file systems correctly imports = [ - inputs.home-manager.nixosModules.home-manager - # Import locale settings - ../../shared/locale/configuration.nix - ./hardware-configuration.nix + ../../shared/locale/configuration.nix ]; + boot.loader.generic-extlinux-compatible.enable = true; + boot.loader.grub.enable = false; + + boot.kernelPackages = pkgs.linuxPackages_5_15; + + boot.extraModulePackages = [ + (pkgs.callPackage ./rtl8189es.nix { + kernel = config.boot.kernelPackages.kernel; + }) + ]; nixpkgs = { # You can add overlays here overlays = [ @@ -43,6 +46,10 @@ git ]; + boot.kernelParams = [ + "console=ttyS0,115200n8" + ]; + nix = { gc = { automatic = true; @@ -64,6 +71,7 @@ auto-optimise-store = true; }; }; + virtualisation.oci-containers.backend = "podman"; virtualisation.oci-containers.containers.pihole = { image = "pihole/pihole:2024.01.0"; @@ -179,8 +187,16 @@ }; }; - networking.hostName = "wheatley"; + networking.hostName = "wheatley"; # Define your hostname - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + networking.wireless.interfaces = ["wlan0"]; + + # powerManagement.cpuFreqGovernor = "powersave"; + powerManagement.cpufreq.max = 648000; + + # This value determines the NixOS release with which your system is to be + # compatible, in order to avoid breaking some software such as database + # servers. You should change this only after NixOS release notes say you + # should. + system.stateVersion = "unstable"; # Did you read the comment? } From 4b535508e64ae564a57557c23e5533167978f33d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 14:51:11 +0100 Subject: [PATCH 0960/2308] Copied some configs from here for wheatley https://gitlab.com/misuzu/nixos-configuration/-/blob/main/hosts/megumi/configuration.nix?ref_type=heads --- nixos/hosts/wheatley/configuration.nix | 44 ++++++++++++++++++-------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index fbf15bc..b4ad703 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -1,23 +1,26 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, - lib, ... }: { - # NixOS wants to enable GRUB by default - boot.loader.grub.enable = false; - # Enables the generation of /boot/extlinux/extlinux.conf - boot.loader.generic-extlinux-compatible.enable = true; - - # nixos-generate-config should normally set up file systems correctly imports = [ - inputs.home-manager.nixosModules.home-manager - # Import locale settings - ../../shared/locale/configuration.nix - ./hardware-configuration.nix + ../../shared/locale/configuration.nix ]; + boot.loader.generic-extlinux-compatible.enable = true; + boot.loader.grub.enable = false; + + boot.kernelPackages = pkgs.linuxPackages_5_15; + + boot.extraModulePackages = [ + (pkgs.callPackage ./rtl8189es.nix { + kernel = config.boot.kernelPackages.kernel; + }) + ]; nixpkgs = { # You can add overlays here overlays = [ @@ -43,6 +46,10 @@ git ]; + boot.kernelParams = [ + "console=ttyS0,115200n8" + ]; + nix = { gc = { automatic = true; @@ -64,6 +71,7 @@ auto-optimise-store = true; }; }; + virtualisation.oci-containers.backend = "podman"; virtualisation.oci-containers.containers.pihole = { image = "pihole/pihole:2024.01.0"; @@ -179,8 +187,16 @@ }; }; - networking.hostName = "wheatley"; + networking.hostName = "wheatley"; # Define your hostname - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + networking.wireless.interfaces = ["wlan0"]; + + # powerManagement.cpuFreqGovernor = "powersave"; + powerManagement.cpufreq.max = 648000; + + # This value determines the NixOS release with which your system is to be + # compatible, in order to avoid breaking some software such as database + # servers. You should change this only after NixOS release notes say you + # should. + system.stateVersion = "unstable"; # Did you read the comment? } From fc36f347c8d1a09123db6c59bd1ecfcb0cdf5cc8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 22:37:59 +0100 Subject: [PATCH 0961/2308] Added mail configuration to flake, and made wheatley use the mainline kernel to see if that works later --- flake.lock | 125 +++++++++++++++++- flake.nix | 3 + nixos/hosts/wheatley/configuration.nix | 2 - .../mail-server/configuration.nix | 18 --- 4 files changed, 124 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index ddca4cd..9770d24 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, "extest": { "inputs": { "extest": "extest_2", @@ -35,6 +51,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -42,11 +74,11 @@ ] }, "locked": { - "lastModified": 1704809957, - "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", + "lastModified": 1704980804, + "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", "owner": "nix-community", "repo": "home-manager", - "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", + "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", "type": "github" }, "original": { @@ -113,6 +145,36 @@ "type": "github" } }, + "nixpkgs-22_11": { + "locked": { + "lastModified": 1669558522, + "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.11", + "type": "indirect" + } + }, + "nixpkgs-23_05": { + "locked": { + "lastModified": 1684782344, + "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1704290814, @@ -178,6 +240,21 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1670751203, + "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1704161960, "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", @@ -200,12 +277,37 @@ "jovian": "jovian", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" } }, + "simple-nixos-mailserver": { + "inputs": { + "blobs": "blobs", + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_4", + "nixpkgs-22_11": "nixpkgs-22_11", + "nixpkgs-23_05": "nixpkgs-23_05", + "utils": "utils" + }, + "locked": { + "lastModified": 1703666786, + "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "ref": "master", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -221,6 +323,21 @@ "repo": "sops-nix", "type": "github" } + }, + "utils": { + "locked": { + "lastModified": 1605370193, + "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4885fc4..ec9e477 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -25,6 +26,7 @@ nixpkgs, home-manager, sops-nix, + simple-nixos-mailserver, ... } @ inputs: let inherit (self) outputs; @@ -63,6 +65,7 @@ # > Our main nixos configuration file < ./nixos/hosts/queen/configuration.nix sops-nix.nixosModules.sops + simple-nixos-mailserver.nixosModule ]; }; }; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index b4ad703..8ab28ff 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -14,8 +14,6 @@ boot.loader.generic-extlinux-compatible.enable = true; boot.loader.grub.enable = false; - boot.kernelPackages = pkgs.linuxPackages_5_15; - boot.extraModulePackages = [ (pkgs.callPackage ./rtl8189es.nix { kernel = config.boot.kernelPackages.kernel; diff --git a/nixos/server/package-configs/mail-server/configuration.nix b/nixos/server/package-configs/mail-server/configuration.nix index ac9c3a0..144ac7d 100644 --- a/nixos/server/package-configs/mail-server/configuration.nix +++ b/nixos/server/package-configs/mail-server/configuration.nix @@ -6,27 +6,9 @@ pkgs, ... }: { - imports = [ - (builtins.fetchTarball { - # Pick a release version you are interested in and set its hash, e.g. - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/24128c3052090311688b09a400aa408ba61c6ee5/nixos-mailserver-A-COMMIT-ID.tar.gz"; - # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: - # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/24128c3052090311688b09a400aa408ba61c6ee5/nixos-mailserver-A-COMMIT-ID.tar.gz" --unpack - sha256 = "1ngil2shzkf61qxiqw11awyl81cr7ks2kv3r3k243zz7v2xakm5c"; - }) - ]; - sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; - # users.users = { - # virtualMail = { - # isSystemUser = true; - # isNormalUser = false; - # group = "virtualMail"; - # }; - # }; - mailserver = { enable = true; enableImap = true; From b502ae55c955cd8b933c9f2c072a2266e24fd105 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 22:37:59 +0100 Subject: [PATCH 0962/2308] Added mail configuration to flake, and made wheatley use the mainline kernel to see if that works later --- flake.lock | 125 +++++++++++++++++- flake.nix | 3 + nixos/hosts/wheatley/configuration.nix | 2 - .../mail-server/configuration.nix | 18 --- 4 files changed, 124 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index ddca4cd..9770d24 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, "extest": { "inputs": { "extest": "extest_2", @@ -35,6 +51,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -42,11 +74,11 @@ ] }, "locked": { - "lastModified": 1704809957, - "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", + "lastModified": 1704980804, + "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", "owner": "nix-community", "repo": "home-manager", - "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", + "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", "type": "github" }, "original": { @@ -113,6 +145,36 @@ "type": "github" } }, + "nixpkgs-22_11": { + "locked": { + "lastModified": 1669558522, + "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.11", + "type": "indirect" + } + }, + "nixpkgs-23_05": { + "locked": { + "lastModified": 1684782344, + "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1704290814, @@ -178,6 +240,21 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1670751203, + "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1704161960, "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", @@ -200,12 +277,37 @@ "jovian": "jovian", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" } }, + "simple-nixos-mailserver": { + "inputs": { + "blobs": "blobs", + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_4", + "nixpkgs-22_11": "nixpkgs-22_11", + "nixpkgs-23_05": "nixpkgs-23_05", + "utils": "utils" + }, + "locked": { + "lastModified": 1703666786, + "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "ref": "master", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -221,6 +323,21 @@ "repo": "sops-nix", "type": "github" } + }, + "utils": { + "locked": { + "lastModified": 1605370193, + "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4885fc4..ec9e477 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -25,6 +26,7 @@ nixpkgs, home-manager, sops-nix, + simple-nixos-mailserver, ... } @ inputs: let inherit (self) outputs; @@ -63,6 +65,7 @@ # > Our main nixos configuration file < ./nixos/hosts/queen/configuration.nix sops-nix.nixosModules.sops + simple-nixos-mailserver.nixosModule ]; }; }; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index b4ad703..8ab28ff 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -14,8 +14,6 @@ boot.loader.generic-extlinux-compatible.enable = true; boot.loader.grub.enable = false; - boot.kernelPackages = pkgs.linuxPackages_5_15; - boot.extraModulePackages = [ (pkgs.callPackage ./rtl8189es.nix { kernel = config.boot.kernelPackages.kernel; diff --git a/nixos/server/package-configs/mail-server/configuration.nix b/nixos/server/package-configs/mail-server/configuration.nix index ac9c3a0..144ac7d 100644 --- a/nixos/server/package-configs/mail-server/configuration.nix +++ b/nixos/server/package-configs/mail-server/configuration.nix @@ -6,27 +6,9 @@ pkgs, ... }: { - imports = [ - (builtins.fetchTarball { - # Pick a release version you are interested in and set its hash, e.g. - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/24128c3052090311688b09a400aa408ba61c6ee5/nixos-mailserver-A-COMMIT-ID.tar.gz"; - # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: - # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/24128c3052090311688b09a400aa408ba61c6ee5/nixos-mailserver-A-COMMIT-ID.tar.gz" --unpack - sha256 = "1ngil2shzkf61qxiqw11awyl81cr7ks2kv3r3k243zz7v2xakm5c"; - }) - ]; - sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; - # users.users = { - # virtualMail = { - # isSystemUser = true; - # isNormalUser = false; - # group = "virtualMail"; - # }; - # }; - mailserver = { enable = true; enableImap = true; From 69468a53b968609928725659f1210051be22148c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:10:22 +0100 Subject: [PATCH 0963/2308] Add plasma configuration to nix --- flake.nix | 2 + home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 1 + .../plasma-desktop/configuration.nix | 871 ++++++++++++++++++ 3 files changed, 874 insertions(+) create mode 100644 home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix diff --git a/flake.nix b/flake.nix index ec9e477..82960ad 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + plasma-manager.url = "github:pjones/plasma-manager/trunk"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -27,6 +28,7 @@ home-manager, sops-nix, simple-nixos-mailserver, + plasma-manager, ... } @ inputs: let inherit (self) outputs; diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index 6f85def..bf89721 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop/configuration.nix + ./package-configs/plasma-desktop/configuration.nix ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix new file mode 100644 index 0000000..62dafb2 --- /dev/null +++ b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix @@ -0,0 +1,871 @@ +{ + programs.plasma = { + enable = true; + shortcuts = { + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; + "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; + "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; + "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kded5"."Show System Activity" = "Ctrl+Esc"; + "kded5"."display" = ["Display" "Meta+P"]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; + "kmix"."decrease_volume" = "Volume Down"; + "kmix"."increase_microphone_volume" = "Microphone Volume Up"; + "kmix"."increase_volume" = "Volume Up"; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mute" = "Volume Mute"; + "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Log Out" = "Ctrl+Alt+Del"; + "ksmserver"."Log Out Without Confirmation" = [ ]; + "ksmserver"."Reboot Without Confirmation" = [ ]; + "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Decrease Opacity" = [ ]; + "kwin"."Edit Tiles" = "Meta+T"; + "kwin"."Expose" = "Ctrl+F9"; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = [ ]; + "kwin"."Increase Opacity" = [ ]; + "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."MoveMouseToCenter" = "Meta+F6"; + "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = [ ]; + "kwin"."MoveZoomLeft" = [ ]; + "kwin"."MoveZoomRight" = [ ]; + "kwin"."MoveZoomUp" = [ ]; + "kwin"."Overview" = "Meta+W"; + "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Show Desktop" = "Meta+D"; + "kwin"."ShowDesktopGrid" = "Meta+F8"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12"; + "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; + "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; + "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; + "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; + "kwin"."Switch Window Down" = "Meta+Alt+Down"; + "kwin"."Switch Window Left" = "Meta+Alt+Left"; + "kwin"."Switch Window Right" = "Meta+Alt+Right"; + "kwin"."Switch Window Up" = "Meta+Alt+Up"; + "kwin"."Switch to Desktop 1" = "Ctrl+F1"; + "kwin"."Switch to Desktop 10" = [ ]; + "kwin"."Switch to Desktop 11" = [ ]; + "kwin"."Switch to Desktop 12" = [ ]; + "kwin"."Switch to Desktop 13" = [ ]; + "kwin"."Switch to Desktop 14" = [ ]; + "kwin"."Switch to Desktop 15" = [ ]; + "kwin"."Switch to Desktop 16" = [ ]; + "kwin"."Switch to Desktop 17" = [ ]; + "kwin"."Switch to Desktop 18" = [ ]; + "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 2" = "Ctrl+F2"; + "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 3" = "Ctrl+F3"; + "kwin"."Switch to Desktop 4" = "Ctrl+F4"; + "kwin"."Switch to Desktop 5" = [ ]; + "kwin"."Switch to Desktop 6" = [ ]; + "kwin"."Switch to Desktop 7" = [ ]; + "kwin"."Switch to Desktop 8" = [ ]; + "kwin"."Switch to Desktop 9" = [ ]; + "kwin"."Switch to Next Desktop" = [ ]; + "kwin"."Switch to Next Screen" = [ ]; + "kwin"."Switch to Previous Desktop" = [ ]; + "kwin"."Switch to Previous Screen" = [ ]; + "kwin"."Switch to Screen 0" = [ ]; + "kwin"."Switch to Screen 1" = [ ]; + "kwin"."Switch to Screen 2" = [ ]; + "kwin"."Switch to Screen 3" = [ ]; + "kwin"."Switch to Screen 4" = [ ]; + "kwin"."Switch to Screen 5" = [ ]; + "kwin"."Switch to Screen 6" = [ ]; + "kwin"."Switch to Screen 7" = [ ]; + "kwin"."Switch to Screen Above" = [ ]; + "kwin"."Switch to Screen Below" = [ ]; + "kwin"."Switch to Screen to the Left" = [ ]; + "kwin"."Switch to Screen to the Right" = [ ]; + "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Window Raise/Lower" = [ ]; + "kwin"."Walk Through Desktop List" = [ ]; + "kwin"."Walk Through Desktop List (Reverse)" = [ ]; + "kwin"."Walk Through Desktops" = [ ]; + "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Walk Through Windows" = "Alt+Tab"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; + "kwin"."Walk Through Windows Alternative" = [ ]; + "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; + "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; + "kwin"."Window Above Other Windows" = [ ]; + "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Window Close" = "Alt+F4"; + "kwin"."Window Fullscreen" = [ ]; + "kwin"."Window Grow Horizontal" = [ ]; + "kwin"."Window Grow Vertical" = [ ]; + "kwin"."Window Lower" = [ ]; + "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = [ ]; + "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = [ ]; + "kwin"."Window Move Center" = [ ]; + "kwin"."Window No Border" = [ ]; + "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; + "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; + "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; + "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = [ ]; + "kwin"."Window One Screen Up" = [ ]; + "kwin"."Window One Screen to the Left" = [ ]; + "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window Operations Menu" = "Alt+F3"; + "kwin"."Window Pack Down" = [ ]; + "kwin"."Window Pack Left" = [ ]; + "kwin"."Window Pack Right" = [ ]; + "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Quick Tile Bottom" = "Meta+Down"; + "kwin"."Window Quick Tile Bottom Left" = [ ]; + "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Left" = "Meta+Left"; + "kwin"."Window Quick Tile Right" = "Meta+Right"; + "kwin"."Window Quick Tile Top" = "Meta+Up"; + "kwin"."Window Quick Tile Top Left" = [ ]; + "kwin"."Window Quick Tile Top Right" = [ ]; + "kwin"."Window Raise" = [ ]; + "kwin"."Window Resize" = [ ]; + "kwin"."Window Shade" = [ ]; + "kwin"."Window Shrink Horizontal" = [ ]; + "kwin"."Window Shrink Vertical" = [ ]; + "kwin"."Window to Desktop 1" = [ ]; + "kwin"."Window to Desktop 10" = [ ]; + "kwin"."Window to Desktop 11" = [ ]; + "kwin"."Window to Desktop 12" = [ ]; + "kwin"."Window to Desktop 13" = [ ]; + "kwin"."Window to Desktop 14" = [ ]; + "kwin"."Window to Desktop 15" = [ ]; + "kwin"."Window to Desktop 16" = [ ]; + "kwin"."Window to Desktop 17" = [ ]; + "kwin"."Window to Desktop 18" = [ ]; + "kwin"."Window to Desktop 19" = [ ]; + "kwin"."Window to Desktop 2" = [ ]; + "kwin"."Window to Desktop 20" = [ ]; + "kwin"."Window to Desktop 3" = [ ]; + "kwin"."Window to Desktop 4" = [ ]; + "kwin"."Window to Desktop 5" = [ ]; + "kwin"."Window to Desktop 6" = [ ]; + "kwin"."Window to Desktop 7" = [ ]; + "kwin"."Window to Desktop 8" = [ ]; + "kwin"."Window to Desktop 9" = [ ]; + "kwin"."Window to Next Desktop" = [ ]; + "kwin"."Window to Next Screen" = [ ]; + "kwin"."Window to Previous Desktop" = [ ]; + "kwin"."Window to Previous Screen" = [ ]; + "kwin"."Window to Screen 0" = [ ]; + "kwin"."Window to Screen 1" = [ ]; + "kwin"."Window to Screen 2" = [ ]; + "kwin"."Window to Screen 3" = [ ]; + "kwin"."Window to Screen 4" = [ ]; + "kwin"."Window to Screen 5" = [ ]; + "kwin"."Window to Screen 6" = [ ]; + "kwin"."Window to Screen 7" = [ ]; + "kwin"."view_actual_size" = "Meta+0"; + "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; + "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."nextmedia" = "Media Next"; + "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playpausemedia" = "Media Play"; + "mediacontrol"."previousmedia" = "Media Previous"; + "mediacontrol"."stopmedia" = "Media Stop"; + "org.kde.dolphin.desktop"."_launch" = "Meta+E"; + "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; + "org.kde.konsole.desktop"."NewTab" = [ ]; + "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; + "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; + "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; + "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; + "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "org.kde.spectacle.desktop"."_launch" = "Print"; + "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Hibernate" = "Hibernate"; + "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."PowerDown" = "Power Down"; + "org_kde_powerdevil"."PowerOff" = "Power Off"; + "org_kde_powerdevil"."Sleep" = "Sleep"; + "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; + "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "plasmashell"."activate task manager entry 1" = "Meta+1"; + "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 2" = "Meta+2"; + "plasmashell"."activate task manager entry 3" = "Meta+3"; + "plasmashell"."activate task manager entry 4" = "Meta+4"; + "plasmashell"."activate task manager entry 5" = "Meta+5"; + "plasmashell"."activate task manager entry 6" = "Meta+6"; + "plasmashell"."activate task manager entry 7" = "Meta+7"; + "plasmashell"."activate task manager entry 8" = "Meta+8"; + "plasmashell"."activate task manager entry 9" = "Meta+9"; + "plasmashell"."clear-history" = [ ]; + "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; + "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = [ ]; + "plasmashell"."cyclePrevAction" = [ ]; + "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."manage activities" = "Meta+Q"; + "plasmashell"."next activity" = "Meta+Tab"; + "plasmashell"."previous activity" = "Meta+Shift+Tab"; + "plasmashell"."repeat_action" = "Meta+Ctrl+R"; + "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-on-mouse-pos" = "Meta+V"; + "plasmashell"."stop current activity" = "Meta+S"; + "plasmashell"."switch to next activity" = [ ]; + "plasmashell"."switch to previous activity" = [ ]; + "plasmashell"."toggle do not disturb" = [ ]; + "systemsettings.desktop"."_launch" = "Tools"; + "systemsettings.desktop"."kcm-kscreen" = [ ]; + "systemsettings.desktop"."kcm-lookandfeel" = [ ]; + "systemsettings.desktop"."kcm-users" = [ ]; + "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; + "systemsettings.desktop"."screenlocker" = [ ]; + }; + configFile = { + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 8; + "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; + "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; + "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "844,598"; + "kdeglobals"."General"."BrowserApplication" = "librewolf.desktop"; + "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; + "kdeglobals"."KDE"."SingleClick" = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Preview" = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Name"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; + "kdeglobals"."WM"."activeBackground" = "49,54,59"; + "kdeglobals"."WM"."activeBlend" = "252,252,252"; + "kdeglobals"."WM"."activeForeground" = "252,252,252"; + "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; + "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; + "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; + "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; + "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; + "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; + "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; + "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; + "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; + "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; + "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; + "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; + "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; + "kglobalshortcutsrc"."org.kde.kcalc.desktop"."_k_friendly_name" = "KCalc"; + "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; + "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; + "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Emoji Selector"; + "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Power Management"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; + "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "System Settings"; + "khotkeysrc"."Data"."DataCount" = 3; + "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; + "khotkeysrc"."Data_1"."DataCount" = 1; + "khotkeysrc"."Data_1"."Enabled" = true; + "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; + "khotkeysrc"."Data_1"."SystemGroup" = 1; + "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1"."Comment" = "Comment"; + "khotkeysrc"."Data_1_1"."Enabled" = true; + "khotkeysrc"."Data_1_1"."Name" = "Search"; + "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; + "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; + "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; + "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; + "khotkeysrc"."Data_2"."DataCount" = 8; + "khotkeysrc"."Data_2"."Enabled" = false; + "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; + "khotkeysrc"."Data_2"."Name" = "Examples"; + "khotkeysrc"."Data_2"."SystemGroup" = 0; + "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; + "khotkeysrc"."Data_2_1"."Enabled" = false; + "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; + "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; + "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; + "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; + "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; + "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; + "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; + "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; + "khotkeysrc"."Data_2_2"."Enabled" = false; + "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; + "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; + "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; + "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; + "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; + "khotkeysrc"."Data_2_3"."Enabled" = false; + "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; + "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; + "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; + "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; + "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; + "khotkeysrc"."Data_2_4"."Enabled" = false; + "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; + "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; + "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; + "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; + "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; + "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; + "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; + "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; + "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; + "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; + "khotkeysrc"."Data_2_5"."Enabled" = false; + "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; + "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; + "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; + "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; + "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; + "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; + "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; + "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; + "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; + "khotkeysrc"."Data_2_6"."Enabled" = false; + "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; + "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; + "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; + "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; + "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; + "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; + "khotkeysrc"."Data_2_7"."DataCount" = 4; + "khotkeysrc"."Data_2_7"."Enabled" = false; + "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; + "khotkeysrc"."Data_2_7"."SystemGroup" = 0; + "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_7_1"."Comment" = ""; + "khotkeysrc"."Data_2_7_1"."Enabled" = false; + "khotkeysrc"."Data_2_7_1"."Name" = "Back"; + "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2"."Comment" = ""; + "khotkeysrc"."Data_2_7_2"."Enabled" = false; + "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; + "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3"."Comment" = ""; + "khotkeysrc"."Data_2_7_3"."Enabled" = false; + "khotkeysrc"."Data_2_7_3"."Name" = "Up"; + "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4"."Comment" = ""; + "khotkeysrc"."Data_2_7_4"."Enabled" = false; + "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; + "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; + "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; + "khotkeysrc"."Data_2_8"."Enabled" = false; + "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; + "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; + "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; + "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; + "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; + "khotkeysrc"."Data_3"."DataCount" = 14; + "khotkeysrc"."Data_3"."Enabled" = true; + "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; + "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; + "khotkeysrc"."Data_3"."SystemGroup" = 0; + "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; + "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; + "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; + "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; + "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; + "khotkeysrc"."Data_3_1"."Enabled" = true; + "khotkeysrc"."Data_3_1"."Name" = "Back"; + "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; + "khotkeysrc"."Data_3_10"."Enabled" = false; + "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; + "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; + "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; + "khotkeysrc"."Data_3_11"."Enabled" = true; + "khotkeysrc"."Data_3_11"."Name" = "Up"; + "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; + "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; + "khotkeysrc"."Data_3_12"."Enabled" = false; + "khotkeysrc"."Data_3_12"."Name" = "Up #2"; + "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; + "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; + "khotkeysrc"."Data_3_13"."Enabled" = true; + "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; + "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; + "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; + "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; + "khotkeysrc"."Data_3_14"."Enabled" = true; + "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; + "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; + "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; + "khotkeysrc"."Data_3_2"."Enabled" = true; + "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; + "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; + "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; + "khotkeysrc"."Data_3_3"."Enabled" = true; + "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; + "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; + "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; + "khotkeysrc"."Data_3_4"."Enabled" = true; + "khotkeysrc"."Data_3_4"."Name" = "Forward"; + "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; + "khotkeysrc"."Data_3_5"."Enabled" = true; + "khotkeysrc"."Data_3_5"."Name" = "Home"; + "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; + "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; + "khotkeysrc"."Data_3_6"."Enabled" = true; + "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; + "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; + "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; + "khotkeysrc"."Data_3_7"."Enabled" = true; + "khotkeysrc"."Data_3_7"."Name" = "New Tab"; + "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; + "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; + "khotkeysrc"."Data_3_8"."Enabled" = true; + "khotkeysrc"."Data_3_8"."Name" = "New Window"; + "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; + "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; + "khotkeysrc"."Data_3_9"."Enabled" = true; + "khotkeysrc"."Data_3_9"."Name" = "Reload"; + "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; + "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."DirSelect Dialog"."DirSelectDialog Size[$d]" = ""; + "khotkeysrc"."General"."BrowserApplication[$d]" = ""; + "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; + "khotkeysrc"."General"."ColorScheme[$d]" = ""; + "khotkeysrc"."Gestures"."Disabled" = true; + "khotkeysrc"."Gestures"."MouseButton" = 2; + "khotkeysrc"."Gestures"."Timeout" = 300; + "khotkeysrc"."GesturesExclude"."Comment" = ""; + "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; + "khotkeysrc"."Icons"."Theme[$d]" = ""; + "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; + "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; + "khotkeysrc"."KDE"."SingleClick[$d]" = ""; + "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; + "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; + "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."Voice"."Shortcut" = ""; + "khotkeysrc"."WM"."activeBackground[$d]" = ""; + "khotkeysrc"."WM"."activeBlend[$d]" = ""; + "khotkeysrc"."WM"."activeForeground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; + "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; + "kiorc"."Confirmations"."ConfirmDelete" = true; + "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; + "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; + "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; + "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; + "kwinrc"."Desktops"."Number" = 4; + "kwinrc"."Desktops"."Rows" = 2; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; + "kwinrc"."NightColor"."LongitudeFixed" = 5.44; + "kwinrc"."NightColor"."Mode" = "Location"; + "kwinrc"."NightColor"."NightTemperature" = 1200; + "kwinrc"."Plugins"."wobblywindowsEnabled" = true; + "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling.250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Xwayland"."Scale" = 1; + "kxkbrc"."Layout"."Options" = "compose:caps"; + "kxkbrc"."Layout"."ResetOldOptions" = true; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "en_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; + }; + }; +} From 66f7f178eb1392a6f87507d17cab88a1f86ef48f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:10:22 +0100 Subject: [PATCH 0964/2308] Add plasma configuration to nix --- flake.nix | 2 + home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 1 + .../plasma-desktop/configuration.nix | 871 ++++++++++++++++++ 3 files changed, 874 insertions(+) create mode 100644 home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix diff --git a/flake.nix b/flake.nix index ec9e477..82960ad 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + plasma-manager.url = "github:pjones/plasma-manager/trunk"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -27,6 +28,7 @@ home-manager, sops-nix, simple-nixos-mailserver, + plasma-manager, ... } @ inputs: let inherit (self) outputs; diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index 6f85def..bf89721 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop/configuration.nix + ./package-configs/plasma-desktop/configuration.nix ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix new file mode 100644 index 0000000..62dafb2 --- /dev/null +++ b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix @@ -0,0 +1,871 @@ +{ + programs.plasma = { + enable = true; + shortcuts = { + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; + "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; + "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; + "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kded5"."Show System Activity" = "Ctrl+Esc"; + "kded5"."display" = ["Display" "Meta+P"]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; + "kmix"."decrease_volume" = "Volume Down"; + "kmix"."increase_microphone_volume" = "Microphone Volume Up"; + "kmix"."increase_volume" = "Volume Up"; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mute" = "Volume Mute"; + "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Log Out" = "Ctrl+Alt+Del"; + "ksmserver"."Log Out Without Confirmation" = [ ]; + "ksmserver"."Reboot Without Confirmation" = [ ]; + "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Decrease Opacity" = [ ]; + "kwin"."Edit Tiles" = "Meta+T"; + "kwin"."Expose" = "Ctrl+F9"; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = [ ]; + "kwin"."Increase Opacity" = [ ]; + "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."MoveMouseToCenter" = "Meta+F6"; + "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = [ ]; + "kwin"."MoveZoomLeft" = [ ]; + "kwin"."MoveZoomRight" = [ ]; + "kwin"."MoveZoomUp" = [ ]; + "kwin"."Overview" = "Meta+W"; + "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Show Desktop" = "Meta+D"; + "kwin"."ShowDesktopGrid" = "Meta+F8"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12"; + "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; + "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; + "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; + "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; + "kwin"."Switch Window Down" = "Meta+Alt+Down"; + "kwin"."Switch Window Left" = "Meta+Alt+Left"; + "kwin"."Switch Window Right" = "Meta+Alt+Right"; + "kwin"."Switch Window Up" = "Meta+Alt+Up"; + "kwin"."Switch to Desktop 1" = "Ctrl+F1"; + "kwin"."Switch to Desktop 10" = [ ]; + "kwin"."Switch to Desktop 11" = [ ]; + "kwin"."Switch to Desktop 12" = [ ]; + "kwin"."Switch to Desktop 13" = [ ]; + "kwin"."Switch to Desktop 14" = [ ]; + "kwin"."Switch to Desktop 15" = [ ]; + "kwin"."Switch to Desktop 16" = [ ]; + "kwin"."Switch to Desktop 17" = [ ]; + "kwin"."Switch to Desktop 18" = [ ]; + "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 2" = "Ctrl+F2"; + "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 3" = "Ctrl+F3"; + "kwin"."Switch to Desktop 4" = "Ctrl+F4"; + "kwin"."Switch to Desktop 5" = [ ]; + "kwin"."Switch to Desktop 6" = [ ]; + "kwin"."Switch to Desktop 7" = [ ]; + "kwin"."Switch to Desktop 8" = [ ]; + "kwin"."Switch to Desktop 9" = [ ]; + "kwin"."Switch to Next Desktop" = [ ]; + "kwin"."Switch to Next Screen" = [ ]; + "kwin"."Switch to Previous Desktop" = [ ]; + "kwin"."Switch to Previous Screen" = [ ]; + "kwin"."Switch to Screen 0" = [ ]; + "kwin"."Switch to Screen 1" = [ ]; + "kwin"."Switch to Screen 2" = [ ]; + "kwin"."Switch to Screen 3" = [ ]; + "kwin"."Switch to Screen 4" = [ ]; + "kwin"."Switch to Screen 5" = [ ]; + "kwin"."Switch to Screen 6" = [ ]; + "kwin"."Switch to Screen 7" = [ ]; + "kwin"."Switch to Screen Above" = [ ]; + "kwin"."Switch to Screen Below" = [ ]; + "kwin"."Switch to Screen to the Left" = [ ]; + "kwin"."Switch to Screen to the Right" = [ ]; + "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Window Raise/Lower" = [ ]; + "kwin"."Walk Through Desktop List" = [ ]; + "kwin"."Walk Through Desktop List (Reverse)" = [ ]; + "kwin"."Walk Through Desktops" = [ ]; + "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Walk Through Windows" = "Alt+Tab"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; + "kwin"."Walk Through Windows Alternative" = [ ]; + "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; + "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; + "kwin"."Window Above Other Windows" = [ ]; + "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Window Close" = "Alt+F4"; + "kwin"."Window Fullscreen" = [ ]; + "kwin"."Window Grow Horizontal" = [ ]; + "kwin"."Window Grow Vertical" = [ ]; + "kwin"."Window Lower" = [ ]; + "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = [ ]; + "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = [ ]; + "kwin"."Window Move Center" = [ ]; + "kwin"."Window No Border" = [ ]; + "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; + "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; + "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; + "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = [ ]; + "kwin"."Window One Screen Up" = [ ]; + "kwin"."Window One Screen to the Left" = [ ]; + "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window Operations Menu" = "Alt+F3"; + "kwin"."Window Pack Down" = [ ]; + "kwin"."Window Pack Left" = [ ]; + "kwin"."Window Pack Right" = [ ]; + "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Quick Tile Bottom" = "Meta+Down"; + "kwin"."Window Quick Tile Bottom Left" = [ ]; + "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Left" = "Meta+Left"; + "kwin"."Window Quick Tile Right" = "Meta+Right"; + "kwin"."Window Quick Tile Top" = "Meta+Up"; + "kwin"."Window Quick Tile Top Left" = [ ]; + "kwin"."Window Quick Tile Top Right" = [ ]; + "kwin"."Window Raise" = [ ]; + "kwin"."Window Resize" = [ ]; + "kwin"."Window Shade" = [ ]; + "kwin"."Window Shrink Horizontal" = [ ]; + "kwin"."Window Shrink Vertical" = [ ]; + "kwin"."Window to Desktop 1" = [ ]; + "kwin"."Window to Desktop 10" = [ ]; + "kwin"."Window to Desktop 11" = [ ]; + "kwin"."Window to Desktop 12" = [ ]; + "kwin"."Window to Desktop 13" = [ ]; + "kwin"."Window to Desktop 14" = [ ]; + "kwin"."Window to Desktop 15" = [ ]; + "kwin"."Window to Desktop 16" = [ ]; + "kwin"."Window to Desktop 17" = [ ]; + "kwin"."Window to Desktop 18" = [ ]; + "kwin"."Window to Desktop 19" = [ ]; + "kwin"."Window to Desktop 2" = [ ]; + "kwin"."Window to Desktop 20" = [ ]; + "kwin"."Window to Desktop 3" = [ ]; + "kwin"."Window to Desktop 4" = [ ]; + "kwin"."Window to Desktop 5" = [ ]; + "kwin"."Window to Desktop 6" = [ ]; + "kwin"."Window to Desktop 7" = [ ]; + "kwin"."Window to Desktop 8" = [ ]; + "kwin"."Window to Desktop 9" = [ ]; + "kwin"."Window to Next Desktop" = [ ]; + "kwin"."Window to Next Screen" = [ ]; + "kwin"."Window to Previous Desktop" = [ ]; + "kwin"."Window to Previous Screen" = [ ]; + "kwin"."Window to Screen 0" = [ ]; + "kwin"."Window to Screen 1" = [ ]; + "kwin"."Window to Screen 2" = [ ]; + "kwin"."Window to Screen 3" = [ ]; + "kwin"."Window to Screen 4" = [ ]; + "kwin"."Window to Screen 5" = [ ]; + "kwin"."Window to Screen 6" = [ ]; + "kwin"."Window to Screen 7" = [ ]; + "kwin"."view_actual_size" = "Meta+0"; + "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; + "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."nextmedia" = "Media Next"; + "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playpausemedia" = "Media Play"; + "mediacontrol"."previousmedia" = "Media Previous"; + "mediacontrol"."stopmedia" = "Media Stop"; + "org.kde.dolphin.desktop"."_launch" = "Meta+E"; + "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; + "org.kde.konsole.desktop"."NewTab" = [ ]; + "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; + "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; + "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; + "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; + "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "org.kde.spectacle.desktop"."_launch" = "Print"; + "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Hibernate" = "Hibernate"; + "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."PowerDown" = "Power Down"; + "org_kde_powerdevil"."PowerOff" = "Power Off"; + "org_kde_powerdevil"."Sleep" = "Sleep"; + "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; + "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "plasmashell"."activate task manager entry 1" = "Meta+1"; + "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 2" = "Meta+2"; + "plasmashell"."activate task manager entry 3" = "Meta+3"; + "plasmashell"."activate task manager entry 4" = "Meta+4"; + "plasmashell"."activate task manager entry 5" = "Meta+5"; + "plasmashell"."activate task manager entry 6" = "Meta+6"; + "plasmashell"."activate task manager entry 7" = "Meta+7"; + "plasmashell"."activate task manager entry 8" = "Meta+8"; + "plasmashell"."activate task manager entry 9" = "Meta+9"; + "plasmashell"."clear-history" = [ ]; + "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; + "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = [ ]; + "plasmashell"."cyclePrevAction" = [ ]; + "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."manage activities" = "Meta+Q"; + "plasmashell"."next activity" = "Meta+Tab"; + "plasmashell"."previous activity" = "Meta+Shift+Tab"; + "plasmashell"."repeat_action" = "Meta+Ctrl+R"; + "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-on-mouse-pos" = "Meta+V"; + "plasmashell"."stop current activity" = "Meta+S"; + "plasmashell"."switch to next activity" = [ ]; + "plasmashell"."switch to previous activity" = [ ]; + "plasmashell"."toggle do not disturb" = [ ]; + "systemsettings.desktop"."_launch" = "Tools"; + "systemsettings.desktop"."kcm-kscreen" = [ ]; + "systemsettings.desktop"."kcm-lookandfeel" = [ ]; + "systemsettings.desktop"."kcm-users" = [ ]; + "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; + "systemsettings.desktop"."screenlocker" = [ ]; + }; + configFile = { + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 8; + "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; + "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; + "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "844,598"; + "kdeglobals"."General"."BrowserApplication" = "librewolf.desktop"; + "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; + "kdeglobals"."KDE"."SingleClick" = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Preview" = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Name"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; + "kdeglobals"."WM"."activeBackground" = "49,54,59"; + "kdeglobals"."WM"."activeBlend" = "252,252,252"; + "kdeglobals"."WM"."activeForeground" = "252,252,252"; + "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; + "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; + "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; + "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; + "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; + "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; + "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; + "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; + "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; + "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; + "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; + "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; + "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; + "kglobalshortcutsrc"."org.kde.kcalc.desktop"."_k_friendly_name" = "KCalc"; + "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; + "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; + "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Emoji Selector"; + "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Power Management"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; + "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "System Settings"; + "khotkeysrc"."Data"."DataCount" = 3; + "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; + "khotkeysrc"."Data_1"."DataCount" = 1; + "khotkeysrc"."Data_1"."Enabled" = true; + "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; + "khotkeysrc"."Data_1"."SystemGroup" = 1; + "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1"."Comment" = "Comment"; + "khotkeysrc"."Data_1_1"."Enabled" = true; + "khotkeysrc"."Data_1_1"."Name" = "Search"; + "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; + "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; + "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; + "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; + "khotkeysrc"."Data_2"."DataCount" = 8; + "khotkeysrc"."Data_2"."Enabled" = false; + "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; + "khotkeysrc"."Data_2"."Name" = "Examples"; + "khotkeysrc"."Data_2"."SystemGroup" = 0; + "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; + "khotkeysrc"."Data_2_1"."Enabled" = false; + "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; + "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; + "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; + "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; + "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; + "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; + "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; + "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; + "khotkeysrc"."Data_2_2"."Enabled" = false; + "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; + "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; + "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; + "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; + "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; + "khotkeysrc"."Data_2_3"."Enabled" = false; + "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; + "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; + "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; + "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; + "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; + "khotkeysrc"."Data_2_4"."Enabled" = false; + "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; + "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; + "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; + "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; + "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; + "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; + "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; + "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; + "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; + "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; + "khotkeysrc"."Data_2_5"."Enabled" = false; + "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; + "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; + "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; + "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; + "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; + "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; + "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; + "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; + "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; + "khotkeysrc"."Data_2_6"."Enabled" = false; + "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; + "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; + "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; + "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; + "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; + "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; + "khotkeysrc"."Data_2_7"."DataCount" = 4; + "khotkeysrc"."Data_2_7"."Enabled" = false; + "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; + "khotkeysrc"."Data_2_7"."SystemGroup" = 0; + "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_7_1"."Comment" = ""; + "khotkeysrc"."Data_2_7_1"."Enabled" = false; + "khotkeysrc"."Data_2_7_1"."Name" = "Back"; + "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2"."Comment" = ""; + "khotkeysrc"."Data_2_7_2"."Enabled" = false; + "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; + "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3"."Comment" = ""; + "khotkeysrc"."Data_2_7_3"."Enabled" = false; + "khotkeysrc"."Data_2_7_3"."Name" = "Up"; + "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4"."Comment" = ""; + "khotkeysrc"."Data_2_7_4"."Enabled" = false; + "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; + "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; + "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; + "khotkeysrc"."Data_2_8"."Enabled" = false; + "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; + "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; + "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; + "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; + "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; + "khotkeysrc"."Data_3"."DataCount" = 14; + "khotkeysrc"."Data_3"."Enabled" = true; + "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; + "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; + "khotkeysrc"."Data_3"."SystemGroup" = 0; + "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; + "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; + "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; + "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; + "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; + "khotkeysrc"."Data_3_1"."Enabled" = true; + "khotkeysrc"."Data_3_1"."Name" = "Back"; + "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; + "khotkeysrc"."Data_3_10"."Enabled" = false; + "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; + "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; + "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; + "khotkeysrc"."Data_3_11"."Enabled" = true; + "khotkeysrc"."Data_3_11"."Name" = "Up"; + "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; + "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; + "khotkeysrc"."Data_3_12"."Enabled" = false; + "khotkeysrc"."Data_3_12"."Name" = "Up #2"; + "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; + "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; + "khotkeysrc"."Data_3_13"."Enabled" = true; + "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; + "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; + "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; + "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; + "khotkeysrc"."Data_3_14"."Enabled" = true; + "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; + "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; + "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; + "khotkeysrc"."Data_3_2"."Enabled" = true; + "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; + "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; + "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; + "khotkeysrc"."Data_3_3"."Enabled" = true; + "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; + "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; + "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; + "khotkeysrc"."Data_3_4"."Enabled" = true; + "khotkeysrc"."Data_3_4"."Name" = "Forward"; + "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; + "khotkeysrc"."Data_3_5"."Enabled" = true; + "khotkeysrc"."Data_3_5"."Name" = "Home"; + "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; + "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; + "khotkeysrc"."Data_3_6"."Enabled" = true; + "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; + "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; + "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; + "khotkeysrc"."Data_3_7"."Enabled" = true; + "khotkeysrc"."Data_3_7"."Name" = "New Tab"; + "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; + "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; + "khotkeysrc"."Data_3_8"."Enabled" = true; + "khotkeysrc"."Data_3_8"."Name" = "New Window"; + "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; + "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; + "khotkeysrc"."Data_3_9"."Enabled" = true; + "khotkeysrc"."Data_3_9"."Name" = "Reload"; + "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; + "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."DirSelect Dialog"."DirSelectDialog Size[$d]" = ""; + "khotkeysrc"."General"."BrowserApplication[$d]" = ""; + "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; + "khotkeysrc"."General"."ColorScheme[$d]" = ""; + "khotkeysrc"."Gestures"."Disabled" = true; + "khotkeysrc"."Gestures"."MouseButton" = 2; + "khotkeysrc"."Gestures"."Timeout" = 300; + "khotkeysrc"."GesturesExclude"."Comment" = ""; + "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; + "khotkeysrc"."Icons"."Theme[$d]" = ""; + "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; + "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; + "khotkeysrc"."KDE"."SingleClick[$d]" = ""; + "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; + "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; + "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."Voice"."Shortcut" = ""; + "khotkeysrc"."WM"."activeBackground[$d]" = ""; + "khotkeysrc"."WM"."activeBlend[$d]" = ""; + "khotkeysrc"."WM"."activeForeground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; + "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; + "kiorc"."Confirmations"."ConfirmDelete" = true; + "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; + "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; + "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; + "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; + "kwinrc"."Desktops"."Number" = 4; + "kwinrc"."Desktops"."Rows" = 2; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; + "kwinrc"."NightColor"."LongitudeFixed" = 5.44; + "kwinrc"."NightColor"."Mode" = "Location"; + "kwinrc"."NightColor"."NightTemperature" = 1200; + "kwinrc"."Plugins"."wobblywindowsEnabled" = true; + "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling.250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Xwayland"."Scale" = 1; + "kxkbrc"."Layout"."Options" = "compose:caps"; + "kxkbrc"."Layout"."ResetOldOptions" = true; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "en_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; + }; + }; +} From e1771f37f5f1fa9a0e1ae152d703c276d43dbb35 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:17:39 +0100 Subject: [PATCH 0965/2308] Need to import it correctly --- flake.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 82960ad..ee10fa6 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,9 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; - plasma-manager.url = "github:pjones/plasma-manager/trunk"; + plasma-manager.url = "github:pjones/plasma-manager"; + plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; + plasma-manager.inputs.home-manager.follows = "home-manager"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -55,6 +57,7 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops + plasma-manager.homeManagerModules.plasma-manager ]; }; }; From f0ba13426deda21e96fc56d31999ce18cf1d40c0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:17:39 +0100 Subject: [PATCH 0966/2308] Need to import it correctly --- flake.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 82960ad..ee10fa6 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,9 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; - plasma-manager.url = "github:pjones/plasma-manager/trunk"; + plasma-manager.url = "github:pjones/plasma-manager"; + plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; + plasma-manager.inputs.home-manager.follows = "home-manager"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -55,6 +57,7 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops + plasma-manager.homeManagerModules.plasma-manager ]; }; }; From 7d642b9f43886387175e239e099d3fe26a010b7b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:18:29 +0100 Subject: [PATCH 0967/2308] Update flake lock --- flake.lock | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/flake.lock b/flake.lock index 9770d24..b3dc17e 100644 --- a/flake.lock +++ b/flake.lock @@ -270,6 +270,29 @@ "type": "github" } }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704927112, + "narHash": "sha256-AKTE0TczctkgAj3FGnslPrDZP0A9FDlRITv+aV2Agsg=", + "owner": "pjones", + "repo": "plasma-manager", + "rev": "06ad8e693009a64b58156b8b55e347defe759970", + "type": "github" + }, + "original": { + "owner": "pjones", + "repo": "plasma-manager", + "type": "github" + } + }, "root": { "inputs": { "extest": "extest", @@ -277,6 +300,7 @@ "jovian": "jovian", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" } From ce98cb0f4acc979f752d8bf6fcc9ec47ea27031f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:18:29 +0100 Subject: [PATCH 0968/2308] Update flake lock --- flake.lock | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/flake.lock b/flake.lock index 9770d24..b3dc17e 100644 --- a/flake.lock +++ b/flake.lock @@ -270,6 +270,29 @@ "type": "github" } }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704927112, + "narHash": "sha256-AKTE0TczctkgAj3FGnslPrDZP0A9FDlRITv+aV2Agsg=", + "owner": "pjones", + "repo": "plasma-manager", + "rev": "06ad8e693009a64b58156b8b55e347defe759970", + "type": "github" + }, + "original": { + "owner": "pjones", + "repo": "plasma-manager", + "type": "github" + } + }, "root": { "inputs": { "extest": "extest", @@ -277,6 +300,7 @@ "jovian": "jovian", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" } From 069c1b36ccbaad86c2b729ce999a4d5e975b4c6a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:46:19 +0100 Subject: [PATCH 0969/2308] Fix wheatley flake (d'oh), and some plasma mananger experiments --- flake.nix | 8 +- .../plasma-desktop/configuration.nix | 871 ++++++++++++++++++ 2 files changed, 878 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index ee10fa6..f83d2cf 100644 --- a/flake.nix +++ b/flake.nix @@ -58,6 +58,12 @@ ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops plasma-manager.homeManagerModules.plasma-manager + home-manager.nixosModules.home-manager + { + home-manager.extraSpecialArgs = {inherit inputs;}; # Pass flake input to home-manager + home-manager.users.USERNAME.imports = [./home-manager/home.nix]; + home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; + } ]; }; }; @@ -92,7 +98,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < - ./nixos/hosts/GLaDOS/configuration.nix + ./nixos/hosts/wheatley/configuration.nix sops-nix.nixosModules.sops ]; }; diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix index 62dafb2..9e6a5f0 100644 --- a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix +++ b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix @@ -869,3 +869,874 @@ }; }; } +{ + programs.plasma = { + enable = true; + shortcuts = { + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; + "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; + "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; + "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kded5"."Show System Activity" = "Ctrl+Esc"; + "kded5"."display" = ["Display" "Meta+P"]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; + "kmix"."decrease_volume" = "Volume Down"; + "kmix"."increase_microphone_volume" = "Microphone Volume Up"; + "kmix"."increase_volume" = "Volume Up"; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mute" = "Volume Mute"; + "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Log Out" = "Ctrl+Alt+Del"; + "ksmserver"."Log Out Without Confirmation" = [ ]; + "ksmserver"."Reboot Without Confirmation" = [ ]; + "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Decrease Opacity" = [ ]; + "kwin"."Edit Tiles" = "Meta+T"; + "kwin"."Expose" = "Ctrl+F9"; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = [ ]; + "kwin"."Increase Opacity" = [ ]; + "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."MoveMouseToCenter" = "Meta+F6"; + "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = [ ]; + "kwin"."MoveZoomLeft" = [ ]; + "kwin"."MoveZoomRight" = [ ]; + "kwin"."MoveZoomUp" = [ ]; + "kwin"."Overview" = "Meta+W"; + "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Show Desktop" = "Meta+D"; + "kwin"."ShowDesktopGrid" = "Meta+F8"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12"; + "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; + "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; + "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; + "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; + "kwin"."Switch Window Down" = "Meta+Alt+Down"; + "kwin"."Switch Window Left" = "Meta+Alt+Left"; + "kwin"."Switch Window Right" = "Meta+Alt+Right"; + "kwin"."Switch Window Up" = "Meta+Alt+Up"; + "kwin"."Switch to Desktop 1" = "Ctrl+F1"; + "kwin"."Switch to Desktop 10" = [ ]; + "kwin"."Switch to Desktop 11" = [ ]; + "kwin"."Switch to Desktop 12" = [ ]; + "kwin"."Switch to Desktop 13" = [ ]; + "kwin"."Switch to Desktop 14" = [ ]; + "kwin"."Switch to Desktop 15" = [ ]; + "kwin"."Switch to Desktop 16" = [ ]; + "kwin"."Switch to Desktop 17" = [ ]; + "kwin"."Switch to Desktop 18" = [ ]; + "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 2" = "Ctrl+F2"; + "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 3" = "Ctrl+F3"; + "kwin"."Switch to Desktop 4" = "Ctrl+F4"; + "kwin"."Switch to Desktop 5" = [ ]; + "kwin"."Switch to Desktop 6" = [ ]; + "kwin"."Switch to Desktop 7" = [ ]; + "kwin"."Switch to Desktop 8" = [ ]; + "kwin"."Switch to Desktop 9" = [ ]; + "kwin"."Switch to Next Desktop" = [ ]; + "kwin"."Switch to Next Screen" = [ ]; + "kwin"."Switch to Previous Desktop" = [ ]; + "kwin"."Switch to Previous Screen" = [ ]; + "kwin"."Switch to Screen 0" = [ ]; + "kwin"."Switch to Screen 1" = [ ]; + "kwin"."Switch to Screen 2" = [ ]; + "kwin"."Switch to Screen 3" = [ ]; + "kwin"."Switch to Screen 4" = [ ]; + "kwin"."Switch to Screen 5" = [ ]; + "kwin"."Switch to Screen 6" = [ ]; + "kwin"."Switch to Screen 7" = [ ]; + "kwin"."Switch to Screen Above" = [ ]; + "kwin"."Switch to Screen Below" = [ ]; + "kwin"."Switch to Screen to the Left" = [ ]; + "kwin"."Switch to Screen to the Right" = [ ]; + "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Window Raise/Lower" = [ ]; + "kwin"."Walk Through Desktop List" = [ ]; + "kwin"."Walk Through Desktop List (Reverse)" = [ ]; + "kwin"."Walk Through Desktops" = [ ]; + "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Walk Through Windows" = "Alt+Tab"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; + "kwin"."Walk Through Windows Alternative" = [ ]; + "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; + "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; + "kwin"."Window Above Other Windows" = [ ]; + "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Window Close" = "Alt+F4"; + "kwin"."Window Fullscreen" = [ ]; + "kwin"."Window Grow Horizontal" = [ ]; + "kwin"."Window Grow Vertical" = [ ]; + "kwin"."Window Lower" = [ ]; + "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = [ ]; + "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = [ ]; + "kwin"."Window Move Center" = [ ]; + "kwin"."Window No Border" = [ ]; + "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; + "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; + "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; + "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = [ ]; + "kwin"."Window One Screen Up" = [ ]; + "kwin"."Window One Screen to the Left" = [ ]; + "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window Operations Menu" = "Alt+F3"; + "kwin"."Window Pack Down" = [ ]; + "kwin"."Window Pack Left" = [ ]; + "kwin"."Window Pack Right" = [ ]; + "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Quick Tile Bottom" = "Meta+Down"; + "kwin"."Window Quick Tile Bottom Left" = [ ]; + "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Left" = "Meta+Left"; + "kwin"."Window Quick Tile Right" = "Meta+Right"; + "kwin"."Window Quick Tile Top" = "Meta+Up"; + "kwin"."Window Quick Tile Top Left" = [ ]; + "kwin"."Window Quick Tile Top Right" = [ ]; + "kwin"."Window Raise" = [ ]; + "kwin"."Window Resize" = [ ]; + "kwin"."Window Shade" = [ ]; + "kwin"."Window Shrink Horizontal" = [ ]; + "kwin"."Window Shrink Vertical" = [ ]; + "kwin"."Window to Desktop 1" = [ ]; + "kwin"."Window to Desktop 10" = [ ]; + "kwin"."Window to Desktop 11" = [ ]; + "kwin"."Window to Desktop 12" = [ ]; + "kwin"."Window to Desktop 13" = [ ]; + "kwin"."Window to Desktop 14" = [ ]; + "kwin"."Window to Desktop 15" = [ ]; + "kwin"."Window to Desktop 16" = [ ]; + "kwin"."Window to Desktop 17" = [ ]; + "kwin"."Window to Desktop 18" = [ ]; + "kwin"."Window to Desktop 19" = [ ]; + "kwin"."Window to Desktop 2" = [ ]; + "kwin"."Window to Desktop 20" = [ ]; + "kwin"."Window to Desktop 3" = [ ]; + "kwin"."Window to Desktop 4" = [ ]; + "kwin"."Window to Desktop 5" = [ ]; + "kwin"."Window to Desktop 6" = [ ]; + "kwin"."Window to Desktop 7" = [ ]; + "kwin"."Window to Desktop 8" = [ ]; + "kwin"."Window to Desktop 9" = [ ]; + "kwin"."Window to Next Desktop" = [ ]; + "kwin"."Window to Next Screen" = [ ]; + "kwin"."Window to Previous Desktop" = [ ]; + "kwin"."Window to Previous Screen" = [ ]; + "kwin"."Window to Screen 0" = [ ]; + "kwin"."Window to Screen 1" = [ ]; + "kwin"."Window to Screen 2" = [ ]; + "kwin"."Window to Screen 3" = [ ]; + "kwin"."Window to Screen 4" = [ ]; + "kwin"."Window to Screen 5" = [ ]; + "kwin"."Window to Screen 6" = [ ]; + "kwin"."Window to Screen 7" = [ ]; + "kwin"."view_actual_size" = "Meta+0"; + "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; + "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."nextmedia" = "Media Next"; + "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playpausemedia" = "Media Play"; + "mediacontrol"."previousmedia" = "Media Previous"; + "mediacontrol"."stopmedia" = "Media Stop"; + "org.kde.dolphin.desktop"."_launch" = "Meta+E"; + "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; + "org.kde.konsole.desktop"."NewTab" = [ ]; + "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; + "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; + "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; + "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; + "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "org.kde.spectacle.desktop"."_launch" = "Print"; + "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Hibernate" = "Hibernate"; + "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."PowerDown" = "Power Down"; + "org_kde_powerdevil"."PowerOff" = "Power Off"; + "org_kde_powerdevil"."Sleep" = "Sleep"; + "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; + "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "plasmashell"."activate task manager entry 1" = "Meta+1"; + "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 2" = "Meta+2"; + "plasmashell"."activate task manager entry 3" = "Meta+3"; + "plasmashell"."activate task manager entry 4" = "Meta+4"; + "plasmashell"."activate task manager entry 5" = "Meta+5"; + "plasmashell"."activate task manager entry 6" = "Meta+6"; + "plasmashell"."activate task manager entry 7" = "Meta+7"; + "plasmashell"."activate task manager entry 8" = "Meta+8"; + "plasmashell"."activate task manager entry 9" = "Meta+9"; + "plasmashell"."clear-history" = [ ]; + "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; + "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = [ ]; + "plasmashell"."cyclePrevAction" = [ ]; + "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."manage activities" = "Meta+Q"; + "plasmashell"."next activity" = "Meta+Tab"; + "plasmashell"."previous activity" = "Meta+Shift+Tab"; + "plasmashell"."repeat_action" = "Meta+Ctrl+R"; + "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-on-mouse-pos" = "Meta+V"; + "plasmashell"."stop current activity" = "Meta+S"; + "plasmashell"."switch to next activity" = [ ]; + "plasmashell"."switch to previous activity" = [ ]; + "plasmashell"."toggle do not disturb" = [ ]; + "systemsettings.desktop"."_launch" = "Tools"; + "systemsettings.desktop"."kcm-kscreen" = [ ]; + "systemsettings.desktop"."kcm-lookandfeel" = [ ]; + "systemsettings.desktop"."kcm-users" = [ ]; + "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; + "systemsettings.desktop"."screenlocker" = [ ]; + }; + configFile = { + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 8; + "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; + "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; + "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "844,598"; + "kdeglobals"."General"."BrowserApplication" = "librewolf.desktop"; + "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; + "kdeglobals"."KDE"."SingleClick" = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Preview" = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Name"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; + "kdeglobals"."WM"."activeBackground" = "49,54,59"; + "kdeglobals"."WM"."activeBlend" = "252,252,252"; + "kdeglobals"."WM"."activeForeground" = "252,252,252"; + "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; + "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; + "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; + "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; + "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; + "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; + "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; + "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; + "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; + "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; + "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; + "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; + "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; + "kglobalshortcutsrc"."org.kde.kcalc.desktop"."_k_friendly_name" = "KCalc"; + "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; + "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; + "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Emoji Selector"; + "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Power Management"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; + "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "System Settings"; + "khotkeysrc"."Data"."DataCount" = 3; + "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; + "khotkeysrc"."Data_1"."DataCount" = 1; + "khotkeysrc"."Data_1"."Enabled" = true; + "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; + "khotkeysrc"."Data_1"."SystemGroup" = 1; + "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1"."Comment" = "Comment"; + "khotkeysrc"."Data_1_1"."Enabled" = true; + "khotkeysrc"."Data_1_1"."Name" = "Search"; + "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; + "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; + "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; + "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; + "khotkeysrc"."Data_2"."DataCount" = 8; + "khotkeysrc"."Data_2"."Enabled" = false; + "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; + "khotkeysrc"."Data_2"."Name" = "Examples"; + "khotkeysrc"."Data_2"."SystemGroup" = 0; + "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; + "khotkeysrc"."Data_2_1"."Enabled" = false; + "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; + "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; + "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; + "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; + "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; + "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; + "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; + "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; + "khotkeysrc"."Data_2_2"."Enabled" = false; + "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; + "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; + "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; + "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; + "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; + "khotkeysrc"."Data_2_3"."Enabled" = false; + "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; + "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; + "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; + "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; + "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; + "khotkeysrc"."Data_2_4"."Enabled" = false; + "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; + "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; + "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; + "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; + "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; + "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; + "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; + "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; + "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; + "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; + "khotkeysrc"."Data_2_5"."Enabled" = false; + "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; + "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; + "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; + "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; + "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; + "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; + "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; + "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; + "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; + "khotkeysrc"."Data_2_6"."Enabled" = false; + "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; + "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; + "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; + "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; + "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; + "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; + "khotkeysrc"."Data_2_7"."DataCount" = 4; + "khotkeysrc"."Data_2_7"."Enabled" = false; + "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; + "khotkeysrc"."Data_2_7"."SystemGroup" = 0; + "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_7_1"."Comment" = ""; + "khotkeysrc"."Data_2_7_1"."Enabled" = false; + "khotkeysrc"."Data_2_7_1"."Name" = "Back"; + "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2"."Comment" = ""; + "khotkeysrc"."Data_2_7_2"."Enabled" = false; + "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; + "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3"."Comment" = ""; + "khotkeysrc"."Data_2_7_3"."Enabled" = false; + "khotkeysrc"."Data_2_7_3"."Name" = "Up"; + "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4"."Comment" = ""; + "khotkeysrc"."Data_2_7_4"."Enabled" = false; + "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; + "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; + "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; + "khotkeysrc"."Data_2_8"."Enabled" = false; + "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; + "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; + "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; + "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; + "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; + "khotkeysrc"."Data_3"."DataCount" = 14; + "khotkeysrc"."Data_3"."Enabled" = true; + "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; + "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; + "khotkeysrc"."Data_3"."SystemGroup" = 0; + "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; + "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; + "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; + "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; + "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; + "khotkeysrc"."Data_3_1"."Enabled" = true; + "khotkeysrc"."Data_3_1"."Name" = "Back"; + "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; + "khotkeysrc"."Data_3_10"."Enabled" = false; + "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; + "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; + "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; + "khotkeysrc"."Data_3_11"."Enabled" = true; + "khotkeysrc"."Data_3_11"."Name" = "Up"; + "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; + "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; + "khotkeysrc"."Data_3_12"."Enabled" = false; + "khotkeysrc"."Data_3_12"."Name" = "Up #2"; + "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; + "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; + "khotkeysrc"."Data_3_13"."Enabled" = true; + "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; + "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; + "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; + "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; + "khotkeysrc"."Data_3_14"."Enabled" = true; + "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; + "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; + "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; + "khotkeysrc"."Data_3_2"."Enabled" = true; + "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; + "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; + "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; + "khotkeysrc"."Data_3_3"."Enabled" = true; + "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; + "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; + "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; + "khotkeysrc"."Data_3_4"."Enabled" = true; + "khotkeysrc"."Data_3_4"."Name" = "Forward"; + "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; + "khotkeysrc"."Data_3_5"."Enabled" = true; + "khotkeysrc"."Data_3_5"."Name" = "Home"; + "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; + "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; + "khotkeysrc"."Data_3_6"."Enabled" = true; + "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; + "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; + "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; + "khotkeysrc"."Data_3_7"."Enabled" = true; + "khotkeysrc"."Data_3_7"."Name" = "New Tab"; + "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; + "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; + "khotkeysrc"."Data_3_8"."Enabled" = true; + "khotkeysrc"."Data_3_8"."Name" = "New Window"; + "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; + "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; + "khotkeysrc"."Data_3_9"."Enabled" = true; + "khotkeysrc"."Data_3_9"."Name" = "Reload"; + "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; + "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."DirSelect Dialog"."DirSelectDialog Size[$d]" = ""; + "khotkeysrc"."General"."BrowserApplication[$d]" = ""; + "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; + "khotkeysrc"."General"."ColorScheme[$d]" = ""; + "khotkeysrc"."Gestures"."Disabled" = true; + "khotkeysrc"."Gestures"."MouseButton" = 2; + "khotkeysrc"."Gestures"."Timeout" = 300; + "khotkeysrc"."GesturesExclude"."Comment" = ""; + "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; + "khotkeysrc"."Icons"."Theme[$d]" = ""; + "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; + "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; + "khotkeysrc"."KDE"."SingleClick[$d]" = ""; + "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; + "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; + "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."Voice"."Shortcut" = ""; + "khotkeysrc"."WM"."activeBackground[$d]" = ""; + "khotkeysrc"."WM"."activeBlend[$d]" = ""; + "khotkeysrc"."WM"."activeForeground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; + "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; + "kiorc"."Confirmations"."ConfirmDelete" = true; + "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; + "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; + "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; + "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; + "kwinrc"."Desktops"."Number" = 4; + "kwinrc"."Desktops"."Rows" = 2; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; + "kwinrc"."NightColor"."LongitudeFixed" = 5.44; + "kwinrc"."NightColor"."Mode" = "Location"; + "kwinrc"."NightColor"."NightTemperature" = 1200; + "kwinrc"."Plugins"."wobblywindowsEnabled" = true; + "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling.250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Xwayland"."Scale" = 1; + "kxkbrc"."Layout"."Options" = "compose:caps"; + "kxkbrc"."Layout"."ResetOldOptions" = true; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "en_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; + }; + }; +} From b8defc1c2009049eadf8c05a36203f4aae1b1103 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:46:19 +0100 Subject: [PATCH 0970/2308] Fix wheatley flake (d'oh), and some plasma mananger experiments --- flake.nix | 8 +- .../plasma-desktop/configuration.nix | 871 ++++++++++++++++++ 2 files changed, 878 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index ee10fa6..f83d2cf 100644 --- a/flake.nix +++ b/flake.nix @@ -58,6 +58,12 @@ ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops plasma-manager.homeManagerModules.plasma-manager + home-manager.nixosModules.home-manager + { + home-manager.extraSpecialArgs = {inherit inputs;}; # Pass flake input to home-manager + home-manager.users.USERNAME.imports = [./home-manager/home.nix]; + home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; + } ]; }; }; @@ -92,7 +98,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < - ./nixos/hosts/GLaDOS/configuration.nix + ./nixos/hosts/wheatley/configuration.nix sops-nix.nixosModules.sops ]; }; diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix index 62dafb2..9e6a5f0 100644 --- a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix +++ b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix @@ -869,3 +869,874 @@ }; }; } +{ + programs.plasma = { + enable = true; + shortcuts = { + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; + "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; + "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; + "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kded5"."Show System Activity" = "Ctrl+Esc"; + "kded5"."display" = ["Display" "Meta+P"]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; + "kmix"."decrease_volume" = "Volume Down"; + "kmix"."increase_microphone_volume" = "Microphone Volume Up"; + "kmix"."increase_volume" = "Volume Up"; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mute" = "Volume Mute"; + "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Log Out" = "Ctrl+Alt+Del"; + "ksmserver"."Log Out Without Confirmation" = [ ]; + "ksmserver"."Reboot Without Confirmation" = [ ]; + "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Decrease Opacity" = [ ]; + "kwin"."Edit Tiles" = "Meta+T"; + "kwin"."Expose" = "Ctrl+F9"; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = [ ]; + "kwin"."Increase Opacity" = [ ]; + "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."MoveMouseToCenter" = "Meta+F6"; + "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = [ ]; + "kwin"."MoveZoomLeft" = [ ]; + "kwin"."MoveZoomRight" = [ ]; + "kwin"."MoveZoomUp" = [ ]; + "kwin"."Overview" = "Meta+W"; + "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Show Desktop" = "Meta+D"; + "kwin"."ShowDesktopGrid" = "Meta+F8"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12"; + "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; + "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; + "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; + "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; + "kwin"."Switch Window Down" = "Meta+Alt+Down"; + "kwin"."Switch Window Left" = "Meta+Alt+Left"; + "kwin"."Switch Window Right" = "Meta+Alt+Right"; + "kwin"."Switch Window Up" = "Meta+Alt+Up"; + "kwin"."Switch to Desktop 1" = "Ctrl+F1"; + "kwin"."Switch to Desktop 10" = [ ]; + "kwin"."Switch to Desktop 11" = [ ]; + "kwin"."Switch to Desktop 12" = [ ]; + "kwin"."Switch to Desktop 13" = [ ]; + "kwin"."Switch to Desktop 14" = [ ]; + "kwin"."Switch to Desktop 15" = [ ]; + "kwin"."Switch to Desktop 16" = [ ]; + "kwin"."Switch to Desktop 17" = [ ]; + "kwin"."Switch to Desktop 18" = [ ]; + "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 2" = "Ctrl+F2"; + "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 3" = "Ctrl+F3"; + "kwin"."Switch to Desktop 4" = "Ctrl+F4"; + "kwin"."Switch to Desktop 5" = [ ]; + "kwin"."Switch to Desktop 6" = [ ]; + "kwin"."Switch to Desktop 7" = [ ]; + "kwin"."Switch to Desktop 8" = [ ]; + "kwin"."Switch to Desktop 9" = [ ]; + "kwin"."Switch to Next Desktop" = [ ]; + "kwin"."Switch to Next Screen" = [ ]; + "kwin"."Switch to Previous Desktop" = [ ]; + "kwin"."Switch to Previous Screen" = [ ]; + "kwin"."Switch to Screen 0" = [ ]; + "kwin"."Switch to Screen 1" = [ ]; + "kwin"."Switch to Screen 2" = [ ]; + "kwin"."Switch to Screen 3" = [ ]; + "kwin"."Switch to Screen 4" = [ ]; + "kwin"."Switch to Screen 5" = [ ]; + "kwin"."Switch to Screen 6" = [ ]; + "kwin"."Switch to Screen 7" = [ ]; + "kwin"."Switch to Screen Above" = [ ]; + "kwin"."Switch to Screen Below" = [ ]; + "kwin"."Switch to Screen to the Left" = [ ]; + "kwin"."Switch to Screen to the Right" = [ ]; + "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Window Raise/Lower" = [ ]; + "kwin"."Walk Through Desktop List" = [ ]; + "kwin"."Walk Through Desktop List (Reverse)" = [ ]; + "kwin"."Walk Through Desktops" = [ ]; + "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Walk Through Windows" = "Alt+Tab"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; + "kwin"."Walk Through Windows Alternative" = [ ]; + "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; + "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; + "kwin"."Window Above Other Windows" = [ ]; + "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Window Close" = "Alt+F4"; + "kwin"."Window Fullscreen" = [ ]; + "kwin"."Window Grow Horizontal" = [ ]; + "kwin"."Window Grow Vertical" = [ ]; + "kwin"."Window Lower" = [ ]; + "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = [ ]; + "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = [ ]; + "kwin"."Window Move Center" = [ ]; + "kwin"."Window No Border" = [ ]; + "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; + "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; + "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; + "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = [ ]; + "kwin"."Window One Screen Up" = [ ]; + "kwin"."Window One Screen to the Left" = [ ]; + "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window Operations Menu" = "Alt+F3"; + "kwin"."Window Pack Down" = [ ]; + "kwin"."Window Pack Left" = [ ]; + "kwin"."Window Pack Right" = [ ]; + "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Quick Tile Bottom" = "Meta+Down"; + "kwin"."Window Quick Tile Bottom Left" = [ ]; + "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Left" = "Meta+Left"; + "kwin"."Window Quick Tile Right" = "Meta+Right"; + "kwin"."Window Quick Tile Top" = "Meta+Up"; + "kwin"."Window Quick Tile Top Left" = [ ]; + "kwin"."Window Quick Tile Top Right" = [ ]; + "kwin"."Window Raise" = [ ]; + "kwin"."Window Resize" = [ ]; + "kwin"."Window Shade" = [ ]; + "kwin"."Window Shrink Horizontal" = [ ]; + "kwin"."Window Shrink Vertical" = [ ]; + "kwin"."Window to Desktop 1" = [ ]; + "kwin"."Window to Desktop 10" = [ ]; + "kwin"."Window to Desktop 11" = [ ]; + "kwin"."Window to Desktop 12" = [ ]; + "kwin"."Window to Desktop 13" = [ ]; + "kwin"."Window to Desktop 14" = [ ]; + "kwin"."Window to Desktop 15" = [ ]; + "kwin"."Window to Desktop 16" = [ ]; + "kwin"."Window to Desktop 17" = [ ]; + "kwin"."Window to Desktop 18" = [ ]; + "kwin"."Window to Desktop 19" = [ ]; + "kwin"."Window to Desktop 2" = [ ]; + "kwin"."Window to Desktop 20" = [ ]; + "kwin"."Window to Desktop 3" = [ ]; + "kwin"."Window to Desktop 4" = [ ]; + "kwin"."Window to Desktop 5" = [ ]; + "kwin"."Window to Desktop 6" = [ ]; + "kwin"."Window to Desktop 7" = [ ]; + "kwin"."Window to Desktop 8" = [ ]; + "kwin"."Window to Desktop 9" = [ ]; + "kwin"."Window to Next Desktop" = [ ]; + "kwin"."Window to Next Screen" = [ ]; + "kwin"."Window to Previous Desktop" = [ ]; + "kwin"."Window to Previous Screen" = [ ]; + "kwin"."Window to Screen 0" = [ ]; + "kwin"."Window to Screen 1" = [ ]; + "kwin"."Window to Screen 2" = [ ]; + "kwin"."Window to Screen 3" = [ ]; + "kwin"."Window to Screen 4" = [ ]; + "kwin"."Window to Screen 5" = [ ]; + "kwin"."Window to Screen 6" = [ ]; + "kwin"."Window to Screen 7" = [ ]; + "kwin"."view_actual_size" = "Meta+0"; + "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; + "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."nextmedia" = "Media Next"; + "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playpausemedia" = "Media Play"; + "mediacontrol"."previousmedia" = "Media Previous"; + "mediacontrol"."stopmedia" = "Media Stop"; + "org.kde.dolphin.desktop"."_launch" = "Meta+E"; + "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; + "org.kde.konsole.desktop"."NewTab" = [ ]; + "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; + "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; + "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; + "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; + "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "org.kde.spectacle.desktop"."_launch" = "Print"; + "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Hibernate" = "Hibernate"; + "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."PowerDown" = "Power Down"; + "org_kde_powerdevil"."PowerOff" = "Power Off"; + "org_kde_powerdevil"."Sleep" = "Sleep"; + "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; + "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "plasmashell"."activate task manager entry 1" = "Meta+1"; + "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 2" = "Meta+2"; + "plasmashell"."activate task manager entry 3" = "Meta+3"; + "plasmashell"."activate task manager entry 4" = "Meta+4"; + "plasmashell"."activate task manager entry 5" = "Meta+5"; + "plasmashell"."activate task manager entry 6" = "Meta+6"; + "plasmashell"."activate task manager entry 7" = "Meta+7"; + "plasmashell"."activate task manager entry 8" = "Meta+8"; + "plasmashell"."activate task manager entry 9" = "Meta+9"; + "plasmashell"."clear-history" = [ ]; + "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; + "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = [ ]; + "plasmashell"."cyclePrevAction" = [ ]; + "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."manage activities" = "Meta+Q"; + "plasmashell"."next activity" = "Meta+Tab"; + "plasmashell"."previous activity" = "Meta+Shift+Tab"; + "plasmashell"."repeat_action" = "Meta+Ctrl+R"; + "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-on-mouse-pos" = "Meta+V"; + "plasmashell"."stop current activity" = "Meta+S"; + "plasmashell"."switch to next activity" = [ ]; + "plasmashell"."switch to previous activity" = [ ]; + "plasmashell"."toggle do not disturb" = [ ]; + "systemsettings.desktop"."_launch" = "Tools"; + "systemsettings.desktop"."kcm-kscreen" = [ ]; + "systemsettings.desktop"."kcm-lookandfeel" = [ ]; + "systemsettings.desktop"."kcm-users" = [ ]; + "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; + "systemsettings.desktop"."screenlocker" = [ ]; + }; + configFile = { + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 8; + "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; + "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; + "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "844,598"; + "kdeglobals"."General"."BrowserApplication" = "librewolf.desktop"; + "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; + "kdeglobals"."KDE"."SingleClick" = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Preview" = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Name"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; + "kdeglobals"."WM"."activeBackground" = "49,54,59"; + "kdeglobals"."WM"."activeBlend" = "252,252,252"; + "kdeglobals"."WM"."activeForeground" = "252,252,252"; + "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; + "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; + "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; + "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; + "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; + "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; + "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; + "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; + "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; + "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; + "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; + "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; + "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; + "kglobalshortcutsrc"."org.kde.kcalc.desktop"."_k_friendly_name" = "KCalc"; + "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; + "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; + "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Emoji Selector"; + "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Power Management"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; + "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "System Settings"; + "khotkeysrc"."Data"."DataCount" = 3; + "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; + "khotkeysrc"."Data_1"."DataCount" = 1; + "khotkeysrc"."Data_1"."Enabled" = true; + "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; + "khotkeysrc"."Data_1"."SystemGroup" = 1; + "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1"."Comment" = "Comment"; + "khotkeysrc"."Data_1_1"."Enabled" = true; + "khotkeysrc"."Data_1_1"."Name" = "Search"; + "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; + "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; + "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; + "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; + "khotkeysrc"."Data_2"."DataCount" = 8; + "khotkeysrc"."Data_2"."Enabled" = false; + "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; + "khotkeysrc"."Data_2"."Name" = "Examples"; + "khotkeysrc"."Data_2"."SystemGroup" = 0; + "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; + "khotkeysrc"."Data_2_1"."Enabled" = false; + "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; + "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; + "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; + "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; + "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; + "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; + "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; + "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; + "khotkeysrc"."Data_2_2"."Enabled" = false; + "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; + "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; + "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; + "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; + "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; + "khotkeysrc"."Data_2_3"."Enabled" = false; + "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; + "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; + "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; + "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; + "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; + "khotkeysrc"."Data_2_4"."Enabled" = false; + "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; + "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; + "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; + "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; + "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; + "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; + "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; + "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; + "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; + "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; + "khotkeysrc"."Data_2_5"."Enabled" = false; + "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; + "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; + "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; + "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; + "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; + "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; + "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; + "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; + "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; + "khotkeysrc"."Data_2_6"."Enabled" = false; + "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; + "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; + "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; + "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; + "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; + "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; + "khotkeysrc"."Data_2_7"."DataCount" = 4; + "khotkeysrc"."Data_2_7"."Enabled" = false; + "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; + "khotkeysrc"."Data_2_7"."SystemGroup" = 0; + "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_7_1"."Comment" = ""; + "khotkeysrc"."Data_2_7_1"."Enabled" = false; + "khotkeysrc"."Data_2_7_1"."Name" = "Back"; + "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2"."Comment" = ""; + "khotkeysrc"."Data_2_7_2"."Enabled" = false; + "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; + "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3"."Comment" = ""; + "khotkeysrc"."Data_2_7_3"."Enabled" = false; + "khotkeysrc"."Data_2_7_3"."Name" = "Up"; + "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4"."Comment" = ""; + "khotkeysrc"."Data_2_7_4"."Enabled" = false; + "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; + "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; + "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; + "khotkeysrc"."Data_2_8"."Enabled" = false; + "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; + "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; + "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; + "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; + "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; + "khotkeysrc"."Data_3"."DataCount" = 14; + "khotkeysrc"."Data_3"."Enabled" = true; + "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; + "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; + "khotkeysrc"."Data_3"."SystemGroup" = 0; + "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; + "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; + "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; + "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; + "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; + "khotkeysrc"."Data_3_1"."Enabled" = true; + "khotkeysrc"."Data_3_1"."Name" = "Back"; + "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; + "khotkeysrc"."Data_3_10"."Enabled" = false; + "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; + "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; + "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; + "khotkeysrc"."Data_3_11"."Enabled" = true; + "khotkeysrc"."Data_3_11"."Name" = "Up"; + "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; + "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; + "khotkeysrc"."Data_3_12"."Enabled" = false; + "khotkeysrc"."Data_3_12"."Name" = "Up #2"; + "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; + "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; + "khotkeysrc"."Data_3_13"."Enabled" = true; + "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; + "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; + "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; + "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; + "khotkeysrc"."Data_3_14"."Enabled" = true; + "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; + "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; + "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; + "khotkeysrc"."Data_3_2"."Enabled" = true; + "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; + "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; + "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; + "khotkeysrc"."Data_3_3"."Enabled" = true; + "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; + "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; + "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; + "khotkeysrc"."Data_3_4"."Enabled" = true; + "khotkeysrc"."Data_3_4"."Name" = "Forward"; + "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; + "khotkeysrc"."Data_3_5"."Enabled" = true; + "khotkeysrc"."Data_3_5"."Name" = "Home"; + "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; + "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; + "khotkeysrc"."Data_3_6"."Enabled" = true; + "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; + "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; + "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; + "khotkeysrc"."Data_3_7"."Enabled" = true; + "khotkeysrc"."Data_3_7"."Name" = "New Tab"; + "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; + "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; + "khotkeysrc"."Data_3_8"."Enabled" = true; + "khotkeysrc"."Data_3_8"."Name" = "New Window"; + "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; + "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; + "khotkeysrc"."Data_3_9"."Enabled" = true; + "khotkeysrc"."Data_3_9"."Name" = "Reload"; + "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; + "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."DirSelect Dialog"."DirSelectDialog Size[$d]" = ""; + "khotkeysrc"."General"."BrowserApplication[$d]" = ""; + "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; + "khotkeysrc"."General"."ColorScheme[$d]" = ""; + "khotkeysrc"."Gestures"."Disabled" = true; + "khotkeysrc"."Gestures"."MouseButton" = 2; + "khotkeysrc"."Gestures"."Timeout" = 300; + "khotkeysrc"."GesturesExclude"."Comment" = ""; + "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; + "khotkeysrc"."Icons"."Theme[$d]" = ""; + "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; + "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; + "khotkeysrc"."KDE"."SingleClick[$d]" = ""; + "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; + "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; + "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."Voice"."Shortcut" = ""; + "khotkeysrc"."WM"."activeBackground[$d]" = ""; + "khotkeysrc"."WM"."activeBlend[$d]" = ""; + "khotkeysrc"."WM"."activeForeground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; + "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; + "kiorc"."Confirmations"."ConfirmDelete" = true; + "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; + "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; + "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; + "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; + "kwinrc"."Desktops"."Number" = 4; + "kwinrc"."Desktops"."Rows" = 2; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; + "kwinrc"."NightColor"."LongitudeFixed" = 5.44; + "kwinrc"."NightColor"."Mode" = "Location"; + "kwinrc"."NightColor"."NightTemperature" = 1200; + "kwinrc"."Plugins"."wobblywindowsEnabled" = true; + "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling.250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Xwayland"."Scale" = 1; + "kxkbrc"."Layout"."Options" = "compose:caps"; + "kxkbrc"."Layout"."ResetOldOptions" = true; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "en_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; + }; + }; +} From f188b5fc322784fd75798407143acc4ab5db3db9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:48:11 +0100 Subject: [PATCH 0971/2308] That didn't work, fix it later, wheatley first --- flake.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/flake.nix b/flake.nix index f83d2cf..f87e352 100644 --- a/flake.nix +++ b/flake.nix @@ -59,11 +59,6 @@ sops-nix.nixosModules.sops plasma-manager.homeManagerModules.plasma-manager home-manager.nixosModules.home-manager - { - home-manager.extraSpecialArgs = {inherit inputs;}; # Pass flake input to home-manager - home-manager.users.USERNAME.imports = [./home-manager/home.nix]; - home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; - } ]; }; }; From c4645ab9e7c33aed03ad55cc9942690aaa08451d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:48:11 +0100 Subject: [PATCH 0972/2308] That didn't work, fix it later, wheatley first --- flake.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/flake.nix b/flake.nix index f83d2cf..f87e352 100644 --- a/flake.nix +++ b/flake.nix @@ -59,11 +59,6 @@ sops-nix.nixosModules.sops plasma-manager.homeManagerModules.plasma-manager home-manager.nixosModules.home-manager - { - home-manager.extraSpecialArgs = {inherit inputs;}; # Pass flake input to home-manager - home-manager.users.USERNAME.imports = [./home-manager/home.nix]; - home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; - } ]; }; }; From 671d703129cf657e955c14b64fecfde604e24681 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:50:16 +0100 Subject: [PATCH 0973/2308] Enable home manager in wheatley --- nixos/hosts/wheatley/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 8ab28ff..b25bedc 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -177,6 +177,7 @@ }; }; + programs.home-manager.enable = true; home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { From 81f90465140983c4834e9bdcc0f8e24f3c13b998 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:50:16 +0100 Subject: [PATCH 0974/2308] Enable home manager in wheatley --- nixos/hosts/wheatley/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 8ab28ff..b25bedc 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -177,6 +177,7 @@ }; }; + programs.home-manager.enable = true; home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { From 9cae9d446ceadc935fde0b2ad33c0738d2def891 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:51:46 +0100 Subject: [PATCH 0975/2308] Should probably put all the things there --- nixos/hosts/wheatley/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index b25bedc..1f9bf4b 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -2,6 +2,9 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). { + inputs, + outputs, + lib, config, pkgs, ... From 7448e26163a40247c1da32cf636eab08305f1b56 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jan 2024 23:51:46 +0100 Subject: [PATCH 0976/2308] Should probably put all the things there --- nixos/hosts/wheatley/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index b25bedc..1f9bf4b 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -2,6 +2,9 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). { + inputs, + outputs, + lib, config, pkgs, ... From 2d898826f13bf30aba4ceade244f91cba22cd1dd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 00:08:07 +0100 Subject: [PATCH 0977/2308] Should import home manager here --- nixos/hosts/wheatley/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 1f9bf4b..3ed5595 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -10,6 +10,8 @@ ... }: { imports = [ + inputs.home-manager.nixosModules.home-manager + ./hardware-configuration.nix ../../shared/locale/configuration.nix ]; From 3603c9034911726a3f6aa407c6ef57c3ad41565c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 00:08:07 +0100 Subject: [PATCH 0978/2308] Should import home manager here --- nixos/hosts/wheatley/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 1f9bf4b..3ed5595 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -10,6 +10,8 @@ ... }: { imports = [ + inputs.home-manager.nixosModules.home-manager + ./hardware-configuration.nix ../../shared/locale/configuration.nix ]; From be9ab88e270911d67602a76aa14c6a164fdca367 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 00:10:09 +0100 Subject: [PATCH 0979/2308] That's the wrong place for that --- nixos/hosts/wheatley/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 3ed5595..c45ae30 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -182,7 +182,6 @@ }; }; - programs.home-manager.enable = true; home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { From d9bff82e540959ac8526a65eafb3f3f523a827c2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 00:10:09 +0100 Subject: [PATCH 0980/2308] That's the wrong place for that --- nixos/hosts/wheatley/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 3ed5595..c45ae30 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -182,7 +182,6 @@ }; }; - programs.home-manager.enable = true; home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { From 7d4d52aead883469474410984440aae09501e3e7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 00:15:08 +0100 Subject: [PATCH 0981/2308] Some realtek driver, might not need this --- nixos/hosts/wheatley/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index c45ae30..c3e7672 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -19,11 +19,11 @@ boot.loader.generic-extlinux-compatible.enable = true; boot.loader.grub.enable = false; - boot.extraModulePackages = [ - (pkgs.callPackage ./rtl8189es.nix { - kernel = config.boot.kernelPackages.kernel; - }) - ]; + # boot.extraModulePackages = [ + # (pkgs.callPackage ./rtl8189es.nix { + # kernel = config.boot.kernelPackages.kernel; + # }) + # ]; nixpkgs = { # You can add overlays here overlays = [ From 2cbd2a2aca1491571d07a126fbbdaf877756aa81 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 00:15:08 +0100 Subject: [PATCH 0982/2308] Some realtek driver, might not need this --- nixos/hosts/wheatley/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index c45ae30..c3e7672 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -19,11 +19,11 @@ boot.loader.generic-extlinux-compatible.enable = true; boot.loader.grub.enable = false; - boot.extraModulePackages = [ - (pkgs.callPackage ./rtl8189es.nix { - kernel = config.boot.kernelPackages.kernel; - }) - ]; + # boot.extraModulePackages = [ + # (pkgs.callPackage ./rtl8189es.nix { + # kernel = config.boot.kernelPackages.kernel; + # }) + # ]; nixpkgs = { # You can add overlays here overlays = [ From d9de262a67ea4d16e07e54fe1aaf1e158de0b45a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 14:56:22 +0100 Subject: [PATCH 0983/2308] Updated hardware config for wheatley --- nixos/hosts/wheatley/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index ed7b123..a96194a 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -22,7 +22,7 @@ fsType = "ext4"; }; - swapDevices = []; + swapDevices = [{device = "/dev/disk/by-uuid/4c9c8850-5e2e-4b4b-8ebb-4d7306012535";}]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From cc849e8ec1b0ab222083fadc71c788e1f1876542 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 14:56:22 +0100 Subject: [PATCH 0984/2308] Updated hardware config for wheatley --- nixos/hosts/wheatley/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index ed7b123..a96194a 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -22,7 +22,7 @@ fsType = "ext4"; }; - swapDevices = []; + swapDevices = [{device = "/dev/disk/by-uuid/4c9c8850-5e2e-4b4b-8ebb-4d7306012535";}]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From d90ba55a213ea9d26a8a484021829a5b60dad657 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 16:03:10 +0100 Subject: [PATCH 0985/2308] Network manager fails to build on wheatley, let's ignore it --- nixos/hosts/wheatley/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index c3e7672..629ca82 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -152,9 +152,6 @@ enable = true; }; - # Enable networking - networking.networkmanager.enable = true; - networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [22 80 443]; From e1b0f0ff99a0440ba494233d311f1899da7296fe Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 16:03:10 +0100 Subject: [PATCH 0986/2308] Network manager fails to build on wheatley, let's ignore it --- nixos/hosts/wheatley/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index c3e7672..629ca82 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -152,9 +152,6 @@ enable = true; }; - # Enable networking - networking.networkmanager.enable = true; - networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [22 80 443]; From ed61829532887c52e9fb102c3b6fc0d2a4ffb6b6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 16:58:45 +0100 Subject: [PATCH 0987/2308] Change the pihole config to a flake that hopefully works --- flake.nix | 19 +++++ nixos/hosts/wheatley/configuration.nix | 105 +++++++------------------ 2 files changed, 48 insertions(+), 76 deletions(-) diff --git a/flake.nix b/flake.nix index f87e352..c0cad27 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,19 @@ extest.url = "github:chaorace/extest-nix"; # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; + + # Required for making sure that Pi-hole continues running if the executing user has no active session. + linger = { + url = "github:mindsbackyard/linger-flake"; + inputs.flake-utils.follows = "flake-utils"; + }; + + pihole = { + url = "github:mindsbackyard/pihole-flake"; + inputs.nixpkgs.follow = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + inputs.linger.follows = "linger"; + }; }; outputs = { @@ -31,6 +44,8 @@ sops-nix, simple-nixos-mailserver, plasma-manager, + linger, + pihole, ... } @ inputs: let inherit (self) outputs; @@ -84,6 +99,10 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops + + # make the module declared by the linger flake available to our config + linger.nixosModules.${system}.default + pihole.nixosModules.${system}.default ]; }; }; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 629ca82..2c09b8f 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -18,6 +18,7 @@ boot.loader.generic-extlinux-compatible.enable = true; boot.loader.grub.enable = false; + boot.cleanTmpDir = true; # boot.extraModulePackages = [ # (pkgs.callPackage ./rtl8189es.nix { @@ -75,87 +76,39 @@ }; }; - virtualisation.oci-containers.backend = "podman"; - virtualisation.oci-containers.containers.pihole = { - image = "pihole/pihole:2024.01.0"; - ports = [ - "53:53/udp" - "53:53/tcp" - "80:80/tcp" - ]; - environment = { - TZ = config.time.timeZone; - WEB_PORT = "80"; - WEBPASSWORD = "toor"; - #VIRTUAL_HOST = "192.168.1.114"; - PIHOLE_DNS_ = "127.0.0.1#5353"; - REV_SERVER = "true"; - REV_SERVER_DOMAIN = "router.lan"; - REV_SERVER_TARGET = "192.168.1.1"; - REV_SERVER_CIDR = "192.168.1.0/16"; - DNSMASQ_LISTENING = "local"; - }; - extraOptions = [ - "--network=host" - ]; - }; - - systemd.services."podman-pihole".postStart = '' - sleep 300s - - podman exec pihole pihole -a adlist add "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" - podman exec pihole pihole -a adlist add "https://adaway.org/hosts.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/AdguardDNS.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Admiral.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easylist.txt" - podman exec pihole pihole -a adlist add "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/static/w3kbl.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Shalla-mal.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt" - podman exec pihole pihole -a adlist add "https://someonewhocares.org/hosts/zero/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/HorusTeknoloji/TR-PhishingList/master/url-lists.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easyprivacy.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Ads.txt" - podman exec pihole pihole -a adlist add "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt" - podman exec pihole pihole -a adlist add "https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt" - podman exec pihole pihole -a adlist add "https://hostfiles.frogeye.fr/multiparty-trackers-hosts.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/android-tracking.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/AmazonFireTV.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/RooneyMcNibNug/pihole-stuff/master/SNAFU.txt" - podman exec pihole pihole -a adlist add "https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt" - podman exec pihole pihole -a adlist add "https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt" - podman exec pihole pihole -a adlist add "https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt" - podman exec pihole pihole -a adlist add "https://phishing.army/download/phishing_army_blocklist_extended.txt" - podman exec pihole pihole -a adlist add "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts" - podman exec pihole pihole -a adlist add "https://urlhaus.abuse.ch/downloads/hostfile/" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Malware.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/gambling-porn/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/chadmayfield/my-pihole-blocklists/master/lists/pi_blocklist_porn_all.list" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Crypto.txt" - podman exec pihole pihole -a adlist add "https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser" - - podman exec pihole pihole -g - ''; - - services.openssh = { + services.pihole = { enable = true; + hostConfig = { + # define the service user for running the rootless Pi-hole container + user = "pihole"; + enableLingeringForUser = true; + + # we want to persist change to the Pi-hole configuration & logs across service restarts + # check the option descriptions for more information + persistVolumes = true; + + # expose DNS & the web interface on unpriviledged ports on all IP addresses of the host + # check the option descriptions for more information + dnsPort = 5335; + webProt = 8080; + }; + piholeConfig.ftl = { + # assuming that the host has this (fixed) IP and should resolve "pi.hole" to this address + # check the option description & the FTLDNS documentation for more information + LOCAL_IPV4 = "192.168.0.2"; + }; + piholeCOnfig.web = { + virtualHost = "pi.hole"; + password = "password"; + }; }; networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [22 80 443]; - + networking.firewall = { + allowedTCPPorts = [22 80 443 5335 8080]; + allowedUDPPorts = [5335]; + }; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 09180f65077e58e729beb709e4e2caf6c689265e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 16:58:45 +0100 Subject: [PATCH 0988/2308] Change the pihole config to a flake that hopefully works --- flake.nix | 19 +++++ nixos/hosts/wheatley/configuration.nix | 105 +++++++------------------ 2 files changed, 48 insertions(+), 76 deletions(-) diff --git a/flake.nix b/flake.nix index f87e352..c0cad27 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,19 @@ extest.url = "github:chaorace/extest-nix"; # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; + + # Required for making sure that Pi-hole continues running if the executing user has no active session. + linger = { + url = "github:mindsbackyard/linger-flake"; + inputs.flake-utils.follows = "flake-utils"; + }; + + pihole = { + url = "github:mindsbackyard/pihole-flake"; + inputs.nixpkgs.follow = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + inputs.linger.follows = "linger"; + }; }; outputs = { @@ -31,6 +44,8 @@ sops-nix, simple-nixos-mailserver, plasma-manager, + linger, + pihole, ... } @ inputs: let inherit (self) outputs; @@ -84,6 +99,10 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops + + # make the module declared by the linger flake available to our config + linger.nixosModules.${system}.default + pihole.nixosModules.${system}.default ]; }; }; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 629ca82..2c09b8f 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -18,6 +18,7 @@ boot.loader.generic-extlinux-compatible.enable = true; boot.loader.grub.enable = false; + boot.cleanTmpDir = true; # boot.extraModulePackages = [ # (pkgs.callPackage ./rtl8189es.nix { @@ -75,87 +76,39 @@ }; }; - virtualisation.oci-containers.backend = "podman"; - virtualisation.oci-containers.containers.pihole = { - image = "pihole/pihole:2024.01.0"; - ports = [ - "53:53/udp" - "53:53/tcp" - "80:80/tcp" - ]; - environment = { - TZ = config.time.timeZone; - WEB_PORT = "80"; - WEBPASSWORD = "toor"; - #VIRTUAL_HOST = "192.168.1.114"; - PIHOLE_DNS_ = "127.0.0.1#5353"; - REV_SERVER = "true"; - REV_SERVER_DOMAIN = "router.lan"; - REV_SERVER_TARGET = "192.168.1.1"; - REV_SERVER_CIDR = "192.168.1.0/16"; - DNSMASQ_LISTENING = "local"; - }; - extraOptions = [ - "--network=host" - ]; - }; - - systemd.services."podman-pihole".postStart = '' - sleep 300s - - podman exec pihole pihole -a adlist add "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" - podman exec pihole pihole -a adlist add "https://adaway.org/hosts.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/AdguardDNS.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Admiral.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easylist.txt" - podman exec pihole pihole -a adlist add "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/static/w3kbl.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Shalla-mal.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt" - podman exec pihole pihole -a adlist add "https://someonewhocares.org/hosts/zero/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/HorusTeknoloji/TR-PhishingList/master/url-lists.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easyprivacy.txt" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Ads.txt" - podman exec pihole pihole -a adlist add "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt" - podman exec pihole pihole -a adlist add "https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt" - podman exec pihole pihole -a adlist add "https://hostfiles.frogeye.fr/multiparty-trackers-hosts.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/android-tracking.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/AmazonFireTV.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/RooneyMcNibNug/pihole-stuff/master/SNAFU.txt" - podman exec pihole pihole -a adlist add "https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt" - podman exec pihole pihole -a adlist add "https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt" - podman exec pihole pihole -a adlist add "https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt" - podman exec pihole pihole -a adlist add "https://phishing.army/download/phishing_army_blocklist_extended.txt" - podman exec pihole pihole -a adlist add "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts" - podman exec pihole pihole -a adlist add "https://urlhaus.abuse.ch/downloads/hostfile/" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Malware.txt" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/gambling-porn/hosts" - podman exec pihole pihole -a adlist add "https://raw.githubusercontent.com/chadmayfield/my-pihole-blocklists/master/lists/pi_blocklist_porn_all.list" - podman exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Prigent-Crypto.txt" - podman exec pihole pihole -a adlist add "https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser" - - podman exec pihole pihole -g - ''; - - services.openssh = { + services.pihole = { enable = true; + hostConfig = { + # define the service user for running the rootless Pi-hole container + user = "pihole"; + enableLingeringForUser = true; + + # we want to persist change to the Pi-hole configuration & logs across service restarts + # check the option descriptions for more information + persistVolumes = true; + + # expose DNS & the web interface on unpriviledged ports on all IP addresses of the host + # check the option descriptions for more information + dnsPort = 5335; + webProt = 8080; + }; + piholeConfig.ftl = { + # assuming that the host has this (fixed) IP and should resolve "pi.hole" to this address + # check the option description & the FTLDNS documentation for more information + LOCAL_IPV4 = "192.168.0.2"; + }; + piholeCOnfig.web = { + virtualHost = "pi.hole"; + password = "password"; + }; }; networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [22 80 443]; - + networking.firewall = { + allowedTCPPorts = [22 80 443 5335 8080]; + allowedUDPPorts = [5335]; + }; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 15b6b8181659f050504b5176e546ac2f06f99f78 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:21:29 +0100 Subject: [PATCH 0989/2308] Add wifi connection to wheatley --- nixos/hosts/wheatley/configuration.nix | 16 ++++++++++++++++ nixos/hosts/wheatley/secrets/sops.yaml | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 nixos/hosts/wheatley/secrets/sops.yaml diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 2c09b8f..dd6adbd 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -45,6 +45,12 @@ }; }; + sops.defaultSopsFile = ./secrets/sops.yaml; + sops.age.keyFile = ../../../../../var/secrets/keys.txt; + + sops.secrets."wireless.env".mode = "0440"; + sops.secrets."wireless.env".owner = config.users.users.root.name; + environment.systemPackages = with pkgs; [ age git @@ -103,6 +109,16 @@ }; }; + networking.wireless.enable = true; + networking.wireless.environmentFile = config.sops.secrets."wireless.env".path; + networking.wireless.networks."KPNAA6306" = { + hidden = true; + auth = '' + key_mgmt=WPA + password="@PSK_HOME@" + ''; + }; + networking.firewall.enable = true; networking.firewall = { diff --git a/nixos/hosts/wheatley/secrets/sops.yaml b/nixos/hosts/wheatley/secrets/sops.yaml new file mode 100644 index 0000000..94f8617 --- /dev/null +++ b/nixos/hosts/wheatley/secrets/sops.yaml @@ -0,0 +1,21 @@ +wireless.env: ENC[AES256_GCM,data:a5sUW0Lc4GRd9aUJwHbmQvzvRB8WaRjMSQ==,iv:+3ncL38E3aqbejoCzzeBtMukLk4n/AQBJELlqhXDqSA=,tag:buY9Mp10DAEEEKqSyHwB3g==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEWnJ1Slh0aEtVQVhJT051 + a0FKQnpYRlZKckt0NURhNm0wTjd4N1N3S3djCmhzUUloOHUzVGZXVW1xNXMyQnoz + N2lKdXZBdXdxRFVTMDRKYzBCZThOaTQKLS0tIGlhbVF1Rjc1K0RPeW1LN3ZCbXhw + Vm9mWk5JRGtZNVVhN1JQWTBlb2kySkEKoLI1MzS3uGNUbyn7kI5DylKZiPtc1div + bKIboWoobTfDt0EURfmZ5+JrX6DlZxRyNQyl9dsKmZT6pLdaIppStA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-01-12T16:14:03Z" + mac: ENC[AES256_GCM,data:J/0+e7w8tcfsQ9xtWJifKYpWQLpLssjSgxMl/PdIyYuWKDKkF/dDr+joP7Evlk5Hg3dXL7ijGFgYVwUjhFzbgk9pUiHt0cvXj0hthgwUIUpQh42M6qKtxRaxP/Mp9Shb2CSwZfZ2GyXP4lJuMS76SDKo46xGdbejwlLPZ11oArA=,iv:rWrrB9VUxX3N2OSSep9SPfyl9Ke7hQVGkheazOrbis4=,tag:9fBYgtCoNm9Unv7ADJTb0Q==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 From f948f1e52d0da3e3a718f6bac0b97cb57332d81a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:21:29 +0100 Subject: [PATCH 0990/2308] Add wifi connection to wheatley --- nixos/hosts/wheatley/configuration.nix | 16 ++++++++++++++++ nixos/hosts/wheatley/secrets/sops.yaml | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 nixos/hosts/wheatley/secrets/sops.yaml diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 2c09b8f..dd6adbd 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -45,6 +45,12 @@ }; }; + sops.defaultSopsFile = ./secrets/sops.yaml; + sops.age.keyFile = ../../../../../var/secrets/keys.txt; + + sops.secrets."wireless.env".mode = "0440"; + sops.secrets."wireless.env".owner = config.users.users.root.name; + environment.systemPackages = with pkgs; [ age git @@ -103,6 +109,16 @@ }; }; + networking.wireless.enable = true; + networking.wireless.environmentFile = config.sops.secrets."wireless.env".path; + networking.wireless.networks."KPNAA6306" = { + hidden = true; + auth = '' + key_mgmt=WPA + password="@PSK_HOME@" + ''; + }; + networking.firewall.enable = true; networking.firewall = { diff --git a/nixos/hosts/wheatley/secrets/sops.yaml b/nixos/hosts/wheatley/secrets/sops.yaml new file mode 100644 index 0000000..94f8617 --- /dev/null +++ b/nixos/hosts/wheatley/secrets/sops.yaml @@ -0,0 +1,21 @@ +wireless.env: ENC[AES256_GCM,data:a5sUW0Lc4GRd9aUJwHbmQvzvRB8WaRjMSQ==,iv:+3ncL38E3aqbejoCzzeBtMukLk4n/AQBJELlqhXDqSA=,tag:buY9Mp10DAEEEKqSyHwB3g==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEWnJ1Slh0aEtVQVhJT051 + a0FKQnpYRlZKckt0NURhNm0wTjd4N1N3S3djCmhzUUloOHUzVGZXVW1xNXMyQnoz + N2lKdXZBdXdxRFVTMDRKYzBCZThOaTQKLS0tIGlhbVF1Rjc1K0RPeW1LN3ZCbXhw + Vm9mWk5JRGtZNVVhN1JQWTBlb2kySkEKoLI1MzS3uGNUbyn7kI5DylKZiPtc1div + bKIboWoobTfDt0EURfmZ5+JrX6DlZxRyNQyl9dsKmZT6pLdaIppStA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-01-12T16:14:03Z" + mac: ENC[AES256_GCM,data:J/0+e7w8tcfsQ9xtWJifKYpWQLpLssjSgxMl/PdIyYuWKDKkF/dDr+joP7Evlk5Hg3dXL7ijGFgYVwUjhFzbgk9pUiHt0cvXj0hthgwUIUpQh42M6qKtxRaxP/Mp9Shb2CSwZfZ2GyXP4lJuMS76SDKo46xGdbejwlLPZ11oArA=,iv:rWrrB9VUxX3N2OSSep9SPfyl9Ke7hQVGkheazOrbis4=,tag:9fBYgtCoNm9Unv7ADJTb0Q==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 From d8e0c72eff806e52330830c923f68979f17ede27 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:39:13 +0100 Subject: [PATCH 0991/2308] Fix that location --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index c0cad27..4d11f3b 100644 --- a/flake.nix +++ b/flake.nix @@ -99,10 +99,6 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops - - # make the module declared by the linger flake available to our config - linger.nixosModules.${system}.default - pihole.nixosModules.${system}.default ]; }; }; @@ -111,6 +107,10 @@ system = "armv7l-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + # make the module declared by the linger flake available to our config + linger.nixosModules.${system}.default + pihole.nixosModules.${system}.default + # > Our main nixos configuration file < ./nixos/hosts/wheatley/configuration.nix sops-nix.nixosModules.sops From bea39319abf250bad1494f04e9d16bc860e6ea37 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:39:13 +0100 Subject: [PATCH 0992/2308] Fix that location --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index c0cad27..4d11f3b 100644 --- a/flake.nix +++ b/flake.nix @@ -99,10 +99,6 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops - - # make the module declared by the linger flake available to our config - linger.nixosModules.${system}.default - pihole.nixosModules.${system}.default ]; }; }; @@ -111,6 +107,10 @@ system = "armv7l-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + # make the module declared by the linger flake available to our config + linger.nixosModules.${system}.default + pihole.nixosModules.${system}.default + # > Our main nixos configuration file < ./nixos/hosts/wheatley/configuration.nix sops-nix.nixosModules.sops From 49c2af12b953895ace2215c105e616a4f65eaa22 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:40:46 +0100 Subject: [PATCH 0993/2308] Let's try this instead for now --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 4d11f3b..d90bf61 100644 --- a/flake.nix +++ b/flake.nix @@ -108,8 +108,8 @@ specialArgs = {inherit inputs outputs;}; modules = [ # make the module declared by the linger flake available to our config - linger.nixosModules.${system}.default - pihole.nixosModules.${system}.default + linger.nixosModules."armv7l-linux".default + pihole.nixosModules."armv7l-linux".default # > Our main nixos configuration file < ./nixos/hosts/wheatley/configuration.nix From bc8fdd1f0fe8a2189e763a41bd346630305d1ce1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:40:46 +0100 Subject: [PATCH 0994/2308] Let's try this instead for now --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 4d11f3b..d90bf61 100644 --- a/flake.nix +++ b/flake.nix @@ -108,8 +108,8 @@ specialArgs = {inherit inputs outputs;}; modules = [ # make the module declared by the linger flake available to our config - linger.nixosModules.${system}.default - pihole.nixosModules.${system}.default + linger.nixosModules."armv7l-linux".default + pihole.nixosModules."armv7l-linux".default # > Our main nixos configuration file < ./nixos/hosts/wheatley/configuration.nix From 5b0b50214f7316ff6619eba363d10a2ba0144e44 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:41:44 +0100 Subject: [PATCH 0995/2308] Need flake utils --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index d90bf61..a5cd4af 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + flake-utils.url = "github:numtide/flake-utils"; plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.inputs.home-manager.follows = "home-manager"; From 6ec89c025e1b6fd0edee9bf34deb8078d1698075 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:41:44 +0100 Subject: [PATCH 0996/2308] Need flake utils --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index d90bf61..a5cd4af 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + flake-utils.url = "github:numtide/flake-utils"; plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.inputs.home-manager.follows = "home-manager"; From 15dbc98bfec74beae8fe8447725dc497d56a6bac Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:43:06 +0100 Subject: [PATCH 0997/2308] The example had a typo, it's follows not follow --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index a5cd4af..9c77c05 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ pihole = { url = "github:mindsbackyard/pihole-flake"; - inputs.nixpkgs.follow = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; inputs.linger.follows = "linger"; }; From 1c4f8630b75d64fd7340f180210ed26daebb07fe Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:43:06 +0100 Subject: [PATCH 0998/2308] The example had a typo, it's follows not follow --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index a5cd4af..9c77c05 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ pihole = { url = "github:mindsbackyard/pihole-flake"; - inputs.nixpkgs.follow = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; inputs.linger.follows = "linger"; }; From 6b25ff5b5d772660ddec10194aaf5ce828ca1ccb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:43:41 +0100 Subject: [PATCH 0999/2308] Update flake lock --- flake.lock | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/flake.lock b/flake.lock index b3dc17e..a2a20a3 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -107,6 +125,26 @@ "type": "github" } }, + "linger": { + "inputs": { + "flake-utils": [ + "flake-utils" + ] + }, + "locked": { + "lastModified": 1670283645, + "narHash": "sha256-SuC/SuQ8RUaM6RthNAkNTSnlpRXJxEmuym2OyPLLpWk=", + "owner": "mindsbackyard", + "repo": "linger-flake", + "rev": "9f8632c0621dc562dd42e9eacfdb6dae82aebf8b", + "type": "github" + }, + "original": { + "owner": "mindsbackyard", + "repo": "linger-flake", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -270,6 +308,32 @@ "type": "github" } }, + "pihole": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "linger": [ + "linger" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1670284048, + "narHash": "sha256-lNyJ7vrDAdsPVcNBXqDUXseBBL9Kf2q64/A8ntEKXWI=", + "owner": "mindsbackyard", + "repo": "pihole-flake", + "rev": "9daaf65415ad6d3f5a8daa617d8737bc405f9dd8", + "type": "github" + }, + "original": { + "owner": "mindsbackyard", + "repo": "pihole-flake", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -296,10 +360,13 @@ "root": { "inputs": { "extest": "extest", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", + "linger": "linger", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "pihole": "pihole", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" @@ -348,6 +415,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1605370193, From 9cefaea8fac3ed35bf26f847499cd12aefa05bb5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:43:41 +0100 Subject: [PATCH 1000/2308] Update flake lock --- flake.lock | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/flake.lock b/flake.lock index b3dc17e..a2a20a3 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -107,6 +125,26 @@ "type": "github" } }, + "linger": { + "inputs": { + "flake-utils": [ + "flake-utils" + ] + }, + "locked": { + "lastModified": 1670283645, + "narHash": "sha256-SuC/SuQ8RUaM6RthNAkNTSnlpRXJxEmuym2OyPLLpWk=", + "owner": "mindsbackyard", + "repo": "linger-flake", + "rev": "9f8632c0621dc562dd42e9eacfdb6dae82aebf8b", + "type": "github" + }, + "original": { + "owner": "mindsbackyard", + "repo": "linger-flake", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -270,6 +308,32 @@ "type": "github" } }, + "pihole": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "linger": [ + "linger" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1670284048, + "narHash": "sha256-lNyJ7vrDAdsPVcNBXqDUXseBBL9Kf2q64/A8ntEKXWI=", + "owner": "mindsbackyard", + "repo": "pihole-flake", + "rev": "9daaf65415ad6d3f5a8daa617d8737bc405f9dd8", + "type": "github" + }, + "original": { + "owner": "mindsbackyard", + "repo": "pihole-flake", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -296,10 +360,13 @@ "root": { "inputs": { "extest": "extest", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", + "linger": "linger", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "pihole": "pihole", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" @@ -348,6 +415,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1605370193, From bbb88012f41d9a7b0cf86c86aca739e9c6a11db2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:48:09 +0100 Subject: [PATCH 1001/2308] Plasma setup crashes, let's disable it for now --- flake.nix | 2 +- home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 9c77c05..648d797 100644 --- a/flake.nix +++ b/flake.nix @@ -73,7 +73,7 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops - plasma-manager.homeManagerModules.plasma-manager + #plasma-manager.homeManagerModules.plasma-manager home-manager.nixosModules.home-manager ]; }; diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index bf89721..a861636 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -19,7 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop/configuration.nix - ./package-configs/plasma-desktop/configuration.nix + #./package-configs/plasma-desktop/configuration.nix ]; home.packages = with pkgs; [ From 00ab03d64d22d6559b4638a030966bee653d8a23 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Jan 2024 17:48:09 +0100 Subject: [PATCH 1002/2308] Plasma setup crashes, let's disable it for now --- flake.nix | 2 +- home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 9c77c05..648d797 100644 --- a/flake.nix +++ b/flake.nix @@ -73,7 +73,7 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops - plasma-manager.homeManagerModules.plasma-manager + #plasma-manager.homeManagerModules.plasma-manager home-manager.nixosModules.home-manager ]; }; diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index bf89721..a861636 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -19,7 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop/configuration.nix - ./package-configs/plasma-desktop/configuration.nix + #./package-configs/plasma-desktop/configuration.nix ]; home.packages = with pkgs; [ From c9ac78a81a6695264eda8f06bcbbab701f907a5b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 14 Jan 2024 15:58:21 +0100 Subject: [PATCH 1003/2308] Small refactor, try and mount the other drive on /boot for wheatley --- .../package-configs/pi-hole/configuration.nix | 35 +++++++++++++++++++ nixos/hosts/wheatley/configuration.nix | 29 +-------------- .../hosts/wheatley/hardware-configuration.nix | 19 ++++++++-- 3 files changed, 52 insertions(+), 31 deletions(-) create mode 100644 nixos/board/package-configs/pi-hole/configuration.nix diff --git a/nixos/board/package-configs/pi-hole/configuration.nix b/nixos/board/package-configs/pi-hole/configuration.nix new file mode 100644 index 0000000..7ce2716 --- /dev/null +++ b/nixos/board/package-configs/pi-hole/configuration.nix @@ -0,0 +1,35 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + services.pihole = { + enable = true; + hostConfig = { + # define the service user for running the rootless Pi-hole container + user = "pihole"; + enableLingeringForUser = true; + + # we want to persist change to the Pi-hole configuration & logs across service restarts + # check the option descriptions for more information + persistVolumes = true; + + # expose DNS & the web interface on unpriviledged ports on all IP addresses of the host + # check the option descriptions for more information + dnsPort = 5335; + webProt = 8080; + }; + piholeConfig.ftl = { + # assuming that the host has this (fixed) IP and should resolve "pi.hole" to this address + # check the option description & the FTLDNS documentation for more information + LOCAL_IPV4 = "192.168.0.2"; + }; + piholeCOnfig.web = { + virtualHost = "pi.hole"; + password = "password"; + }; + }; +} diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index dd6adbd..1c45303 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -82,33 +82,6 @@ }; }; - services.pihole = { - enable = true; - hostConfig = { - # define the service user for running the rootless Pi-hole container - user = "pihole"; - enableLingeringForUser = true; - - # we want to persist change to the Pi-hole configuration & logs across service restarts - # check the option descriptions for more information - persistVolumes = true; - - # expose DNS & the web interface on unpriviledged ports on all IP addresses of the host - # check the option descriptions for more information - dnsPort = 5335; - webProt = 8080; - }; - piholeConfig.ftl = { - # assuming that the host has this (fixed) IP and should resolve "pi.hole" to this address - # check the option description & the FTLDNS documentation for more information - LOCAL_IPV4 = "192.168.0.2"; - }; - piholeCOnfig.web = { - virtualHost = "pi.hole"; - password = "password"; - }; - }; - networking.wireless.enable = true; networking.wireless.environmentFile = config.sops.secrets."wireless.env".path; networking.wireless.networks."KPNAA6306" = { @@ -158,7 +131,7 @@ networking.hostName = "wheatley"; # Define your hostname - networking.wireless.interfaces = ["wlan0"]; + networking.wireless.interfaces = ["enu1u1"]; # powerManagement.cpuFreqGovernor = "powersave"; powerManagement.cpufreq.max = 648000; diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index a96194a..466da96 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -17,9 +17,20 @@ boot.kernelModules = []; boot.extraModulePackages = []; - fileSystems."/" = { - device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; - fsType = "ext4"; + fileSystems = { + # Prior to 19.09, the boot partition was hosted on the smaller first partition + # Starting with 19.09, the /boot folder is on the main bigger partition. + # The following is to be used only with older images. Note such old images should not be considered supported anymore whatsoever, but if you installed back then, this might be needed + + "/boot" = { + device = "/dev/disk/by-label/FIRMWARE"; + fsType = "vfat"; + }; + + "/" = { + device = "/dev/disk/by-label/NIXOS_SD"; + fsType = "ext4"; + }; }; swapDevices = [{device = "/dev/disk/by-uuid/4c9c8850-5e2e-4b4b-8ebb-4d7306012535";}]; @@ -35,4 +46,6 @@ # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "armv7l-linux"; + + powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; } From 04bebfaebb67aa7fcc0687e16b87699a18cf0c38 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 14 Jan 2024 15:58:21 +0100 Subject: [PATCH 1004/2308] Small refactor, try and mount the other drive on /boot for wheatley --- .../package-configs/pi-hole/configuration.nix | 35 +++++++++++++++++++ nixos/hosts/wheatley/configuration.nix | 29 +-------------- .../hosts/wheatley/hardware-configuration.nix | 19 ++++++++-- 3 files changed, 52 insertions(+), 31 deletions(-) create mode 100644 nixos/board/package-configs/pi-hole/configuration.nix diff --git a/nixos/board/package-configs/pi-hole/configuration.nix b/nixos/board/package-configs/pi-hole/configuration.nix new file mode 100644 index 0000000..7ce2716 --- /dev/null +++ b/nixos/board/package-configs/pi-hole/configuration.nix @@ -0,0 +1,35 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + services.pihole = { + enable = true; + hostConfig = { + # define the service user for running the rootless Pi-hole container + user = "pihole"; + enableLingeringForUser = true; + + # we want to persist change to the Pi-hole configuration & logs across service restarts + # check the option descriptions for more information + persistVolumes = true; + + # expose DNS & the web interface on unpriviledged ports on all IP addresses of the host + # check the option descriptions for more information + dnsPort = 5335; + webProt = 8080; + }; + piholeConfig.ftl = { + # assuming that the host has this (fixed) IP and should resolve "pi.hole" to this address + # check the option description & the FTLDNS documentation for more information + LOCAL_IPV4 = "192.168.0.2"; + }; + piholeCOnfig.web = { + virtualHost = "pi.hole"; + password = "password"; + }; + }; +} diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index dd6adbd..1c45303 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -82,33 +82,6 @@ }; }; - services.pihole = { - enable = true; - hostConfig = { - # define the service user for running the rootless Pi-hole container - user = "pihole"; - enableLingeringForUser = true; - - # we want to persist change to the Pi-hole configuration & logs across service restarts - # check the option descriptions for more information - persistVolumes = true; - - # expose DNS & the web interface on unpriviledged ports on all IP addresses of the host - # check the option descriptions for more information - dnsPort = 5335; - webProt = 8080; - }; - piholeConfig.ftl = { - # assuming that the host has this (fixed) IP and should resolve "pi.hole" to this address - # check the option description & the FTLDNS documentation for more information - LOCAL_IPV4 = "192.168.0.2"; - }; - piholeCOnfig.web = { - virtualHost = "pi.hole"; - password = "password"; - }; - }; - networking.wireless.enable = true; networking.wireless.environmentFile = config.sops.secrets."wireless.env".path; networking.wireless.networks."KPNAA6306" = { @@ -158,7 +131,7 @@ networking.hostName = "wheatley"; # Define your hostname - networking.wireless.interfaces = ["wlan0"]; + networking.wireless.interfaces = ["enu1u1"]; # powerManagement.cpuFreqGovernor = "powersave"; powerManagement.cpufreq.max = 648000; diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index a96194a..466da96 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -17,9 +17,20 @@ boot.kernelModules = []; boot.extraModulePackages = []; - fileSystems."/" = { - device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; - fsType = "ext4"; + fileSystems = { + # Prior to 19.09, the boot partition was hosted on the smaller first partition + # Starting with 19.09, the /boot folder is on the main bigger partition. + # The following is to be used only with older images. Note such old images should not be considered supported anymore whatsoever, but if you installed back then, this might be needed + + "/boot" = { + device = "/dev/disk/by-label/FIRMWARE"; + fsType = "vfat"; + }; + + "/" = { + device = "/dev/disk/by-label/NIXOS_SD"; + fsType = "ext4"; + }; }; swapDevices = [{device = "/dev/disk/by-uuid/4c9c8850-5e2e-4b4b-8ebb-4d7306012535";}]; @@ -35,4 +46,6 @@ # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "armv7l-linux"; + + powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; } From 16b448974dde8bdba566d858b10ec3f6098b504d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 14 Jan 2024 16:04:20 +0100 Subject: [PATCH 1005/2308] Disable pihole for now --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 648d797..7342ca4 100644 --- a/flake.nix +++ b/flake.nix @@ -109,8 +109,8 @@ specialArgs = {inherit inputs outputs;}; modules = [ # make the module declared by the linger flake available to our config - linger.nixosModules."armv7l-linux".default - pihole.nixosModules."armv7l-linux".default + #linger.nixosModules."armv7l-linux".default + #pihole.nixosModules."armv7l-linux".default # > Our main nixos configuration file < ./nixos/hosts/wheatley/configuration.nix From 37ba176eb35987f0c1c0c4c415a4d9f2196848e6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 14 Jan 2024 16:04:20 +0100 Subject: [PATCH 1006/2308] Disable pihole for now --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 648d797..7342ca4 100644 --- a/flake.nix +++ b/flake.nix @@ -109,8 +109,8 @@ specialArgs = {inherit inputs outputs;}; modules = [ # make the module declared by the linger flake available to our config - linger.nixosModules."armv7l-linux".default - pihole.nixosModules."armv7l-linux".default + #linger.nixosModules."armv7l-linux".default + #pihole.nixosModules."armv7l-linux".default # > Our main nixos configuration file < ./nixos/hosts/wheatley/configuration.nix From 19580f878ca15d93e33a098db9902f7d1f34751d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 14 Jan 2024 16:07:44 +0100 Subject: [PATCH 1007/2308] Option has been renamed --- nixos/hosts/wheatley/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 1c45303..c63ac2a 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -18,7 +18,7 @@ boot.loader.generic-extlinux-compatible.enable = true; boot.loader.grub.enable = false; - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; # boot.extraModulePackages = [ # (pkgs.callPackage ./rtl8189es.nix { From 3fbd12818bfb83272d05a8e02e3d5c2d88fa868b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 14 Jan 2024 16:07:44 +0100 Subject: [PATCH 1008/2308] Option has been renamed --- nixos/hosts/wheatley/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 1c45303..c63ac2a 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -18,7 +18,7 @@ boot.loader.generic-extlinux-compatible.enable = true; boot.loader.grub.enable = false; - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; # boot.extraModulePackages = [ # (pkgs.callPackage ./rtl8189es.nix { From 049ab1f01f097468fee3eeb0a7ca84e9ac7510e5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Jan 2024 16:29:44 +0100 Subject: [PATCH 1009/2308] Add armv7l kernel patch --- home-manager/hosts/wheatley/armv7l.nix | 20 ++++++++++++++++++++ nixos/hosts/wheatley/configuration.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 home-manager/hosts/wheatley/armv7l.nix diff --git a/home-manager/hosts/wheatley/armv7l.nix b/home-manager/hosts/wheatley/armv7l.nix new file mode 100644 index 0000000..e6a9f37 --- /dev/null +++ b/home-manager/hosts/wheatley/armv7l.nix @@ -0,0 +1,20 @@ +{ + config, + pkgs, + ... +}: { + boot.kernelPatches = [ + rec { + name = "compat_uts_machine"; + patch = pkgs.fetchpatch { + inherit name; + url = "https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/jammy/patch/?id=c1da50fa6eddad313360249cadcd4905ac9f82ea"; + sha256 = "sha256-357+EzMLLt7IINdH0ENE+VcDXwXJMo4qiF/Dorp2Eyw="; + }; + } + ]; + boot.kernelParams = [ + "compat_uts_machine=armv7l" + ]; + nix.settings.extra-platforms = "armv7l-linux"; +} diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index c63ac2a..3254263 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -12,6 +12,7 @@ imports = [ inputs.home-manager.nixosModules.home-manager + ./armv7l.nix ./hardware-configuration.nix ../../shared/locale/configuration.nix ]; From 8622d9967f238c346a907ee2b90e504d7cbfb6f9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Jan 2024 16:29:44 +0100 Subject: [PATCH 1010/2308] Add armv7l kernel patch --- home-manager/hosts/wheatley/armv7l.nix | 20 ++++++++++++++++++++ nixos/hosts/wheatley/configuration.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 home-manager/hosts/wheatley/armv7l.nix diff --git a/home-manager/hosts/wheatley/armv7l.nix b/home-manager/hosts/wheatley/armv7l.nix new file mode 100644 index 0000000..e6a9f37 --- /dev/null +++ b/home-manager/hosts/wheatley/armv7l.nix @@ -0,0 +1,20 @@ +{ + config, + pkgs, + ... +}: { + boot.kernelPatches = [ + rec { + name = "compat_uts_machine"; + patch = pkgs.fetchpatch { + inherit name; + url = "https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/jammy/patch/?id=c1da50fa6eddad313360249cadcd4905ac9f82ea"; + sha256 = "sha256-357+EzMLLt7IINdH0ENE+VcDXwXJMo4qiF/Dorp2Eyw="; + }; + } + ]; + boot.kernelParams = [ + "compat_uts_machine=armv7l" + ]; + nix.settings.extra-platforms = "armv7l-linux"; +} diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index c63ac2a..3254263 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -12,6 +12,7 @@ imports = [ inputs.home-manager.nixosModules.home-manager + ./armv7l.nix ./hardware-configuration.nix ../../shared/locale/configuration.nix ]; From ed5c92b3b929167ae23000f65ade3ccbc0d9be2f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Jan 2024 16:30:57 +0100 Subject: [PATCH 1011/2308] Wrong location for that file --- {home-manager => nixos}/hosts/wheatley/armv7l.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {home-manager => nixos}/hosts/wheatley/armv7l.nix (100%) diff --git a/home-manager/hosts/wheatley/armv7l.nix b/nixos/hosts/wheatley/armv7l.nix similarity index 100% rename from home-manager/hosts/wheatley/armv7l.nix rename to nixos/hosts/wheatley/armv7l.nix From a2c53f92becb7d198639411988cf3950fc9a7ec1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Jan 2024 16:30:57 +0100 Subject: [PATCH 1012/2308] Wrong location for that file --- {home-manager => nixos}/hosts/wheatley/armv7l.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {home-manager => nixos}/hosts/wheatley/armv7l.nix (100%) diff --git a/home-manager/hosts/wheatley/armv7l.nix b/nixos/hosts/wheatley/armv7l.nix similarity index 100% rename from home-manager/hosts/wheatley/armv7l.nix rename to nixos/hosts/wheatley/armv7l.nix From f29244c12e2ec02749a53e78bf3378b670e2ae0c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Jan 2024 16:49:22 +0100 Subject: [PATCH 1013/2308] It's WPA-PSK not WPA --- nixos/hosts/wheatley/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 3254263..7526a02 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -88,7 +88,7 @@ networking.wireless.networks."KPNAA6306" = { hidden = true; auth = '' - key_mgmt=WPA + key_mgmt=WPA-PSK password="@PSK_HOME@" ''; }; From 927846da848a669b0f65e913c7f3e8466c90f2c5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Jan 2024 16:49:22 +0100 Subject: [PATCH 1014/2308] It's WPA-PSK not WPA --- nixos/hosts/wheatley/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 3254263..7526a02 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -88,7 +88,7 @@ networking.wireless.networks."KPNAA6306" = { hidden = true; auth = '' - key_mgmt=WPA + key_mgmt=WPA-PSK password="@PSK_HOME@" ''; }; From 2c58de2b865de963fdedb41b6654e54095a40312 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Jan 2024 17:01:30 +0100 Subject: [PATCH 1015/2308] Changed the swap by accident, and removed the boot folder, that's clearly not the issue --- nixos/hosts/wheatley/hardware-configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index 466da96..f7ea389 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -22,10 +22,10 @@ # Starting with 19.09, the /boot folder is on the main bigger partition. # The following is to be used only with older images. Note such old images should not be considered supported anymore whatsoever, but if you installed back then, this might be needed - "/boot" = { - device = "/dev/disk/by-label/FIRMWARE"; - fsType = "vfat"; - }; + # "/boot" = { + # device = "/dev/disk/by-label/FIRMWARE"; + # fsType = "vfat"; + # }; "/" = { device = "/dev/disk/by-label/NIXOS_SD"; @@ -33,7 +33,7 @@ }; }; - swapDevices = [{device = "/dev/disk/by-uuid/4c9c8850-5e2e-4b4b-8ebb-4d7306012535";}]; + swapDevices = [{device = "/dev/disk/by-uuid/b299ad0d-37a0-43d6-9647-5f717aca7b3";}]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From 98bb68ea1d5a1ed445e30a8b9b2befe54bf6c6e8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Jan 2024 17:01:30 +0100 Subject: [PATCH 1016/2308] Changed the swap by accident, and removed the boot folder, that's clearly not the issue --- nixos/hosts/wheatley/hardware-configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index 466da96..f7ea389 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -22,10 +22,10 @@ # Starting with 19.09, the /boot folder is on the main bigger partition. # The following is to be used only with older images. Note such old images should not be considered supported anymore whatsoever, but if you installed back then, this might be needed - "/boot" = { - device = "/dev/disk/by-label/FIRMWARE"; - fsType = "vfat"; - }; + # "/boot" = { + # device = "/dev/disk/by-label/FIRMWARE"; + # fsType = "vfat"; + # }; "/" = { device = "/dev/disk/by-label/NIXOS_SD"; @@ -33,7 +33,7 @@ }; }; - swapDevices = [{device = "/dev/disk/by-uuid/4c9c8850-5e2e-4b4b-8ebb-4d7306012535";}]; + swapDevices = [{device = "/dev/disk/by-uuid/b299ad0d-37a0-43d6-9647-5f717aca7b3";}]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From d8389c5d898bfbe86c0116efed8d2387a976829b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 09:56:38 +0100 Subject: [PATCH 1017/2308] Add htop to all hosts --- nixos/desktop/configuration.nix | 1 + nixos/hosts/queen/configuration.nix | 1 + nixos/hosts/shodan/configuration.nix | 1 + nixos/hosts/wheatley/configuration.nix | 1 + 4 files changed, 4 insertions(+) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index cc615c7..3f2e3f4 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -63,6 +63,7 @@ docker-compose git-filter-repo home-manager + htop oh-my-zsh pciutils rsync diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index b8d0f59..2bef11c 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -100,6 +100,7 @@ aria2 git-filter-repo home-manager + htop jellyfin jellyfin-web jellyfin-ffmpeg diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index a73682d..7e032ea 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -83,6 +83,7 @@ git git-filter-repo home-manager + htop noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 7526a02..0cda305 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -55,6 +55,7 @@ environment.systemPackages = with pkgs; [ age git + htop ]; boot.kernelParams = [ From 6e5c6dbf847234519b19202afe321509ee889c74 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 09:56:38 +0100 Subject: [PATCH 1018/2308] Add htop to all hosts --- nixos/desktop/configuration.nix | 1 + nixos/hosts/queen/configuration.nix | 1 + nixos/hosts/shodan/configuration.nix | 1 + nixos/hosts/wheatley/configuration.nix | 1 + 4 files changed, 4 insertions(+) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index cc615c7..3f2e3f4 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -63,6 +63,7 @@ docker-compose git-filter-repo home-manager + htop oh-my-zsh pciutils rsync diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index b8d0f59..2bef11c 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -100,6 +100,7 @@ aria2 git-filter-repo home-manager + htop jellyfin jellyfin-web jellyfin-ffmpeg diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index a73682d..7e032ea 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -83,6 +83,7 @@ git git-filter-repo home-manager + htop noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 7526a02..0cda305 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -55,6 +55,7 @@ environment.systemPackages = with pkgs; [ age git + htop ]; boot.kernelParams = [ From 889e9268493089e1dc95258b761ed1c89a58c530 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 09:58:25 +0100 Subject: [PATCH 1019/2308] Update flake lock --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index a2a20a3..d210982 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1704980804, - "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", + "lastModified": 1705392270, + "narHash": "sha256-Y11fcK0ETTpfBxJ58w9amqTKuJSQ+lSs6nIV8DoplKo=", "owner": "nix-community", "repo": "home-manager", - "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", + "rev": "bf4b576f84e1ce54ec886836bae7695738aa5a6c", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1704665257, - "narHash": "sha256-Cycz00I26e8QZ9sZtCz0uIz6Cad5ld3zM7N2I+5beqI=", + "lastModified": 1705231543, + "narHash": "sha256-W8j0A5n2WOpCgdFRqMqwd9adNORcN1r/DpjRVxiFkAw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8951673c6c216ddd6bac3db3e88e3f2281b3511a", + "rev": "ab807f9740c533070e8b68b0d86034d4a293b5f1", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1705303754, + "narHash": "sha256-loWkd7lUzSvGBU9xnva37iPB2rr5ulq1qBLT44KjzGA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "e0629618b4b419a47e2c8a3cab223e2a7f3a8f97", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -247,11 +247,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -294,11 +294,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1704927112, - "narHash": "sha256-AKTE0TczctkgAj3FGnslPrDZP0A9FDlRITv+aV2Agsg=", + "lastModified": 1705257805, + "narHash": "sha256-hx88TjxRWR9hEYrePm2aR/rKAu4VFx4irgN7AofE0Wg=", "owner": "pjones", "repo": "plasma-manager", - "rev": "06ad8e693009a64b58156b8b55e347defe759970", + "rev": "87ca0e29c6fccfb7f09be6ff137716db5a7c8d8f", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704908274, - "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", + "lastModified": 1705356877, + "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", + "rev": "87755331580fdf23df7e39b46d63ac88236bf42c", "type": "github" }, "original": { From 5cb3617f663a31a53735ea518538abcfd3f8cfe1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 09:58:25 +0100 Subject: [PATCH 1020/2308] Update flake lock --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index a2a20a3..d210982 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1704980804, - "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", + "lastModified": 1705392270, + "narHash": "sha256-Y11fcK0ETTpfBxJ58w9amqTKuJSQ+lSs6nIV8DoplKo=", "owner": "nix-community", "repo": "home-manager", - "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", + "rev": "bf4b576f84e1ce54ec886836bae7695738aa5a6c", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1704665257, - "narHash": "sha256-Cycz00I26e8QZ9sZtCz0uIz6Cad5ld3zM7N2I+5beqI=", + "lastModified": 1705231543, + "narHash": "sha256-W8j0A5n2WOpCgdFRqMqwd9adNORcN1r/DpjRVxiFkAw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8951673c6c216ddd6bac3db3e88e3f2281b3511a", + "rev": "ab807f9740c533070e8b68b0d86034d4a293b5f1", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1705303754, + "narHash": "sha256-loWkd7lUzSvGBU9xnva37iPB2rr5ulq1qBLT44KjzGA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "e0629618b4b419a47e2c8a3cab223e2a7f3a8f97", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -247,11 +247,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -294,11 +294,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1704927112, - "narHash": "sha256-AKTE0TczctkgAj3FGnslPrDZP0A9FDlRITv+aV2Agsg=", + "lastModified": 1705257805, + "narHash": "sha256-hx88TjxRWR9hEYrePm2aR/rKAu4VFx4irgN7AofE0Wg=", "owner": "pjones", "repo": "plasma-manager", - "rev": "06ad8e693009a64b58156b8b55e347defe759970", + "rev": "87ca0e29c6fccfb7f09be6ff137716db5a7c8d8f", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704908274, - "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", + "lastModified": 1705356877, + "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", + "rev": "87755331580fdf23df7e39b46d63ac88236bf42c", "type": "github" }, "original": { From f402261f20963af4c9b678a41306cc3b6468c289 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 10:01:46 +0100 Subject: [PATCH 1021/2308] Remove sqlfluff --- nixos/desktop/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 3f2e3f4..07c9017 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -67,7 +67,6 @@ oh-my-zsh pciutils rsync - sqlfluff wget zsh From 5e7f36ced97651e47c055aade540ce611f13dc93 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 10:01:46 +0100 Subject: [PATCH 1022/2308] Remove sqlfluff --- nixos/desktop/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 3f2e3f4..07c9017 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -67,7 +67,6 @@ oh-my-zsh pciutils rsync - sqlfluff wget zsh From 40896d86fd464aa2e66ab71689e946023cd940ab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 12:29:40 +0100 Subject: [PATCH 1023/2308] Limit boot entries to 5 in wheatley (revert this if the build fails!) --- nixos/hosts/wheatley/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 0cda305..047f261 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -18,6 +18,7 @@ ]; boot.loader.generic-extlinux-compatible.enable = true; + boot.loader.generic-extlinux-compatible.configurationLimit = 5; boot.loader.grub.enable = false; boot.tmp.cleanOnBoot = true; From e96076f25d21e50422e58e6c7cf3e14b37e5cfc0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 12:29:40 +0100 Subject: [PATCH 1024/2308] Limit boot entries to 5 in wheatley (revert this if the build fails!) --- nixos/hosts/wheatley/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 0cda305..047f261 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -18,6 +18,7 @@ ]; boot.loader.generic-extlinux-compatible.enable = true; + boot.loader.generic-extlinux-compatible.configurationLimit = 5; boot.loader.grub.enable = false; boot.tmp.cleanOnBoot = true; From a6b3498653bcebb1c41f91b5adf04d505c944efa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 13:37:30 +0100 Subject: [PATCH 1025/2308] add plasma configuration for EDI --- .../plasma-desktop/configuration.nix | 872 ++++++++++++++++++ 1 file changed, 872 insertions(+) create mode 100644 home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix new file mode 100644 index 0000000..a63f9d0 --- /dev/null +++ b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix @@ -0,0 +1,872 @@ +{ + programs.plasma = { + enable = true; + shortcuts = { + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; + "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; + "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; + "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kded5"."Show System Activity" = "Ctrl+Esc"; + "kded5"."display" = ["Display" "Meta+P"]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; + "kmix"."decrease_volume" = "Volume Down"; + "kmix"."increase_microphone_volume" = "Microphone Volume Up"; + "kmix"."increase_volume" = "Volume Up"; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mute" = "Volume Mute"; + "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Log Out" = "Ctrl+Alt+Del"; + "ksmserver"."Log Out Without Confirmation" = [ ]; + "ksmserver"."Reboot Without Confirmation" = [ ]; + "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Decrease Opacity" = [ ]; + "kwin"."Edit Tiles" = "Meta+T"; + "kwin"."Expose" = "Ctrl+F9"; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = [ ]; + "kwin"."Increase Opacity" = [ ]; + "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."MoveMouseToCenter" = "Meta+F6"; + "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = [ ]; + "kwin"."MoveZoomLeft" = [ ]; + "kwin"."MoveZoomRight" = [ ]; + "kwin"."MoveZoomUp" = [ ]; + "kwin"."Overview" = "Meta+W"; + "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Show Desktop" = "Meta+D"; + "kwin"."ShowDesktopGrid" = "Meta+F8"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12"; + "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; + "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; + "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; + "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; + "kwin"."Switch Window Down" = "Meta+Alt+Down"; + "kwin"."Switch Window Left" = "Meta+Alt+Left"; + "kwin"."Switch Window Right" = "Meta+Alt+Right"; + "kwin"."Switch Window Up" = "Meta+Alt+Up"; + "kwin"."Switch to Desktop 1" = "Ctrl+F1"; + "kwin"."Switch to Desktop 10" = [ ]; + "kwin"."Switch to Desktop 11" = [ ]; + "kwin"."Switch to Desktop 12" = [ ]; + "kwin"."Switch to Desktop 13" = [ ]; + "kwin"."Switch to Desktop 14" = [ ]; + "kwin"."Switch to Desktop 15" = [ ]; + "kwin"."Switch to Desktop 16" = [ ]; + "kwin"."Switch to Desktop 17" = [ ]; + "kwin"."Switch to Desktop 18" = [ ]; + "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 2" = "Ctrl+F2"; + "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 3" = "Ctrl+F3"; + "kwin"."Switch to Desktop 4" = "Ctrl+F4"; + "kwin"."Switch to Desktop 5" = [ ]; + "kwin"."Switch to Desktop 6" = [ ]; + "kwin"."Switch to Desktop 7" = [ ]; + "kwin"."Switch to Desktop 8" = [ ]; + "kwin"."Switch to Desktop 9" = [ ]; + "kwin"."Switch to Next Desktop" = [ ]; + "kwin"."Switch to Next Screen" = [ ]; + "kwin"."Switch to Previous Desktop" = [ ]; + "kwin"."Switch to Previous Screen" = [ ]; + "kwin"."Switch to Screen 0" = [ ]; + "kwin"."Switch to Screen 1" = [ ]; + "kwin"."Switch to Screen 2" = [ ]; + "kwin"."Switch to Screen 3" = [ ]; + "kwin"."Switch to Screen 4" = [ ]; + "kwin"."Switch to Screen 5" = [ ]; + "kwin"."Switch to Screen 6" = [ ]; + "kwin"."Switch to Screen 7" = [ ]; + "kwin"."Switch to Screen Above" = [ ]; + "kwin"."Switch to Screen Below" = [ ]; + "kwin"."Switch to Screen to the Left" = [ ]; + "kwin"."Switch to Screen to the Right" = [ ]; + "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Window Raise/Lower" = [ ]; + "kwin"."Walk Through Desktop List" = [ ]; + "kwin"."Walk Through Desktop List (Reverse)" = [ ]; + "kwin"."Walk Through Desktops" = [ ]; + "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Walk Through Windows" = "Alt+Tab"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; + "kwin"."Walk Through Windows Alternative" = [ ]; + "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; + "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; + "kwin"."Window Above Other Windows" = [ ]; + "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Window Close" = "Alt+F4"; + "kwin"."Window Fullscreen" = [ ]; + "kwin"."Window Grow Horizontal" = [ ]; + "kwin"."Window Grow Vertical" = [ ]; + "kwin"."Window Lower" = [ ]; + "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = [ ]; + "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = [ ]; + "kwin"."Window Move Center" = [ ]; + "kwin"."Window No Border" = [ ]; + "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; + "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; + "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; + "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = [ ]; + "kwin"."Window One Screen Up" = [ ]; + "kwin"."Window One Screen to the Left" = [ ]; + "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window Operations Menu" = "Alt+F3"; + "kwin"."Window Pack Down" = [ ]; + "kwin"."Window Pack Left" = [ ]; + "kwin"."Window Pack Right" = [ ]; + "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Quick Tile Bottom" = "Meta+Down"; + "kwin"."Window Quick Tile Bottom Left" = [ ]; + "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Left" = "Meta+Left"; + "kwin"."Window Quick Tile Right" = "Meta+Right"; + "kwin"."Window Quick Tile Top" = "Meta+Up"; + "kwin"."Window Quick Tile Top Left" = [ ]; + "kwin"."Window Quick Tile Top Right" = [ ]; + "kwin"."Window Raise" = [ ]; + "kwin"."Window Resize" = [ ]; + "kwin"."Window Shade" = [ ]; + "kwin"."Window Shrink Horizontal" = [ ]; + "kwin"."Window Shrink Vertical" = [ ]; + "kwin"."Window to Desktop 1" = [ ]; + "kwin"."Window to Desktop 10" = [ ]; + "kwin"."Window to Desktop 11" = [ ]; + "kwin"."Window to Desktop 12" = [ ]; + "kwin"."Window to Desktop 13" = [ ]; + "kwin"."Window to Desktop 14" = [ ]; + "kwin"."Window to Desktop 15" = [ ]; + "kwin"."Window to Desktop 16" = [ ]; + "kwin"."Window to Desktop 17" = [ ]; + "kwin"."Window to Desktop 18" = [ ]; + "kwin"."Window to Desktop 19" = [ ]; + "kwin"."Window to Desktop 2" = [ ]; + "kwin"."Window to Desktop 20" = [ ]; + "kwin"."Window to Desktop 3" = [ ]; + "kwin"."Window to Desktop 4" = [ ]; + "kwin"."Window to Desktop 5" = [ ]; + "kwin"."Window to Desktop 6" = [ ]; + "kwin"."Window to Desktop 7" = [ ]; + "kwin"."Window to Desktop 8" = [ ]; + "kwin"."Window to Desktop 9" = [ ]; + "kwin"."Window to Next Desktop" = [ ]; + "kwin"."Window to Next Screen" = [ ]; + "kwin"."Window to Previous Desktop" = [ ]; + "kwin"."Window to Previous Screen" = [ ]; + "kwin"."Window to Screen 0" = [ ]; + "kwin"."Window to Screen 1" = [ ]; + "kwin"."Window to Screen 2" = [ ]; + "kwin"."Window to Screen 3" = [ ]; + "kwin"."Window to Screen 4" = [ ]; + "kwin"."Window to Screen 5" = [ ]; + "kwin"."Window to Screen 6" = [ ]; + "kwin"."Window to Screen 7" = [ ]; + "kwin"."view_actual_size" = "Meta+0"; + "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; + "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."nextmedia" = "Media Next"; + "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playpausemedia" = "Media Play"; + "mediacontrol"."previousmedia" = "Media Previous"; + "mediacontrol"."stopmedia" = "Media Stop"; + "org.kde.dolphin.desktop"."_launch" = "Meta+E"; + "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; + "org.kde.konsole.desktop"."NewTab" = [ ]; + "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; + "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; + "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; + "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; + "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "org.kde.spectacle.desktop"."_launch" = "Print"; + "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Hibernate" = "Hibernate"; + "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."PowerDown" = "Power Down"; + "org_kde_powerdevil"."PowerOff" = "Power Off"; + "org_kde_powerdevil"."Sleep" = "Sleep"; + "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; + "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "plasmashell"."activate task manager entry 1" = "Meta+1"; + "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 2" = "Meta+2"; + "plasmashell"."activate task manager entry 3" = "Meta+3"; + "plasmashell"."activate task manager entry 4" = "Meta+4"; + "plasmashell"."activate task manager entry 5" = "Meta+5"; + "plasmashell"."activate task manager entry 6" = "Meta+6"; + "plasmashell"."activate task manager entry 7" = "Meta+7"; + "plasmashell"."activate task manager entry 8" = "Meta+8"; + "plasmashell"."activate task manager entry 9" = "Meta+9"; + "plasmashell"."clear-history" = [ ]; + "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; + "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = [ ]; + "plasmashell"."cyclePrevAction" = [ ]; + "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."manage activities" = "Meta+Q"; + "plasmashell"."next activity" = "Meta+Tab"; + "plasmashell"."previous activity" = "Meta+Shift+Tab"; + "plasmashell"."repeat_action" = "Meta+Ctrl+R"; + "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-on-mouse-pos" = "Meta+V"; + "plasmashell"."stop current activity" = "Meta+S"; + "plasmashell"."switch to next activity" = [ ]; + "plasmashell"."switch to previous activity" = [ ]; + "plasmashell"."toggle do not disturb" = [ ]; + "systemsettings.desktop"."_launch" = "Tools"; + "systemsettings.desktop"."kcm-kscreen" = [ ]; + "systemsettings.desktop"."kcm-lookandfeel" = [ ]; + "systemsettings.desktop"."kcm-users" = [ ]; + "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; + "systemsettings.desktop"."screenlocker" = [ ]; + }; + configFile = { + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 8; + "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; + "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; + "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; + "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; + "kdeglobals"."KDE"."SingleClick" = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Preview" = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; + "kdeglobals"."WM"."activeBackground" = "49,54,59"; + "kdeglobals"."WM"."activeBlend" = "252,252,252"; + "kdeglobals"."WM"."activeForeground" = "252,252,252"; + "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; + "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; + "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; + "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; + "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; + "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; + "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; + "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; + "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; + "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; + "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; + "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; + "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; + "kglobalshortcutsrc"."org.kde.kcalc.desktop"."_k_friendly_name" = "KCalc"; + "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; + "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; + "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Emoji Selector"; + "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Power Management"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; + "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "System Settings"; + "khotkeysrc"."Data"."DataCount" = 3; + "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; + "khotkeysrc"."Data_1"."DataCount" = 1; + "khotkeysrc"."Data_1"."Enabled" = true; + "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; + "khotkeysrc"."Data_1"."SystemGroup" = 1; + "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1"."Comment" = "Comment"; + "khotkeysrc"."Data_1_1"."Enabled" = true; + "khotkeysrc"."Data_1_1"."Name" = "Search"; + "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; + "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; + "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; + "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; + "khotkeysrc"."Data_2"."DataCount" = 8; + "khotkeysrc"."Data_2"."Enabled" = false; + "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; + "khotkeysrc"."Data_2"."Name" = "Examples"; + "khotkeysrc"."Data_2"."SystemGroup" = 0; + "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; + "khotkeysrc"."Data_2_1"."Enabled" = false; + "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; + "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; + "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; + "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; + "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; + "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; + "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; + "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; + "khotkeysrc"."Data_2_2"."Enabled" = false; + "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; + "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; + "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; + "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; + "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; + "khotkeysrc"."Data_2_3"."Enabled" = false; + "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; + "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; + "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; + "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; + "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; + "khotkeysrc"."Data_2_4"."Enabled" = false; + "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; + "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; + "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; + "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; + "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; + "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; + "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; + "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; + "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; + "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; + "khotkeysrc"."Data_2_5"."Enabled" = false; + "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; + "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; + "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; + "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; + "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; + "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; + "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; + "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; + "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; + "khotkeysrc"."Data_2_6"."Enabled" = false; + "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; + "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; + "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; + "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; + "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; + "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; + "khotkeysrc"."Data_2_7"."DataCount" = 4; + "khotkeysrc"."Data_2_7"."Enabled" = false; + "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; + "khotkeysrc"."Data_2_7"."SystemGroup" = 0; + "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_7_1"."Comment" = ""; + "khotkeysrc"."Data_2_7_1"."Enabled" = false; + "khotkeysrc"."Data_2_7_1"."Name" = "Back"; + "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2"."Comment" = ""; + "khotkeysrc"."Data_2_7_2"."Enabled" = false; + "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; + "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3"."Comment" = ""; + "khotkeysrc"."Data_2_7_3"."Enabled" = false; + "khotkeysrc"."Data_2_7_3"."Name" = "Up"; + "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4"."Comment" = ""; + "khotkeysrc"."Data_2_7_4"."Enabled" = false; + "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; + "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; + "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; + "khotkeysrc"."Data_2_8"."Enabled" = false; + "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; + "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; + "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; + "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; + "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; + "khotkeysrc"."Data_3"."DataCount" = 14; + "khotkeysrc"."Data_3"."Enabled" = true; + "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; + "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; + "khotkeysrc"."Data_3"."SystemGroup" = 0; + "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; + "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; + "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; + "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; + "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; + "khotkeysrc"."Data_3_1"."Enabled" = true; + "khotkeysrc"."Data_3_1"."Name" = "Back"; + "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; + "khotkeysrc"."Data_3_10"."Enabled" = false; + "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; + "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; + "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; + "khotkeysrc"."Data_3_11"."Enabled" = true; + "khotkeysrc"."Data_3_11"."Name" = "Up"; + "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; + "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; + "khotkeysrc"."Data_3_12"."Enabled" = false; + "khotkeysrc"."Data_3_12"."Name" = "Up #2"; + "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; + "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; + "khotkeysrc"."Data_3_13"."Enabled" = true; + "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; + "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; + "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; + "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; + "khotkeysrc"."Data_3_14"."Enabled" = true; + "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; + "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; + "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; + "khotkeysrc"."Data_3_2"."Enabled" = true; + "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; + "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; + "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; + "khotkeysrc"."Data_3_3"."Enabled" = true; + "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; + "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; + "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; + "khotkeysrc"."Data_3_4"."Enabled" = true; + "khotkeysrc"."Data_3_4"."Name" = "Forward"; + "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; + "khotkeysrc"."Data_3_5"."Enabled" = true; + "khotkeysrc"."Data_3_5"."Name" = "Home"; + "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; + "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; + "khotkeysrc"."Data_3_6"."Enabled" = true; + "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; + "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; + "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; + "khotkeysrc"."Data_3_7"."Enabled" = true; + "khotkeysrc"."Data_3_7"."Name" = "New Tab"; + "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; + "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; + "khotkeysrc"."Data_3_8"."Enabled" = true; + "khotkeysrc"."Data_3_8"."Name" = "New Window"; + "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; + "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; + "khotkeysrc"."Data_3_9"."Enabled" = true; + "khotkeysrc"."Data_3_9"."Name" = "Reload"; + "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; + "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."General"."BrowserApplication[$d]" = ""; + "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; + "khotkeysrc"."General"."ColorScheme[$d]" = ""; + "khotkeysrc"."Gestures"."Disabled" = true; + "khotkeysrc"."Gestures"."MouseButton" = 2; + "khotkeysrc"."Gestures"."Timeout" = 300; + "khotkeysrc"."GesturesExclude"."Comment" = ""; + "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; + "khotkeysrc"."Icons"."Theme[$d]" = ""; + "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; + "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; + "khotkeysrc"."KDE"."SingleClick[$d]" = ""; + "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; + "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; + "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."Voice"."Shortcut" = ""; + "khotkeysrc"."WM"."activeBackground[$d]" = ""; + "khotkeysrc"."WM"."activeBlend[$d]" = ""; + "khotkeysrc"."WM"."activeForeground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; + "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; + "kiorc"."Confirmations"."ConfirmDelete" = true; + "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "krunnerrc"."Plugins"."locationsEnabled" = true; + "krunnerrc"."Plugins"."placesEnabled" = true; + "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; + "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; + "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; + "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; + "kwinrc"."Desktops"."Number" = 4; + "kwinrc"."Desktops"."Rows" = 2; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; + "kwinrc"."NightColor"."LongitudeFixed" = 5.44; + "kwinrc"."NightColor"."Mode" = "Location"; + "kwinrc"."NightColor"."NightTemperature" = 1400; + "kwinrc"."Plugins"."wobblywindowsEnabled" = true; + "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Xwayland"."Scale" = 1; + "kxkbrc"."Layout"."Options" = "compose:caps"; + "kxkbrc"."Layout"."ResetOldOptions" = true; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; + }; + }; +} From 7e8fab16e320a9b43c1279bdcca9c694cba8cf87 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 13:37:30 +0100 Subject: [PATCH 1026/2308] add plasma configuration for EDI --- .../plasma-desktop/configuration.nix | 872 ++++++++++++++++++ 1 file changed, 872 insertions(+) create mode 100644 home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix new file mode 100644 index 0000000..a63f9d0 --- /dev/null +++ b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix @@ -0,0 +1,872 @@ +{ + programs.plasma = { + enable = true; + shortcuts = { + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; + "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; + "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; + "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kded5"."Show System Activity" = "Ctrl+Esc"; + "kded5"."display" = ["Display" "Meta+P"]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; + "kmix"."decrease_volume" = "Volume Down"; + "kmix"."increase_microphone_volume" = "Microphone Volume Up"; + "kmix"."increase_volume" = "Volume Up"; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mute" = "Volume Mute"; + "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Log Out" = "Ctrl+Alt+Del"; + "ksmserver"."Log Out Without Confirmation" = [ ]; + "ksmserver"."Reboot Without Confirmation" = [ ]; + "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Decrease Opacity" = [ ]; + "kwin"."Edit Tiles" = "Meta+T"; + "kwin"."Expose" = "Ctrl+F9"; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = [ ]; + "kwin"."Increase Opacity" = [ ]; + "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."MoveMouseToCenter" = "Meta+F6"; + "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = [ ]; + "kwin"."MoveZoomLeft" = [ ]; + "kwin"."MoveZoomRight" = [ ]; + "kwin"."MoveZoomUp" = [ ]; + "kwin"."Overview" = "Meta+W"; + "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Show Desktop" = "Meta+D"; + "kwin"."ShowDesktopGrid" = "Meta+F8"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12"; + "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; + "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; + "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; + "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; + "kwin"."Switch Window Down" = "Meta+Alt+Down"; + "kwin"."Switch Window Left" = "Meta+Alt+Left"; + "kwin"."Switch Window Right" = "Meta+Alt+Right"; + "kwin"."Switch Window Up" = "Meta+Alt+Up"; + "kwin"."Switch to Desktop 1" = "Ctrl+F1"; + "kwin"."Switch to Desktop 10" = [ ]; + "kwin"."Switch to Desktop 11" = [ ]; + "kwin"."Switch to Desktop 12" = [ ]; + "kwin"."Switch to Desktop 13" = [ ]; + "kwin"."Switch to Desktop 14" = [ ]; + "kwin"."Switch to Desktop 15" = [ ]; + "kwin"."Switch to Desktop 16" = [ ]; + "kwin"."Switch to Desktop 17" = [ ]; + "kwin"."Switch to Desktop 18" = [ ]; + "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 2" = "Ctrl+F2"; + "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 3" = "Ctrl+F3"; + "kwin"."Switch to Desktop 4" = "Ctrl+F4"; + "kwin"."Switch to Desktop 5" = [ ]; + "kwin"."Switch to Desktop 6" = [ ]; + "kwin"."Switch to Desktop 7" = [ ]; + "kwin"."Switch to Desktop 8" = [ ]; + "kwin"."Switch to Desktop 9" = [ ]; + "kwin"."Switch to Next Desktop" = [ ]; + "kwin"."Switch to Next Screen" = [ ]; + "kwin"."Switch to Previous Desktop" = [ ]; + "kwin"."Switch to Previous Screen" = [ ]; + "kwin"."Switch to Screen 0" = [ ]; + "kwin"."Switch to Screen 1" = [ ]; + "kwin"."Switch to Screen 2" = [ ]; + "kwin"."Switch to Screen 3" = [ ]; + "kwin"."Switch to Screen 4" = [ ]; + "kwin"."Switch to Screen 5" = [ ]; + "kwin"."Switch to Screen 6" = [ ]; + "kwin"."Switch to Screen 7" = [ ]; + "kwin"."Switch to Screen Above" = [ ]; + "kwin"."Switch to Screen Below" = [ ]; + "kwin"."Switch to Screen to the Left" = [ ]; + "kwin"."Switch to Screen to the Right" = [ ]; + "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Window Raise/Lower" = [ ]; + "kwin"."Walk Through Desktop List" = [ ]; + "kwin"."Walk Through Desktop List (Reverse)" = [ ]; + "kwin"."Walk Through Desktops" = [ ]; + "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Walk Through Windows" = "Alt+Tab"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; + "kwin"."Walk Through Windows Alternative" = [ ]; + "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; + "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; + "kwin"."Window Above Other Windows" = [ ]; + "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Window Close" = "Alt+F4"; + "kwin"."Window Fullscreen" = [ ]; + "kwin"."Window Grow Horizontal" = [ ]; + "kwin"."Window Grow Vertical" = [ ]; + "kwin"."Window Lower" = [ ]; + "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = [ ]; + "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = [ ]; + "kwin"."Window Move Center" = [ ]; + "kwin"."Window No Border" = [ ]; + "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; + "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; + "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; + "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = [ ]; + "kwin"."Window One Screen Up" = [ ]; + "kwin"."Window One Screen to the Left" = [ ]; + "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window Operations Menu" = "Alt+F3"; + "kwin"."Window Pack Down" = [ ]; + "kwin"."Window Pack Left" = [ ]; + "kwin"."Window Pack Right" = [ ]; + "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Quick Tile Bottom" = "Meta+Down"; + "kwin"."Window Quick Tile Bottom Left" = [ ]; + "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Left" = "Meta+Left"; + "kwin"."Window Quick Tile Right" = "Meta+Right"; + "kwin"."Window Quick Tile Top" = "Meta+Up"; + "kwin"."Window Quick Tile Top Left" = [ ]; + "kwin"."Window Quick Tile Top Right" = [ ]; + "kwin"."Window Raise" = [ ]; + "kwin"."Window Resize" = [ ]; + "kwin"."Window Shade" = [ ]; + "kwin"."Window Shrink Horizontal" = [ ]; + "kwin"."Window Shrink Vertical" = [ ]; + "kwin"."Window to Desktop 1" = [ ]; + "kwin"."Window to Desktop 10" = [ ]; + "kwin"."Window to Desktop 11" = [ ]; + "kwin"."Window to Desktop 12" = [ ]; + "kwin"."Window to Desktop 13" = [ ]; + "kwin"."Window to Desktop 14" = [ ]; + "kwin"."Window to Desktop 15" = [ ]; + "kwin"."Window to Desktop 16" = [ ]; + "kwin"."Window to Desktop 17" = [ ]; + "kwin"."Window to Desktop 18" = [ ]; + "kwin"."Window to Desktop 19" = [ ]; + "kwin"."Window to Desktop 2" = [ ]; + "kwin"."Window to Desktop 20" = [ ]; + "kwin"."Window to Desktop 3" = [ ]; + "kwin"."Window to Desktop 4" = [ ]; + "kwin"."Window to Desktop 5" = [ ]; + "kwin"."Window to Desktop 6" = [ ]; + "kwin"."Window to Desktop 7" = [ ]; + "kwin"."Window to Desktop 8" = [ ]; + "kwin"."Window to Desktop 9" = [ ]; + "kwin"."Window to Next Desktop" = [ ]; + "kwin"."Window to Next Screen" = [ ]; + "kwin"."Window to Previous Desktop" = [ ]; + "kwin"."Window to Previous Screen" = [ ]; + "kwin"."Window to Screen 0" = [ ]; + "kwin"."Window to Screen 1" = [ ]; + "kwin"."Window to Screen 2" = [ ]; + "kwin"."Window to Screen 3" = [ ]; + "kwin"."Window to Screen 4" = [ ]; + "kwin"."Window to Screen 5" = [ ]; + "kwin"."Window to Screen 6" = [ ]; + "kwin"."Window to Screen 7" = [ ]; + "kwin"."view_actual_size" = "Meta+0"; + "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; + "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."nextmedia" = "Media Next"; + "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playpausemedia" = "Media Play"; + "mediacontrol"."previousmedia" = "Media Previous"; + "mediacontrol"."stopmedia" = "Media Stop"; + "org.kde.dolphin.desktop"."_launch" = "Meta+E"; + "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; + "org.kde.konsole.desktop"."NewTab" = [ ]; + "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; + "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; + "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; + "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; + "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "org.kde.spectacle.desktop"."_launch" = "Print"; + "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Hibernate" = "Hibernate"; + "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."PowerDown" = "Power Down"; + "org_kde_powerdevil"."PowerOff" = "Power Off"; + "org_kde_powerdevil"."Sleep" = "Sleep"; + "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; + "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "plasmashell"."activate task manager entry 1" = "Meta+1"; + "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 2" = "Meta+2"; + "plasmashell"."activate task manager entry 3" = "Meta+3"; + "plasmashell"."activate task manager entry 4" = "Meta+4"; + "plasmashell"."activate task manager entry 5" = "Meta+5"; + "plasmashell"."activate task manager entry 6" = "Meta+6"; + "plasmashell"."activate task manager entry 7" = "Meta+7"; + "plasmashell"."activate task manager entry 8" = "Meta+8"; + "plasmashell"."activate task manager entry 9" = "Meta+9"; + "plasmashell"."clear-history" = [ ]; + "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; + "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = [ ]; + "plasmashell"."cyclePrevAction" = [ ]; + "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."manage activities" = "Meta+Q"; + "plasmashell"."next activity" = "Meta+Tab"; + "plasmashell"."previous activity" = "Meta+Shift+Tab"; + "plasmashell"."repeat_action" = "Meta+Ctrl+R"; + "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-on-mouse-pos" = "Meta+V"; + "plasmashell"."stop current activity" = "Meta+S"; + "plasmashell"."switch to next activity" = [ ]; + "plasmashell"."switch to previous activity" = [ ]; + "plasmashell"."toggle do not disturb" = [ ]; + "systemsettings.desktop"."_launch" = "Tools"; + "systemsettings.desktop"."kcm-kscreen" = [ ]; + "systemsettings.desktop"."kcm-lookandfeel" = [ ]; + "systemsettings.desktop"."kcm-users" = [ ]; + "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; + "systemsettings.desktop"."screenlocker" = [ ]; + }; + configFile = { + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 8; + "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; + "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; + "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; + "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; + "kdeglobals"."KDE"."SingleClick" = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Preview" = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; + "kdeglobals"."WM"."activeBackground" = "49,54,59"; + "kdeglobals"."WM"."activeBlend" = "252,252,252"; + "kdeglobals"."WM"."activeForeground" = "252,252,252"; + "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; + "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; + "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; + "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; + "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; + "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; + "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; + "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; + "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; + "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; + "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; + "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; + "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; + "kglobalshortcutsrc"."org.kde.kcalc.desktop"."_k_friendly_name" = "KCalc"; + "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; + "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; + "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Emoji Selector"; + "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Power Management"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; + "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "System Settings"; + "khotkeysrc"."Data"."DataCount" = 3; + "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; + "khotkeysrc"."Data_1"."DataCount" = 1; + "khotkeysrc"."Data_1"."Enabled" = true; + "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; + "khotkeysrc"."Data_1"."SystemGroup" = 1; + "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1"."Comment" = "Comment"; + "khotkeysrc"."Data_1_1"."Enabled" = true; + "khotkeysrc"."Data_1_1"."Name" = "Search"; + "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; + "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; + "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; + "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; + "khotkeysrc"."Data_2"."DataCount" = 8; + "khotkeysrc"."Data_2"."Enabled" = false; + "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; + "khotkeysrc"."Data_2"."Name" = "Examples"; + "khotkeysrc"."Data_2"."SystemGroup" = 0; + "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; + "khotkeysrc"."Data_2_1"."Enabled" = false; + "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; + "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; + "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; + "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; + "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; + "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; + "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; + "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; + "khotkeysrc"."Data_2_2"."Enabled" = false; + "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; + "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; + "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; + "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; + "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; + "khotkeysrc"."Data_2_3"."Enabled" = false; + "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; + "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; + "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; + "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; + "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; + "khotkeysrc"."Data_2_4"."Enabled" = false; + "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; + "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; + "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; + "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; + "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; + "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; + "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; + "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; + "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; + "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; + "khotkeysrc"."Data_2_5"."Enabled" = false; + "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; + "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; + "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; + "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; + "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; + "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; + "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; + "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; + "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; + "khotkeysrc"."Data_2_6"."Enabled" = false; + "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; + "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; + "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; + "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; + "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; + "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; + "khotkeysrc"."Data_2_7"."DataCount" = 4; + "khotkeysrc"."Data_2_7"."Enabled" = false; + "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; + "khotkeysrc"."Data_2_7"."SystemGroup" = 0; + "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_7_1"."Comment" = ""; + "khotkeysrc"."Data_2_7_1"."Enabled" = false; + "khotkeysrc"."Data_2_7_1"."Name" = "Back"; + "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2"."Comment" = ""; + "khotkeysrc"."Data_2_7_2"."Enabled" = false; + "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; + "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3"."Comment" = ""; + "khotkeysrc"."Data_2_7_3"."Enabled" = false; + "khotkeysrc"."Data_2_7_3"."Name" = "Up"; + "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4"."Comment" = ""; + "khotkeysrc"."Data_2_7_4"."Enabled" = false; + "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; + "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; + "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; + "khotkeysrc"."Data_2_8"."Enabled" = false; + "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; + "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; + "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; + "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; + "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; + "khotkeysrc"."Data_3"."DataCount" = 14; + "khotkeysrc"."Data_3"."Enabled" = true; + "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; + "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; + "khotkeysrc"."Data_3"."SystemGroup" = 0; + "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; + "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; + "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; + "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; + "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; + "khotkeysrc"."Data_3_1"."Enabled" = true; + "khotkeysrc"."Data_3_1"."Name" = "Back"; + "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; + "khotkeysrc"."Data_3_10"."Enabled" = false; + "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; + "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; + "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; + "khotkeysrc"."Data_3_11"."Enabled" = true; + "khotkeysrc"."Data_3_11"."Name" = "Up"; + "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; + "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; + "khotkeysrc"."Data_3_12"."Enabled" = false; + "khotkeysrc"."Data_3_12"."Name" = "Up #2"; + "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; + "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; + "khotkeysrc"."Data_3_13"."Enabled" = true; + "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; + "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; + "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; + "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; + "khotkeysrc"."Data_3_14"."Enabled" = true; + "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; + "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; + "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; + "khotkeysrc"."Data_3_2"."Enabled" = true; + "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; + "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; + "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; + "khotkeysrc"."Data_3_3"."Enabled" = true; + "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; + "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; + "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; + "khotkeysrc"."Data_3_4"."Enabled" = true; + "khotkeysrc"."Data_3_4"."Name" = "Forward"; + "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; + "khotkeysrc"."Data_3_5"."Enabled" = true; + "khotkeysrc"."Data_3_5"."Name" = "Home"; + "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; + "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; + "khotkeysrc"."Data_3_6"."Enabled" = true; + "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; + "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; + "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; + "khotkeysrc"."Data_3_7"."Enabled" = true; + "khotkeysrc"."Data_3_7"."Name" = "New Tab"; + "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; + "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; + "khotkeysrc"."Data_3_8"."Enabled" = true; + "khotkeysrc"."Data_3_8"."Name" = "New Window"; + "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; + "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; + "khotkeysrc"."Data_3_9"."Enabled" = true; + "khotkeysrc"."Data_3_9"."Name" = "Reload"; + "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; + "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."General"."BrowserApplication[$d]" = ""; + "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; + "khotkeysrc"."General"."ColorScheme[$d]" = ""; + "khotkeysrc"."Gestures"."Disabled" = true; + "khotkeysrc"."Gestures"."MouseButton" = 2; + "khotkeysrc"."Gestures"."Timeout" = 300; + "khotkeysrc"."GesturesExclude"."Comment" = ""; + "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; + "khotkeysrc"."Icons"."Theme[$d]" = ""; + "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; + "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; + "khotkeysrc"."KDE"."SingleClick[$d]" = ""; + "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; + "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; + "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."Voice"."Shortcut" = ""; + "khotkeysrc"."WM"."activeBackground[$d]" = ""; + "khotkeysrc"."WM"."activeBlend[$d]" = ""; + "khotkeysrc"."WM"."activeForeground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; + "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; + "kiorc"."Confirmations"."ConfirmDelete" = true; + "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "krunnerrc"."Plugins"."locationsEnabled" = true; + "krunnerrc"."Plugins"."placesEnabled" = true; + "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; + "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; + "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; + "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; + "kwinrc"."Desktops"."Number" = 4; + "kwinrc"."Desktops"."Rows" = 2; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; + "kwinrc"."NightColor"."LongitudeFixed" = 5.44; + "kwinrc"."NightColor"."Mode" = "Location"; + "kwinrc"."NightColor"."NightTemperature" = 1400; + "kwinrc"."Plugins"."wobblywindowsEnabled" = true; + "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Xwayland"."Scale" = 1; + "kxkbrc"."Layout"."Options" = "compose:caps"; + "kxkbrc"."Layout"."ResetOldOptions" = true; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; + }; + }; +} From 19a0a343343beb581e127a9633be4bdbef98f915 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 13:40:40 +0100 Subject: [PATCH 1027/2308] add the configuration blurb at the top --- .../plasma-desktop/configuration.nix | 281 ++++----- .../plasma-desktop/configuration.nix | 556 +++++++++--------- 2 files changed, 426 insertions(+), 411 deletions(-) diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix index a63f9d0..a193e98 100644 --- a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix +++ b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix @@ -1,8 +1,15 @@ { + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { programs.plasma = { enable = true; shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; @@ -10,36 +17,36 @@ "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "kded5"."Show System Activity" = "Ctrl+Esc"; "kded5"."display" = ["Display" "Meta+P"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Halt Without Confirmation" = []; "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = [ ]; - "ksmserver"."Reboot Without Confirmation" = [ ]; + "ksmserver"."Log Out Without Confirmation" = []; + "ksmserver"."Reboot Without Confirmation" = []; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Decrease Opacity" = [ ]; + "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = [ ]; - "kwin"."Increase Opacity" = [ ]; + "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."Increase Opacity" = []; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = [ ]; - "kwin"."MoveZoomLeft" = [ ]; - "kwin"."MoveZoomRight" = [ ]; - "kwin"."MoveZoomUp" = [ ]; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Setup Window Shortcut" = []; "kwin"."Show Desktop" = "Meta+D"; "kwin"."ShowDesktopGrid" = "Meta+F8"; "kwin"."Suspend Compositing" = "Alt+Shift+F12"; @@ -52,143 +59,143 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = [ ]; - "kwin"."Switch to Desktop 11" = [ ]; - "kwin"."Switch to Desktop 12" = [ ]; - "kwin"."Switch to Desktop 13" = [ ]; - "kwin"."Switch to Desktop 14" = [ ]; - "kwin"."Switch to Desktop 15" = [ ]; - "kwin"."Switch to Desktop 16" = [ ]; - "kwin"."Switch to Desktop 17" = [ ]; - "kwin"."Switch to Desktop 18" = [ ]; - "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 10" = []; + "kwin"."Switch to Desktop 11" = []; + "kwin"."Switch to Desktop 12" = []; + "kwin"."Switch to Desktop 13" = []; + "kwin"."Switch to Desktop 14" = []; + "kwin"."Switch to Desktop 15" = []; + "kwin"."Switch to Desktop 16" = []; + "kwin"."Switch to Desktop 17" = []; + "kwin"."Switch to Desktop 18" = []; + "kwin"."Switch to Desktop 19" = []; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 20" = []; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = [ ]; - "kwin"."Switch to Desktop 6" = [ ]; - "kwin"."Switch to Desktop 7" = [ ]; - "kwin"."Switch to Desktop 8" = [ ]; - "kwin"."Switch to Desktop 9" = [ ]; - "kwin"."Switch to Next Desktop" = [ ]; - "kwin"."Switch to Next Screen" = [ ]; - "kwin"."Switch to Previous Desktop" = [ ]; - "kwin"."Switch to Previous Screen" = [ ]; - "kwin"."Switch to Screen 0" = [ ]; - "kwin"."Switch to Screen 1" = [ ]; - "kwin"."Switch to Screen 2" = [ ]; - "kwin"."Switch to Screen 3" = [ ]; - "kwin"."Switch to Screen 4" = [ ]; - "kwin"."Switch to Screen 5" = [ ]; - "kwin"."Switch to Screen 6" = [ ]; - "kwin"."Switch to Screen 7" = [ ]; - "kwin"."Switch to Screen Above" = [ ]; - "kwin"."Switch to Screen Below" = [ ]; - "kwin"."Switch to Screen to the Left" = [ ]; - "kwin"."Switch to Screen to the Right" = [ ]; - "kwin"."Toggle Night Color" = [ ]; - "kwin"."Toggle Window Raise/Lower" = [ ]; - "kwin"."Walk Through Desktop List" = [ ]; - "kwin"."Walk Through Desktop List (Reverse)" = [ ]; - "kwin"."Walk Through Desktops" = [ ]; - "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Switch to Desktop 5" = []; + "kwin"."Switch to Desktop 6" = []; + "kwin"."Switch to Desktop 7" = []; + "kwin"."Switch to Desktop 8" = []; + "kwin"."Switch to Desktop 9" = []; + "kwin"."Switch to Next Desktop" = []; + "kwin"."Switch to Next Screen" = []; + "kwin"."Switch to Previous Desktop" = []; + "kwin"."Switch to Previous Screen" = []; + "kwin"."Switch to Screen 0" = []; + "kwin"."Switch to Screen 1" = []; + "kwin"."Switch to Screen 2" = []; + "kwin"."Switch to Screen 3" = []; + "kwin"."Switch to Screen 4" = []; + "kwin"."Switch to Screen 5" = []; + "kwin"."Switch to Screen 6" = []; + "kwin"."Switch to Screen 7" = []; + "kwin"."Switch to Screen Above" = []; + "kwin"."Switch to Screen Below" = []; + "kwin"."Switch to Screen to the Left" = []; + "kwin"."Switch to Screen to the Right" = []; + "kwin"."Toggle Night Color" = []; + "kwin"."Toggle Window Raise/Lower" = []; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = [ ]; - "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows Alternative" = []; + "kwin"."Walk Through Windows Alternative (Reverse)" = []; "kwin"."Walk Through Windows of Current Application" = "Alt+`"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; - "kwin"."Window Above Other Windows" = [ ]; - "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative" = []; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; + "kwin"."Window Above Other Windows" = []; + "kwin"."Window Below Other Windows" = []; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = [ ]; - "kwin"."Window Grow Horizontal" = [ ]; - "kwin"."Window Grow Vertical" = [ ]; - "kwin"."Window Lower" = [ ]; + "kwin"."Window Fullscreen" = []; + "kwin"."Window Grow Horizontal" = []; + "kwin"."Window Grow Vertical" = []; + "kwin"."Window Lower" = []; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = [ ]; - "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Maximize Horizontal" = []; + "kwin"."Window Maximize Vertical" = []; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = [ ]; - "kwin"."Window Move Center" = [ ]; - "kwin"."Window No Border" = [ ]; - "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window Move" = []; + "kwin"."Window Move Center" = []; + "kwin"."Window No Border" = []; + "kwin"."Window On All Desktops" = []; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = [ ]; - "kwin"."Window One Screen Up" = [ ]; - "kwin"."Window One Screen to the Left" = [ ]; - "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window One Screen Down" = []; + "kwin"."Window One Screen Up" = []; + "kwin"."Window One Screen to the Left" = []; + "kwin"."Window One Screen to the Right" = []; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = [ ]; - "kwin"."Window Pack Left" = [ ]; - "kwin"."Window Pack Right" = [ ]; - "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Pack Down" = []; + "kwin"."Window Pack Left" = []; + "kwin"."Window Pack Right" = []; + "kwin"."Window Pack Up" = []; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = [ ]; - "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Bottom Left" = []; + "kwin"."Window Quick Tile Bottom Right" = []; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = [ ]; - "kwin"."Window Quick Tile Top Right" = [ ]; - "kwin"."Window Raise" = [ ]; - "kwin"."Window Resize" = [ ]; - "kwin"."Window Shade" = [ ]; - "kwin"."Window Shrink Horizontal" = [ ]; - "kwin"."Window Shrink Vertical" = [ ]; - "kwin"."Window to Desktop 1" = [ ]; - "kwin"."Window to Desktop 10" = [ ]; - "kwin"."Window to Desktop 11" = [ ]; - "kwin"."Window to Desktop 12" = [ ]; - "kwin"."Window to Desktop 13" = [ ]; - "kwin"."Window to Desktop 14" = [ ]; - "kwin"."Window to Desktop 15" = [ ]; - "kwin"."Window to Desktop 16" = [ ]; - "kwin"."Window to Desktop 17" = [ ]; - "kwin"."Window to Desktop 18" = [ ]; - "kwin"."Window to Desktop 19" = [ ]; - "kwin"."Window to Desktop 2" = [ ]; - "kwin"."Window to Desktop 20" = [ ]; - "kwin"."Window to Desktop 3" = [ ]; - "kwin"."Window to Desktop 4" = [ ]; - "kwin"."Window to Desktop 5" = [ ]; - "kwin"."Window to Desktop 6" = [ ]; - "kwin"."Window to Desktop 7" = [ ]; - "kwin"."Window to Desktop 8" = [ ]; - "kwin"."Window to Desktop 9" = [ ]; - "kwin"."Window to Next Desktop" = [ ]; - "kwin"."Window to Next Screen" = [ ]; - "kwin"."Window to Previous Desktop" = [ ]; - "kwin"."Window to Previous Screen" = [ ]; - "kwin"."Window to Screen 0" = [ ]; - "kwin"."Window to Screen 1" = [ ]; - "kwin"."Window to Screen 2" = [ ]; - "kwin"."Window to Screen 3" = [ ]; - "kwin"."Window to Screen 4" = [ ]; - "kwin"."Window to Screen 5" = [ ]; - "kwin"."Window to Screen 6" = [ ]; - "kwin"."Window to Screen 7" = [ ]; + "kwin"."Window Quick Tile Top Left" = []; + "kwin"."Window Quick Tile Top Right" = []; + "kwin"."Window Raise" = []; + "kwin"."Window Resize" = []; + "kwin"."Window Shade" = []; + "kwin"."Window Shrink Horizontal" = []; + "kwin"."Window Shrink Vertical" = []; + "kwin"."Window to Desktop 1" = []; + "kwin"."Window to Desktop 10" = []; + "kwin"."Window to Desktop 11" = []; + "kwin"."Window to Desktop 12" = []; + "kwin"."Window to Desktop 13" = []; + "kwin"."Window to Desktop 14" = []; + "kwin"."Window to Desktop 15" = []; + "kwin"."Window to Desktop 16" = []; + "kwin"."Window to Desktop 17" = []; + "kwin"."Window to Desktop 18" = []; + "kwin"."Window to Desktop 19" = []; + "kwin"."Window to Desktop 2" = []; + "kwin"."Window to Desktop 20" = []; + "kwin"."Window to Desktop 3" = []; + "kwin"."Window to Desktop 4" = []; + "kwin"."Window to Desktop 5" = []; + "kwin"."Window to Desktop 6" = []; + "kwin"."Window to Desktop 7" = []; + "kwin"."Window to Desktop 8" = []; + "kwin"."Window to Desktop 9" = []; + "kwin"."Window to Next Desktop" = []; + "kwin"."Window to Next Screen" = []; + "kwin"."Window to Previous Desktop" = []; + "kwin"."Window to Previous Screen" = []; + "kwin"."Window to Screen 0" = []; + "kwin"."Window to Screen 1" = []; + "kwin"."Window to Screen 2" = []; + "kwin"."Window to Screen 3" = []; + "kwin"."Window to Screen 4" = []; + "kwin"."Window to Screen 5" = []; + "kwin"."Window to Screen 6" = []; + "kwin"."Window to Screen 7" = []; "kwin"."view_actual_size" = "Meta+0"; "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = [ ]; - "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."mediavolumedown" = []; + "mediacontrol"."mediavolumeup" = []; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playmedia" = []; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; "org.kde.dolphin.desktop"."_launch" = "Meta+E"; "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; - "org.kde.konsole.desktop"."NewTab" = [ ]; - "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."NewTab" = []; + "org.kde.konsole.desktop"."NewWindow" = []; "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; @@ -209,9 +216,9 @@ "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."Turn Off Screen" = []; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 10" = []; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -220,29 +227,29 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = [ ]; + "plasmashell"."clear-history" = []; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = [ ]; - "plasmashell"."cyclePrevAction" = [ ]; - "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."cycleNextAction" = []; + "plasmashell"."cyclePrevAction" = []; + "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; "plasmashell"."next activity" = "Meta+Tab"; "plasmashell"."previous activity" = "Meta+Shift+Tab"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-barcode" = []; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = [ ]; - "plasmashell"."switch to previous activity" = [ ]; - "plasmashell"."toggle do not disturb" = [ ]; + "plasmashell"."switch to next activity" = []; + "plasmashell"."switch to previous activity" = []; + "plasmashell"."toggle do not disturb" = []; "systemsettings.desktop"."_launch" = "Tools"; - "systemsettings.desktop"."kcm-kscreen" = [ ]; - "systemsettings.desktop"."kcm-lookandfeel" = [ ]; - "systemsettings.desktop"."kcm-users" = [ ]; - "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; - "systemsettings.desktop"."screenlocker" = [ ]; + "systemsettings.desktop"."kcm-kscreen" = []; + "systemsettings.desktop"."kcm-lookandfeel" = []; + "systemsettings.desktop"."kcm-users" = []; + "systemsettings.desktop"."powerdevilprofilesconfig" = []; + "systemsettings.desktop"."screenlocker" = []; }; configFile = { "baloofilerc"."General"."dbVersion" = 2; diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix index 9e6a5f0..93f8663 100644 --- a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix +++ b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix @@ -1,8 +1,16 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { programs.plasma = { enable = true; shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; @@ -10,36 +18,36 @@ "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "kded5"."Show System Activity" = "Ctrl+Esc"; "kded5"."display" = ["Display" "Meta+P"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Halt Without Confirmation" = []; "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = [ ]; - "ksmserver"."Reboot Without Confirmation" = [ ]; + "ksmserver"."Log Out Without Confirmation" = []; + "ksmserver"."Reboot Without Confirmation" = []; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Decrease Opacity" = [ ]; + "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = [ ]; - "kwin"."Increase Opacity" = [ ]; + "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."Increase Opacity" = []; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = [ ]; - "kwin"."MoveZoomLeft" = [ ]; - "kwin"."MoveZoomRight" = [ ]; - "kwin"."MoveZoomUp" = [ ]; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Setup Window Shortcut" = []; "kwin"."Show Desktop" = "Meta+D"; "kwin"."ShowDesktopGrid" = "Meta+F8"; "kwin"."Suspend Compositing" = "Alt+Shift+F12"; @@ -52,143 +60,143 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = [ ]; - "kwin"."Switch to Desktop 11" = [ ]; - "kwin"."Switch to Desktop 12" = [ ]; - "kwin"."Switch to Desktop 13" = [ ]; - "kwin"."Switch to Desktop 14" = [ ]; - "kwin"."Switch to Desktop 15" = [ ]; - "kwin"."Switch to Desktop 16" = [ ]; - "kwin"."Switch to Desktop 17" = [ ]; - "kwin"."Switch to Desktop 18" = [ ]; - "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 10" = []; + "kwin"."Switch to Desktop 11" = []; + "kwin"."Switch to Desktop 12" = []; + "kwin"."Switch to Desktop 13" = []; + "kwin"."Switch to Desktop 14" = []; + "kwin"."Switch to Desktop 15" = []; + "kwin"."Switch to Desktop 16" = []; + "kwin"."Switch to Desktop 17" = []; + "kwin"."Switch to Desktop 18" = []; + "kwin"."Switch to Desktop 19" = []; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 20" = []; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = [ ]; - "kwin"."Switch to Desktop 6" = [ ]; - "kwin"."Switch to Desktop 7" = [ ]; - "kwin"."Switch to Desktop 8" = [ ]; - "kwin"."Switch to Desktop 9" = [ ]; - "kwin"."Switch to Next Desktop" = [ ]; - "kwin"."Switch to Next Screen" = [ ]; - "kwin"."Switch to Previous Desktop" = [ ]; - "kwin"."Switch to Previous Screen" = [ ]; - "kwin"."Switch to Screen 0" = [ ]; - "kwin"."Switch to Screen 1" = [ ]; - "kwin"."Switch to Screen 2" = [ ]; - "kwin"."Switch to Screen 3" = [ ]; - "kwin"."Switch to Screen 4" = [ ]; - "kwin"."Switch to Screen 5" = [ ]; - "kwin"."Switch to Screen 6" = [ ]; - "kwin"."Switch to Screen 7" = [ ]; - "kwin"."Switch to Screen Above" = [ ]; - "kwin"."Switch to Screen Below" = [ ]; - "kwin"."Switch to Screen to the Left" = [ ]; - "kwin"."Switch to Screen to the Right" = [ ]; - "kwin"."Toggle Night Color" = [ ]; - "kwin"."Toggle Window Raise/Lower" = [ ]; - "kwin"."Walk Through Desktop List" = [ ]; - "kwin"."Walk Through Desktop List (Reverse)" = [ ]; - "kwin"."Walk Through Desktops" = [ ]; - "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Switch to Desktop 5" = []; + "kwin"."Switch to Desktop 6" = []; + "kwin"."Switch to Desktop 7" = []; + "kwin"."Switch to Desktop 8" = []; + "kwin"."Switch to Desktop 9" = []; + "kwin"."Switch to Next Desktop" = []; + "kwin"."Switch to Next Screen" = []; + "kwin"."Switch to Previous Desktop" = []; + "kwin"."Switch to Previous Screen" = []; + "kwin"."Switch to Screen 0" = []; + "kwin"."Switch to Screen 1" = []; + "kwin"."Switch to Screen 2" = []; + "kwin"."Switch to Screen 3" = []; + "kwin"."Switch to Screen 4" = []; + "kwin"."Switch to Screen 5" = []; + "kwin"."Switch to Screen 6" = []; + "kwin"."Switch to Screen 7" = []; + "kwin"."Switch to Screen Above" = []; + "kwin"."Switch to Screen Below" = []; + "kwin"."Switch to Screen to the Left" = []; + "kwin"."Switch to Screen to the Right" = []; + "kwin"."Toggle Night Color" = []; + "kwin"."Toggle Window Raise/Lower" = []; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = [ ]; - "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows Alternative" = []; + "kwin"."Walk Through Windows Alternative (Reverse)" = []; "kwin"."Walk Through Windows of Current Application" = "Alt+`"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; - "kwin"."Window Above Other Windows" = [ ]; - "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative" = []; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; + "kwin"."Window Above Other Windows" = []; + "kwin"."Window Below Other Windows" = []; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = [ ]; - "kwin"."Window Grow Horizontal" = [ ]; - "kwin"."Window Grow Vertical" = [ ]; - "kwin"."Window Lower" = [ ]; + "kwin"."Window Fullscreen" = []; + "kwin"."Window Grow Horizontal" = []; + "kwin"."Window Grow Vertical" = []; + "kwin"."Window Lower" = []; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = [ ]; - "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Maximize Horizontal" = []; + "kwin"."Window Maximize Vertical" = []; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = [ ]; - "kwin"."Window Move Center" = [ ]; - "kwin"."Window No Border" = [ ]; - "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window Move" = []; + "kwin"."Window Move Center" = []; + "kwin"."Window No Border" = []; + "kwin"."Window On All Desktops" = []; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = [ ]; - "kwin"."Window One Screen Up" = [ ]; - "kwin"."Window One Screen to the Left" = [ ]; - "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window One Screen Down" = []; + "kwin"."Window One Screen Up" = []; + "kwin"."Window One Screen to the Left" = []; + "kwin"."Window One Screen to the Right" = []; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = [ ]; - "kwin"."Window Pack Left" = [ ]; - "kwin"."Window Pack Right" = [ ]; - "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Pack Down" = []; + "kwin"."Window Pack Left" = []; + "kwin"."Window Pack Right" = []; + "kwin"."Window Pack Up" = []; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = [ ]; - "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Bottom Left" = []; + "kwin"."Window Quick Tile Bottom Right" = []; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = [ ]; - "kwin"."Window Quick Tile Top Right" = [ ]; - "kwin"."Window Raise" = [ ]; - "kwin"."Window Resize" = [ ]; - "kwin"."Window Shade" = [ ]; - "kwin"."Window Shrink Horizontal" = [ ]; - "kwin"."Window Shrink Vertical" = [ ]; - "kwin"."Window to Desktop 1" = [ ]; - "kwin"."Window to Desktop 10" = [ ]; - "kwin"."Window to Desktop 11" = [ ]; - "kwin"."Window to Desktop 12" = [ ]; - "kwin"."Window to Desktop 13" = [ ]; - "kwin"."Window to Desktop 14" = [ ]; - "kwin"."Window to Desktop 15" = [ ]; - "kwin"."Window to Desktop 16" = [ ]; - "kwin"."Window to Desktop 17" = [ ]; - "kwin"."Window to Desktop 18" = [ ]; - "kwin"."Window to Desktop 19" = [ ]; - "kwin"."Window to Desktop 2" = [ ]; - "kwin"."Window to Desktop 20" = [ ]; - "kwin"."Window to Desktop 3" = [ ]; - "kwin"."Window to Desktop 4" = [ ]; - "kwin"."Window to Desktop 5" = [ ]; - "kwin"."Window to Desktop 6" = [ ]; - "kwin"."Window to Desktop 7" = [ ]; - "kwin"."Window to Desktop 8" = [ ]; - "kwin"."Window to Desktop 9" = [ ]; - "kwin"."Window to Next Desktop" = [ ]; - "kwin"."Window to Next Screen" = [ ]; - "kwin"."Window to Previous Desktop" = [ ]; - "kwin"."Window to Previous Screen" = [ ]; - "kwin"."Window to Screen 0" = [ ]; - "kwin"."Window to Screen 1" = [ ]; - "kwin"."Window to Screen 2" = [ ]; - "kwin"."Window to Screen 3" = [ ]; - "kwin"."Window to Screen 4" = [ ]; - "kwin"."Window to Screen 5" = [ ]; - "kwin"."Window to Screen 6" = [ ]; - "kwin"."Window to Screen 7" = [ ]; + "kwin"."Window Quick Tile Top Left" = []; + "kwin"."Window Quick Tile Top Right" = []; + "kwin"."Window Raise" = []; + "kwin"."Window Resize" = []; + "kwin"."Window Shade" = []; + "kwin"."Window Shrink Horizontal" = []; + "kwin"."Window Shrink Vertical" = []; + "kwin"."Window to Desktop 1" = []; + "kwin"."Window to Desktop 10" = []; + "kwin"."Window to Desktop 11" = []; + "kwin"."Window to Desktop 12" = []; + "kwin"."Window to Desktop 13" = []; + "kwin"."Window to Desktop 14" = []; + "kwin"."Window to Desktop 15" = []; + "kwin"."Window to Desktop 16" = []; + "kwin"."Window to Desktop 17" = []; + "kwin"."Window to Desktop 18" = []; + "kwin"."Window to Desktop 19" = []; + "kwin"."Window to Desktop 2" = []; + "kwin"."Window to Desktop 20" = []; + "kwin"."Window to Desktop 3" = []; + "kwin"."Window to Desktop 4" = []; + "kwin"."Window to Desktop 5" = []; + "kwin"."Window to Desktop 6" = []; + "kwin"."Window to Desktop 7" = []; + "kwin"."Window to Desktop 8" = []; + "kwin"."Window to Desktop 9" = []; + "kwin"."Window to Next Desktop" = []; + "kwin"."Window to Next Screen" = []; + "kwin"."Window to Previous Desktop" = []; + "kwin"."Window to Previous Screen" = []; + "kwin"."Window to Screen 0" = []; + "kwin"."Window to Screen 1" = []; + "kwin"."Window to Screen 2" = []; + "kwin"."Window to Screen 3" = []; + "kwin"."Window to Screen 4" = []; + "kwin"."Window to Screen 5" = []; + "kwin"."Window to Screen 6" = []; + "kwin"."Window to Screen 7" = []; "kwin"."view_actual_size" = "Meta+0"; "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = [ ]; - "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."mediavolumedown" = []; + "mediacontrol"."mediavolumeup" = []; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playmedia" = []; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; "org.kde.dolphin.desktop"."_launch" = "Meta+E"; "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; - "org.kde.konsole.desktop"."NewTab" = [ ]; - "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."NewTab" = []; + "org.kde.konsole.desktop"."NewWindow" = []; "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; @@ -209,9 +217,9 @@ "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."Turn Off Screen" = []; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 10" = []; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -220,29 +228,29 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = [ ]; + "plasmashell"."clear-history" = []; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = [ ]; - "plasmashell"."cyclePrevAction" = [ ]; - "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."cycleNextAction" = []; + "plasmashell"."cyclePrevAction" = []; + "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; "plasmashell"."next activity" = "Meta+Tab"; "plasmashell"."previous activity" = "Meta+Shift+Tab"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-barcode" = []; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = [ ]; - "plasmashell"."switch to previous activity" = [ ]; - "plasmashell"."toggle do not disturb" = [ ]; + "plasmashell"."switch to next activity" = []; + "plasmashell"."switch to previous activity" = []; + "plasmashell"."toggle do not disturb" = []; "systemsettings.desktop"."_launch" = "Tools"; - "systemsettings.desktop"."kcm-kscreen" = [ ]; - "systemsettings.desktop"."kcm-lookandfeel" = [ ]; - "systemsettings.desktop"."kcm-users" = [ ]; - "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; - "systemsettings.desktop"."screenlocker" = [ ]; + "systemsettings.desktop"."kcm-kscreen" = []; + "systemsettings.desktop"."kcm-lookandfeel" = []; + "systemsettings.desktop"."kcm-users" = []; + "systemsettings.desktop"."powerdevilprofilesconfig" = []; + "systemsettings.desktop"."screenlocker" = []; }; configFile = { "baloofilerc"."General"."dbVersion" = 2; @@ -873,7 +881,7 @@ programs.plasma = { enable = true; shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; @@ -881,36 +889,36 @@ "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "kded5"."Show System Activity" = "Ctrl+Esc"; "kded5"."display" = ["Display" "Meta+P"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Halt Without Confirmation" = []; "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = [ ]; - "ksmserver"."Reboot Without Confirmation" = [ ]; + "ksmserver"."Log Out Without Confirmation" = []; + "ksmserver"."Reboot Without Confirmation" = []; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Decrease Opacity" = [ ]; + "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = [ ]; - "kwin"."Increase Opacity" = [ ]; + "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."Increase Opacity" = []; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = [ ]; - "kwin"."MoveZoomLeft" = [ ]; - "kwin"."MoveZoomRight" = [ ]; - "kwin"."MoveZoomUp" = [ ]; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Setup Window Shortcut" = []; "kwin"."Show Desktop" = "Meta+D"; "kwin"."ShowDesktopGrid" = "Meta+F8"; "kwin"."Suspend Compositing" = "Alt+Shift+F12"; @@ -923,143 +931,143 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = [ ]; - "kwin"."Switch to Desktop 11" = [ ]; - "kwin"."Switch to Desktop 12" = [ ]; - "kwin"."Switch to Desktop 13" = [ ]; - "kwin"."Switch to Desktop 14" = [ ]; - "kwin"."Switch to Desktop 15" = [ ]; - "kwin"."Switch to Desktop 16" = [ ]; - "kwin"."Switch to Desktop 17" = [ ]; - "kwin"."Switch to Desktop 18" = [ ]; - "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 10" = []; + "kwin"."Switch to Desktop 11" = []; + "kwin"."Switch to Desktop 12" = []; + "kwin"."Switch to Desktop 13" = []; + "kwin"."Switch to Desktop 14" = []; + "kwin"."Switch to Desktop 15" = []; + "kwin"."Switch to Desktop 16" = []; + "kwin"."Switch to Desktop 17" = []; + "kwin"."Switch to Desktop 18" = []; + "kwin"."Switch to Desktop 19" = []; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 20" = []; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = [ ]; - "kwin"."Switch to Desktop 6" = [ ]; - "kwin"."Switch to Desktop 7" = [ ]; - "kwin"."Switch to Desktop 8" = [ ]; - "kwin"."Switch to Desktop 9" = [ ]; - "kwin"."Switch to Next Desktop" = [ ]; - "kwin"."Switch to Next Screen" = [ ]; - "kwin"."Switch to Previous Desktop" = [ ]; - "kwin"."Switch to Previous Screen" = [ ]; - "kwin"."Switch to Screen 0" = [ ]; - "kwin"."Switch to Screen 1" = [ ]; - "kwin"."Switch to Screen 2" = [ ]; - "kwin"."Switch to Screen 3" = [ ]; - "kwin"."Switch to Screen 4" = [ ]; - "kwin"."Switch to Screen 5" = [ ]; - "kwin"."Switch to Screen 6" = [ ]; - "kwin"."Switch to Screen 7" = [ ]; - "kwin"."Switch to Screen Above" = [ ]; - "kwin"."Switch to Screen Below" = [ ]; - "kwin"."Switch to Screen to the Left" = [ ]; - "kwin"."Switch to Screen to the Right" = [ ]; - "kwin"."Toggle Night Color" = [ ]; - "kwin"."Toggle Window Raise/Lower" = [ ]; - "kwin"."Walk Through Desktop List" = [ ]; - "kwin"."Walk Through Desktop List (Reverse)" = [ ]; - "kwin"."Walk Through Desktops" = [ ]; - "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Switch to Desktop 5" = []; + "kwin"."Switch to Desktop 6" = []; + "kwin"."Switch to Desktop 7" = []; + "kwin"."Switch to Desktop 8" = []; + "kwin"."Switch to Desktop 9" = []; + "kwin"."Switch to Next Desktop" = []; + "kwin"."Switch to Next Screen" = []; + "kwin"."Switch to Previous Desktop" = []; + "kwin"."Switch to Previous Screen" = []; + "kwin"."Switch to Screen 0" = []; + "kwin"."Switch to Screen 1" = []; + "kwin"."Switch to Screen 2" = []; + "kwin"."Switch to Screen 3" = []; + "kwin"."Switch to Screen 4" = []; + "kwin"."Switch to Screen 5" = []; + "kwin"."Switch to Screen 6" = []; + "kwin"."Switch to Screen 7" = []; + "kwin"."Switch to Screen Above" = []; + "kwin"."Switch to Screen Below" = []; + "kwin"."Switch to Screen to the Left" = []; + "kwin"."Switch to Screen to the Right" = []; + "kwin"."Toggle Night Color" = []; + "kwin"."Toggle Window Raise/Lower" = []; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = [ ]; - "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows Alternative" = []; + "kwin"."Walk Through Windows Alternative (Reverse)" = []; "kwin"."Walk Through Windows of Current Application" = "Alt+`"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; - "kwin"."Window Above Other Windows" = [ ]; - "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative" = []; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; + "kwin"."Window Above Other Windows" = []; + "kwin"."Window Below Other Windows" = []; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = [ ]; - "kwin"."Window Grow Horizontal" = [ ]; - "kwin"."Window Grow Vertical" = [ ]; - "kwin"."Window Lower" = [ ]; + "kwin"."Window Fullscreen" = []; + "kwin"."Window Grow Horizontal" = []; + "kwin"."Window Grow Vertical" = []; + "kwin"."Window Lower" = []; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = [ ]; - "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Maximize Horizontal" = []; + "kwin"."Window Maximize Vertical" = []; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = [ ]; - "kwin"."Window Move Center" = [ ]; - "kwin"."Window No Border" = [ ]; - "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window Move" = []; + "kwin"."Window Move Center" = []; + "kwin"."Window No Border" = []; + "kwin"."Window On All Desktops" = []; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = [ ]; - "kwin"."Window One Screen Up" = [ ]; - "kwin"."Window One Screen to the Left" = [ ]; - "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window One Screen Down" = []; + "kwin"."Window One Screen Up" = []; + "kwin"."Window One Screen to the Left" = []; + "kwin"."Window One Screen to the Right" = []; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = [ ]; - "kwin"."Window Pack Left" = [ ]; - "kwin"."Window Pack Right" = [ ]; - "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Pack Down" = []; + "kwin"."Window Pack Left" = []; + "kwin"."Window Pack Right" = []; + "kwin"."Window Pack Up" = []; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = [ ]; - "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Bottom Left" = []; + "kwin"."Window Quick Tile Bottom Right" = []; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = [ ]; - "kwin"."Window Quick Tile Top Right" = [ ]; - "kwin"."Window Raise" = [ ]; - "kwin"."Window Resize" = [ ]; - "kwin"."Window Shade" = [ ]; - "kwin"."Window Shrink Horizontal" = [ ]; - "kwin"."Window Shrink Vertical" = [ ]; - "kwin"."Window to Desktop 1" = [ ]; - "kwin"."Window to Desktop 10" = [ ]; - "kwin"."Window to Desktop 11" = [ ]; - "kwin"."Window to Desktop 12" = [ ]; - "kwin"."Window to Desktop 13" = [ ]; - "kwin"."Window to Desktop 14" = [ ]; - "kwin"."Window to Desktop 15" = [ ]; - "kwin"."Window to Desktop 16" = [ ]; - "kwin"."Window to Desktop 17" = [ ]; - "kwin"."Window to Desktop 18" = [ ]; - "kwin"."Window to Desktop 19" = [ ]; - "kwin"."Window to Desktop 2" = [ ]; - "kwin"."Window to Desktop 20" = [ ]; - "kwin"."Window to Desktop 3" = [ ]; - "kwin"."Window to Desktop 4" = [ ]; - "kwin"."Window to Desktop 5" = [ ]; - "kwin"."Window to Desktop 6" = [ ]; - "kwin"."Window to Desktop 7" = [ ]; - "kwin"."Window to Desktop 8" = [ ]; - "kwin"."Window to Desktop 9" = [ ]; - "kwin"."Window to Next Desktop" = [ ]; - "kwin"."Window to Next Screen" = [ ]; - "kwin"."Window to Previous Desktop" = [ ]; - "kwin"."Window to Previous Screen" = [ ]; - "kwin"."Window to Screen 0" = [ ]; - "kwin"."Window to Screen 1" = [ ]; - "kwin"."Window to Screen 2" = [ ]; - "kwin"."Window to Screen 3" = [ ]; - "kwin"."Window to Screen 4" = [ ]; - "kwin"."Window to Screen 5" = [ ]; - "kwin"."Window to Screen 6" = [ ]; - "kwin"."Window to Screen 7" = [ ]; + "kwin"."Window Quick Tile Top Left" = []; + "kwin"."Window Quick Tile Top Right" = []; + "kwin"."Window Raise" = []; + "kwin"."Window Resize" = []; + "kwin"."Window Shade" = []; + "kwin"."Window Shrink Horizontal" = []; + "kwin"."Window Shrink Vertical" = []; + "kwin"."Window to Desktop 1" = []; + "kwin"."Window to Desktop 10" = []; + "kwin"."Window to Desktop 11" = []; + "kwin"."Window to Desktop 12" = []; + "kwin"."Window to Desktop 13" = []; + "kwin"."Window to Desktop 14" = []; + "kwin"."Window to Desktop 15" = []; + "kwin"."Window to Desktop 16" = []; + "kwin"."Window to Desktop 17" = []; + "kwin"."Window to Desktop 18" = []; + "kwin"."Window to Desktop 19" = []; + "kwin"."Window to Desktop 2" = []; + "kwin"."Window to Desktop 20" = []; + "kwin"."Window to Desktop 3" = []; + "kwin"."Window to Desktop 4" = []; + "kwin"."Window to Desktop 5" = []; + "kwin"."Window to Desktop 6" = []; + "kwin"."Window to Desktop 7" = []; + "kwin"."Window to Desktop 8" = []; + "kwin"."Window to Desktop 9" = []; + "kwin"."Window to Next Desktop" = []; + "kwin"."Window to Next Screen" = []; + "kwin"."Window to Previous Desktop" = []; + "kwin"."Window to Previous Screen" = []; + "kwin"."Window to Screen 0" = []; + "kwin"."Window to Screen 1" = []; + "kwin"."Window to Screen 2" = []; + "kwin"."Window to Screen 3" = []; + "kwin"."Window to Screen 4" = []; + "kwin"."Window to Screen 5" = []; + "kwin"."Window to Screen 6" = []; + "kwin"."Window to Screen 7" = []; "kwin"."view_actual_size" = "Meta+0"; "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = [ ]; - "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."mediavolumedown" = []; + "mediacontrol"."mediavolumeup" = []; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playmedia" = []; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; "org.kde.dolphin.desktop"."_launch" = "Meta+E"; "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; - "org.kde.konsole.desktop"."NewTab" = [ ]; - "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."NewTab" = []; + "org.kde.konsole.desktop"."NewWindow" = []; "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; @@ -1080,9 +1088,9 @@ "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."Turn Off Screen" = []; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 10" = []; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -1091,29 +1099,29 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = [ ]; + "plasmashell"."clear-history" = []; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = [ ]; - "plasmashell"."cyclePrevAction" = [ ]; - "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."cycleNextAction" = []; + "plasmashell"."cyclePrevAction" = []; + "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; "plasmashell"."next activity" = "Meta+Tab"; "plasmashell"."previous activity" = "Meta+Shift+Tab"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-barcode" = []; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = [ ]; - "plasmashell"."switch to previous activity" = [ ]; - "plasmashell"."toggle do not disturb" = [ ]; + "plasmashell"."switch to next activity" = []; + "plasmashell"."switch to previous activity" = []; + "plasmashell"."toggle do not disturb" = []; "systemsettings.desktop"."_launch" = "Tools"; - "systemsettings.desktop"."kcm-kscreen" = [ ]; - "systemsettings.desktop"."kcm-lookandfeel" = [ ]; - "systemsettings.desktop"."kcm-users" = [ ]; - "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; - "systemsettings.desktop"."screenlocker" = [ ]; + "systemsettings.desktop"."kcm-kscreen" = []; + "systemsettings.desktop"."kcm-lookandfeel" = []; + "systemsettings.desktop"."kcm-users" = []; + "systemsettings.desktop"."powerdevilprofilesconfig" = []; + "systemsettings.desktop"."screenlocker" = []; }; configFile = { "baloofilerc"."General"."dbVersion" = 2; From ad13f430842ec662b4563dcc3792c7b6d1c1a0e2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 13:40:40 +0100 Subject: [PATCH 1028/2308] add the configuration blurb at the top --- .../plasma-desktop/configuration.nix | 281 ++++----- .../plasma-desktop/configuration.nix | 556 +++++++++--------- 2 files changed, 426 insertions(+), 411 deletions(-) diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix index a63f9d0..a193e98 100644 --- a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix +++ b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix @@ -1,8 +1,15 @@ { + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { programs.plasma = { enable = true; shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; @@ -10,36 +17,36 @@ "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "kded5"."Show System Activity" = "Ctrl+Esc"; "kded5"."display" = ["Display" "Meta+P"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Halt Without Confirmation" = []; "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = [ ]; - "ksmserver"."Reboot Without Confirmation" = [ ]; + "ksmserver"."Log Out Without Confirmation" = []; + "ksmserver"."Reboot Without Confirmation" = []; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Decrease Opacity" = [ ]; + "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = [ ]; - "kwin"."Increase Opacity" = [ ]; + "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."Increase Opacity" = []; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = [ ]; - "kwin"."MoveZoomLeft" = [ ]; - "kwin"."MoveZoomRight" = [ ]; - "kwin"."MoveZoomUp" = [ ]; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Setup Window Shortcut" = []; "kwin"."Show Desktop" = "Meta+D"; "kwin"."ShowDesktopGrid" = "Meta+F8"; "kwin"."Suspend Compositing" = "Alt+Shift+F12"; @@ -52,143 +59,143 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = [ ]; - "kwin"."Switch to Desktop 11" = [ ]; - "kwin"."Switch to Desktop 12" = [ ]; - "kwin"."Switch to Desktop 13" = [ ]; - "kwin"."Switch to Desktop 14" = [ ]; - "kwin"."Switch to Desktop 15" = [ ]; - "kwin"."Switch to Desktop 16" = [ ]; - "kwin"."Switch to Desktop 17" = [ ]; - "kwin"."Switch to Desktop 18" = [ ]; - "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 10" = []; + "kwin"."Switch to Desktop 11" = []; + "kwin"."Switch to Desktop 12" = []; + "kwin"."Switch to Desktop 13" = []; + "kwin"."Switch to Desktop 14" = []; + "kwin"."Switch to Desktop 15" = []; + "kwin"."Switch to Desktop 16" = []; + "kwin"."Switch to Desktop 17" = []; + "kwin"."Switch to Desktop 18" = []; + "kwin"."Switch to Desktop 19" = []; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 20" = []; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = [ ]; - "kwin"."Switch to Desktop 6" = [ ]; - "kwin"."Switch to Desktop 7" = [ ]; - "kwin"."Switch to Desktop 8" = [ ]; - "kwin"."Switch to Desktop 9" = [ ]; - "kwin"."Switch to Next Desktop" = [ ]; - "kwin"."Switch to Next Screen" = [ ]; - "kwin"."Switch to Previous Desktop" = [ ]; - "kwin"."Switch to Previous Screen" = [ ]; - "kwin"."Switch to Screen 0" = [ ]; - "kwin"."Switch to Screen 1" = [ ]; - "kwin"."Switch to Screen 2" = [ ]; - "kwin"."Switch to Screen 3" = [ ]; - "kwin"."Switch to Screen 4" = [ ]; - "kwin"."Switch to Screen 5" = [ ]; - "kwin"."Switch to Screen 6" = [ ]; - "kwin"."Switch to Screen 7" = [ ]; - "kwin"."Switch to Screen Above" = [ ]; - "kwin"."Switch to Screen Below" = [ ]; - "kwin"."Switch to Screen to the Left" = [ ]; - "kwin"."Switch to Screen to the Right" = [ ]; - "kwin"."Toggle Night Color" = [ ]; - "kwin"."Toggle Window Raise/Lower" = [ ]; - "kwin"."Walk Through Desktop List" = [ ]; - "kwin"."Walk Through Desktop List (Reverse)" = [ ]; - "kwin"."Walk Through Desktops" = [ ]; - "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Switch to Desktop 5" = []; + "kwin"."Switch to Desktop 6" = []; + "kwin"."Switch to Desktop 7" = []; + "kwin"."Switch to Desktop 8" = []; + "kwin"."Switch to Desktop 9" = []; + "kwin"."Switch to Next Desktop" = []; + "kwin"."Switch to Next Screen" = []; + "kwin"."Switch to Previous Desktop" = []; + "kwin"."Switch to Previous Screen" = []; + "kwin"."Switch to Screen 0" = []; + "kwin"."Switch to Screen 1" = []; + "kwin"."Switch to Screen 2" = []; + "kwin"."Switch to Screen 3" = []; + "kwin"."Switch to Screen 4" = []; + "kwin"."Switch to Screen 5" = []; + "kwin"."Switch to Screen 6" = []; + "kwin"."Switch to Screen 7" = []; + "kwin"."Switch to Screen Above" = []; + "kwin"."Switch to Screen Below" = []; + "kwin"."Switch to Screen to the Left" = []; + "kwin"."Switch to Screen to the Right" = []; + "kwin"."Toggle Night Color" = []; + "kwin"."Toggle Window Raise/Lower" = []; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = [ ]; - "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows Alternative" = []; + "kwin"."Walk Through Windows Alternative (Reverse)" = []; "kwin"."Walk Through Windows of Current Application" = "Alt+`"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; - "kwin"."Window Above Other Windows" = [ ]; - "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative" = []; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; + "kwin"."Window Above Other Windows" = []; + "kwin"."Window Below Other Windows" = []; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = [ ]; - "kwin"."Window Grow Horizontal" = [ ]; - "kwin"."Window Grow Vertical" = [ ]; - "kwin"."Window Lower" = [ ]; + "kwin"."Window Fullscreen" = []; + "kwin"."Window Grow Horizontal" = []; + "kwin"."Window Grow Vertical" = []; + "kwin"."Window Lower" = []; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = [ ]; - "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Maximize Horizontal" = []; + "kwin"."Window Maximize Vertical" = []; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = [ ]; - "kwin"."Window Move Center" = [ ]; - "kwin"."Window No Border" = [ ]; - "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window Move" = []; + "kwin"."Window Move Center" = []; + "kwin"."Window No Border" = []; + "kwin"."Window On All Desktops" = []; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = [ ]; - "kwin"."Window One Screen Up" = [ ]; - "kwin"."Window One Screen to the Left" = [ ]; - "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window One Screen Down" = []; + "kwin"."Window One Screen Up" = []; + "kwin"."Window One Screen to the Left" = []; + "kwin"."Window One Screen to the Right" = []; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = [ ]; - "kwin"."Window Pack Left" = [ ]; - "kwin"."Window Pack Right" = [ ]; - "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Pack Down" = []; + "kwin"."Window Pack Left" = []; + "kwin"."Window Pack Right" = []; + "kwin"."Window Pack Up" = []; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = [ ]; - "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Bottom Left" = []; + "kwin"."Window Quick Tile Bottom Right" = []; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = [ ]; - "kwin"."Window Quick Tile Top Right" = [ ]; - "kwin"."Window Raise" = [ ]; - "kwin"."Window Resize" = [ ]; - "kwin"."Window Shade" = [ ]; - "kwin"."Window Shrink Horizontal" = [ ]; - "kwin"."Window Shrink Vertical" = [ ]; - "kwin"."Window to Desktop 1" = [ ]; - "kwin"."Window to Desktop 10" = [ ]; - "kwin"."Window to Desktop 11" = [ ]; - "kwin"."Window to Desktop 12" = [ ]; - "kwin"."Window to Desktop 13" = [ ]; - "kwin"."Window to Desktop 14" = [ ]; - "kwin"."Window to Desktop 15" = [ ]; - "kwin"."Window to Desktop 16" = [ ]; - "kwin"."Window to Desktop 17" = [ ]; - "kwin"."Window to Desktop 18" = [ ]; - "kwin"."Window to Desktop 19" = [ ]; - "kwin"."Window to Desktop 2" = [ ]; - "kwin"."Window to Desktop 20" = [ ]; - "kwin"."Window to Desktop 3" = [ ]; - "kwin"."Window to Desktop 4" = [ ]; - "kwin"."Window to Desktop 5" = [ ]; - "kwin"."Window to Desktop 6" = [ ]; - "kwin"."Window to Desktop 7" = [ ]; - "kwin"."Window to Desktop 8" = [ ]; - "kwin"."Window to Desktop 9" = [ ]; - "kwin"."Window to Next Desktop" = [ ]; - "kwin"."Window to Next Screen" = [ ]; - "kwin"."Window to Previous Desktop" = [ ]; - "kwin"."Window to Previous Screen" = [ ]; - "kwin"."Window to Screen 0" = [ ]; - "kwin"."Window to Screen 1" = [ ]; - "kwin"."Window to Screen 2" = [ ]; - "kwin"."Window to Screen 3" = [ ]; - "kwin"."Window to Screen 4" = [ ]; - "kwin"."Window to Screen 5" = [ ]; - "kwin"."Window to Screen 6" = [ ]; - "kwin"."Window to Screen 7" = [ ]; + "kwin"."Window Quick Tile Top Left" = []; + "kwin"."Window Quick Tile Top Right" = []; + "kwin"."Window Raise" = []; + "kwin"."Window Resize" = []; + "kwin"."Window Shade" = []; + "kwin"."Window Shrink Horizontal" = []; + "kwin"."Window Shrink Vertical" = []; + "kwin"."Window to Desktop 1" = []; + "kwin"."Window to Desktop 10" = []; + "kwin"."Window to Desktop 11" = []; + "kwin"."Window to Desktop 12" = []; + "kwin"."Window to Desktop 13" = []; + "kwin"."Window to Desktop 14" = []; + "kwin"."Window to Desktop 15" = []; + "kwin"."Window to Desktop 16" = []; + "kwin"."Window to Desktop 17" = []; + "kwin"."Window to Desktop 18" = []; + "kwin"."Window to Desktop 19" = []; + "kwin"."Window to Desktop 2" = []; + "kwin"."Window to Desktop 20" = []; + "kwin"."Window to Desktop 3" = []; + "kwin"."Window to Desktop 4" = []; + "kwin"."Window to Desktop 5" = []; + "kwin"."Window to Desktop 6" = []; + "kwin"."Window to Desktop 7" = []; + "kwin"."Window to Desktop 8" = []; + "kwin"."Window to Desktop 9" = []; + "kwin"."Window to Next Desktop" = []; + "kwin"."Window to Next Screen" = []; + "kwin"."Window to Previous Desktop" = []; + "kwin"."Window to Previous Screen" = []; + "kwin"."Window to Screen 0" = []; + "kwin"."Window to Screen 1" = []; + "kwin"."Window to Screen 2" = []; + "kwin"."Window to Screen 3" = []; + "kwin"."Window to Screen 4" = []; + "kwin"."Window to Screen 5" = []; + "kwin"."Window to Screen 6" = []; + "kwin"."Window to Screen 7" = []; "kwin"."view_actual_size" = "Meta+0"; "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = [ ]; - "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."mediavolumedown" = []; + "mediacontrol"."mediavolumeup" = []; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playmedia" = []; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; "org.kde.dolphin.desktop"."_launch" = "Meta+E"; "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; - "org.kde.konsole.desktop"."NewTab" = [ ]; - "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."NewTab" = []; + "org.kde.konsole.desktop"."NewWindow" = []; "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; @@ -209,9 +216,9 @@ "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."Turn Off Screen" = []; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 10" = []; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -220,29 +227,29 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = [ ]; + "plasmashell"."clear-history" = []; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = [ ]; - "plasmashell"."cyclePrevAction" = [ ]; - "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."cycleNextAction" = []; + "plasmashell"."cyclePrevAction" = []; + "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; "plasmashell"."next activity" = "Meta+Tab"; "plasmashell"."previous activity" = "Meta+Shift+Tab"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-barcode" = []; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = [ ]; - "plasmashell"."switch to previous activity" = [ ]; - "plasmashell"."toggle do not disturb" = [ ]; + "plasmashell"."switch to next activity" = []; + "plasmashell"."switch to previous activity" = []; + "plasmashell"."toggle do not disturb" = []; "systemsettings.desktop"."_launch" = "Tools"; - "systemsettings.desktop"."kcm-kscreen" = [ ]; - "systemsettings.desktop"."kcm-lookandfeel" = [ ]; - "systemsettings.desktop"."kcm-users" = [ ]; - "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; - "systemsettings.desktop"."screenlocker" = [ ]; + "systemsettings.desktop"."kcm-kscreen" = []; + "systemsettings.desktop"."kcm-lookandfeel" = []; + "systemsettings.desktop"."kcm-users" = []; + "systemsettings.desktop"."powerdevilprofilesconfig" = []; + "systemsettings.desktop"."screenlocker" = []; }; configFile = { "baloofilerc"."General"."dbVersion" = 2; diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix index 9e6a5f0..93f8663 100644 --- a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix +++ b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix @@ -1,8 +1,16 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { programs.plasma = { enable = true; shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; @@ -10,36 +18,36 @@ "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "kded5"."Show System Activity" = "Ctrl+Esc"; "kded5"."display" = ["Display" "Meta+P"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Halt Without Confirmation" = []; "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = [ ]; - "ksmserver"."Reboot Without Confirmation" = [ ]; + "ksmserver"."Log Out Without Confirmation" = []; + "ksmserver"."Reboot Without Confirmation" = []; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Decrease Opacity" = [ ]; + "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = [ ]; - "kwin"."Increase Opacity" = [ ]; + "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."Increase Opacity" = []; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = [ ]; - "kwin"."MoveZoomLeft" = [ ]; - "kwin"."MoveZoomRight" = [ ]; - "kwin"."MoveZoomUp" = [ ]; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Setup Window Shortcut" = []; "kwin"."Show Desktop" = "Meta+D"; "kwin"."ShowDesktopGrid" = "Meta+F8"; "kwin"."Suspend Compositing" = "Alt+Shift+F12"; @@ -52,143 +60,143 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = [ ]; - "kwin"."Switch to Desktop 11" = [ ]; - "kwin"."Switch to Desktop 12" = [ ]; - "kwin"."Switch to Desktop 13" = [ ]; - "kwin"."Switch to Desktop 14" = [ ]; - "kwin"."Switch to Desktop 15" = [ ]; - "kwin"."Switch to Desktop 16" = [ ]; - "kwin"."Switch to Desktop 17" = [ ]; - "kwin"."Switch to Desktop 18" = [ ]; - "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 10" = []; + "kwin"."Switch to Desktop 11" = []; + "kwin"."Switch to Desktop 12" = []; + "kwin"."Switch to Desktop 13" = []; + "kwin"."Switch to Desktop 14" = []; + "kwin"."Switch to Desktop 15" = []; + "kwin"."Switch to Desktop 16" = []; + "kwin"."Switch to Desktop 17" = []; + "kwin"."Switch to Desktop 18" = []; + "kwin"."Switch to Desktop 19" = []; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 20" = []; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = [ ]; - "kwin"."Switch to Desktop 6" = [ ]; - "kwin"."Switch to Desktop 7" = [ ]; - "kwin"."Switch to Desktop 8" = [ ]; - "kwin"."Switch to Desktop 9" = [ ]; - "kwin"."Switch to Next Desktop" = [ ]; - "kwin"."Switch to Next Screen" = [ ]; - "kwin"."Switch to Previous Desktop" = [ ]; - "kwin"."Switch to Previous Screen" = [ ]; - "kwin"."Switch to Screen 0" = [ ]; - "kwin"."Switch to Screen 1" = [ ]; - "kwin"."Switch to Screen 2" = [ ]; - "kwin"."Switch to Screen 3" = [ ]; - "kwin"."Switch to Screen 4" = [ ]; - "kwin"."Switch to Screen 5" = [ ]; - "kwin"."Switch to Screen 6" = [ ]; - "kwin"."Switch to Screen 7" = [ ]; - "kwin"."Switch to Screen Above" = [ ]; - "kwin"."Switch to Screen Below" = [ ]; - "kwin"."Switch to Screen to the Left" = [ ]; - "kwin"."Switch to Screen to the Right" = [ ]; - "kwin"."Toggle Night Color" = [ ]; - "kwin"."Toggle Window Raise/Lower" = [ ]; - "kwin"."Walk Through Desktop List" = [ ]; - "kwin"."Walk Through Desktop List (Reverse)" = [ ]; - "kwin"."Walk Through Desktops" = [ ]; - "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Switch to Desktop 5" = []; + "kwin"."Switch to Desktop 6" = []; + "kwin"."Switch to Desktop 7" = []; + "kwin"."Switch to Desktop 8" = []; + "kwin"."Switch to Desktop 9" = []; + "kwin"."Switch to Next Desktop" = []; + "kwin"."Switch to Next Screen" = []; + "kwin"."Switch to Previous Desktop" = []; + "kwin"."Switch to Previous Screen" = []; + "kwin"."Switch to Screen 0" = []; + "kwin"."Switch to Screen 1" = []; + "kwin"."Switch to Screen 2" = []; + "kwin"."Switch to Screen 3" = []; + "kwin"."Switch to Screen 4" = []; + "kwin"."Switch to Screen 5" = []; + "kwin"."Switch to Screen 6" = []; + "kwin"."Switch to Screen 7" = []; + "kwin"."Switch to Screen Above" = []; + "kwin"."Switch to Screen Below" = []; + "kwin"."Switch to Screen to the Left" = []; + "kwin"."Switch to Screen to the Right" = []; + "kwin"."Toggle Night Color" = []; + "kwin"."Toggle Window Raise/Lower" = []; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = [ ]; - "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows Alternative" = []; + "kwin"."Walk Through Windows Alternative (Reverse)" = []; "kwin"."Walk Through Windows of Current Application" = "Alt+`"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; - "kwin"."Window Above Other Windows" = [ ]; - "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative" = []; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; + "kwin"."Window Above Other Windows" = []; + "kwin"."Window Below Other Windows" = []; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = [ ]; - "kwin"."Window Grow Horizontal" = [ ]; - "kwin"."Window Grow Vertical" = [ ]; - "kwin"."Window Lower" = [ ]; + "kwin"."Window Fullscreen" = []; + "kwin"."Window Grow Horizontal" = []; + "kwin"."Window Grow Vertical" = []; + "kwin"."Window Lower" = []; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = [ ]; - "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Maximize Horizontal" = []; + "kwin"."Window Maximize Vertical" = []; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = [ ]; - "kwin"."Window Move Center" = [ ]; - "kwin"."Window No Border" = [ ]; - "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window Move" = []; + "kwin"."Window Move Center" = []; + "kwin"."Window No Border" = []; + "kwin"."Window On All Desktops" = []; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = [ ]; - "kwin"."Window One Screen Up" = [ ]; - "kwin"."Window One Screen to the Left" = [ ]; - "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window One Screen Down" = []; + "kwin"."Window One Screen Up" = []; + "kwin"."Window One Screen to the Left" = []; + "kwin"."Window One Screen to the Right" = []; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = [ ]; - "kwin"."Window Pack Left" = [ ]; - "kwin"."Window Pack Right" = [ ]; - "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Pack Down" = []; + "kwin"."Window Pack Left" = []; + "kwin"."Window Pack Right" = []; + "kwin"."Window Pack Up" = []; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = [ ]; - "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Bottom Left" = []; + "kwin"."Window Quick Tile Bottom Right" = []; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = [ ]; - "kwin"."Window Quick Tile Top Right" = [ ]; - "kwin"."Window Raise" = [ ]; - "kwin"."Window Resize" = [ ]; - "kwin"."Window Shade" = [ ]; - "kwin"."Window Shrink Horizontal" = [ ]; - "kwin"."Window Shrink Vertical" = [ ]; - "kwin"."Window to Desktop 1" = [ ]; - "kwin"."Window to Desktop 10" = [ ]; - "kwin"."Window to Desktop 11" = [ ]; - "kwin"."Window to Desktop 12" = [ ]; - "kwin"."Window to Desktop 13" = [ ]; - "kwin"."Window to Desktop 14" = [ ]; - "kwin"."Window to Desktop 15" = [ ]; - "kwin"."Window to Desktop 16" = [ ]; - "kwin"."Window to Desktop 17" = [ ]; - "kwin"."Window to Desktop 18" = [ ]; - "kwin"."Window to Desktop 19" = [ ]; - "kwin"."Window to Desktop 2" = [ ]; - "kwin"."Window to Desktop 20" = [ ]; - "kwin"."Window to Desktop 3" = [ ]; - "kwin"."Window to Desktop 4" = [ ]; - "kwin"."Window to Desktop 5" = [ ]; - "kwin"."Window to Desktop 6" = [ ]; - "kwin"."Window to Desktop 7" = [ ]; - "kwin"."Window to Desktop 8" = [ ]; - "kwin"."Window to Desktop 9" = [ ]; - "kwin"."Window to Next Desktop" = [ ]; - "kwin"."Window to Next Screen" = [ ]; - "kwin"."Window to Previous Desktop" = [ ]; - "kwin"."Window to Previous Screen" = [ ]; - "kwin"."Window to Screen 0" = [ ]; - "kwin"."Window to Screen 1" = [ ]; - "kwin"."Window to Screen 2" = [ ]; - "kwin"."Window to Screen 3" = [ ]; - "kwin"."Window to Screen 4" = [ ]; - "kwin"."Window to Screen 5" = [ ]; - "kwin"."Window to Screen 6" = [ ]; - "kwin"."Window to Screen 7" = [ ]; + "kwin"."Window Quick Tile Top Left" = []; + "kwin"."Window Quick Tile Top Right" = []; + "kwin"."Window Raise" = []; + "kwin"."Window Resize" = []; + "kwin"."Window Shade" = []; + "kwin"."Window Shrink Horizontal" = []; + "kwin"."Window Shrink Vertical" = []; + "kwin"."Window to Desktop 1" = []; + "kwin"."Window to Desktop 10" = []; + "kwin"."Window to Desktop 11" = []; + "kwin"."Window to Desktop 12" = []; + "kwin"."Window to Desktop 13" = []; + "kwin"."Window to Desktop 14" = []; + "kwin"."Window to Desktop 15" = []; + "kwin"."Window to Desktop 16" = []; + "kwin"."Window to Desktop 17" = []; + "kwin"."Window to Desktop 18" = []; + "kwin"."Window to Desktop 19" = []; + "kwin"."Window to Desktop 2" = []; + "kwin"."Window to Desktop 20" = []; + "kwin"."Window to Desktop 3" = []; + "kwin"."Window to Desktop 4" = []; + "kwin"."Window to Desktop 5" = []; + "kwin"."Window to Desktop 6" = []; + "kwin"."Window to Desktop 7" = []; + "kwin"."Window to Desktop 8" = []; + "kwin"."Window to Desktop 9" = []; + "kwin"."Window to Next Desktop" = []; + "kwin"."Window to Next Screen" = []; + "kwin"."Window to Previous Desktop" = []; + "kwin"."Window to Previous Screen" = []; + "kwin"."Window to Screen 0" = []; + "kwin"."Window to Screen 1" = []; + "kwin"."Window to Screen 2" = []; + "kwin"."Window to Screen 3" = []; + "kwin"."Window to Screen 4" = []; + "kwin"."Window to Screen 5" = []; + "kwin"."Window to Screen 6" = []; + "kwin"."Window to Screen 7" = []; "kwin"."view_actual_size" = "Meta+0"; "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = [ ]; - "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."mediavolumedown" = []; + "mediacontrol"."mediavolumeup" = []; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playmedia" = []; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; "org.kde.dolphin.desktop"."_launch" = "Meta+E"; "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; - "org.kde.konsole.desktop"."NewTab" = [ ]; - "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."NewTab" = []; + "org.kde.konsole.desktop"."NewWindow" = []; "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; @@ -209,9 +217,9 @@ "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."Turn Off Screen" = []; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 10" = []; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -220,29 +228,29 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = [ ]; + "plasmashell"."clear-history" = []; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = [ ]; - "plasmashell"."cyclePrevAction" = [ ]; - "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."cycleNextAction" = []; + "plasmashell"."cyclePrevAction" = []; + "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; "plasmashell"."next activity" = "Meta+Tab"; "plasmashell"."previous activity" = "Meta+Shift+Tab"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-barcode" = []; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = [ ]; - "plasmashell"."switch to previous activity" = [ ]; - "plasmashell"."toggle do not disturb" = [ ]; + "plasmashell"."switch to next activity" = []; + "plasmashell"."switch to previous activity" = []; + "plasmashell"."toggle do not disturb" = []; "systemsettings.desktop"."_launch" = "Tools"; - "systemsettings.desktop"."kcm-kscreen" = [ ]; - "systemsettings.desktop"."kcm-lookandfeel" = [ ]; - "systemsettings.desktop"."kcm-users" = [ ]; - "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; - "systemsettings.desktop"."screenlocker" = [ ]; + "systemsettings.desktop"."kcm-kscreen" = []; + "systemsettings.desktop"."kcm-lookandfeel" = []; + "systemsettings.desktop"."kcm-users" = []; + "systemsettings.desktop"."powerdevilprofilesconfig" = []; + "systemsettings.desktop"."screenlocker" = []; }; configFile = { "baloofilerc"."General"."dbVersion" = 2; @@ -873,7 +881,7 @@ programs.plasma = { enable = true; shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; @@ -881,36 +889,36 @@ "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "kded5"."Show System Activity" = "Ctrl+Esc"; "kded5"."display" = ["Display" "Meta+P"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Halt Without Confirmation" = []; "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = [ ]; - "ksmserver"."Reboot Without Confirmation" = [ ]; + "ksmserver"."Log Out Without Confirmation" = []; + "ksmserver"."Reboot Without Confirmation" = []; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Decrease Opacity" = [ ]; + "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = [ ]; - "kwin"."Increase Opacity" = [ ]; + "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."Increase Opacity" = []; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = [ ]; - "kwin"."MoveZoomLeft" = [ ]; - "kwin"."MoveZoomRight" = [ ]; - "kwin"."MoveZoomUp" = [ ]; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Setup Window Shortcut" = []; "kwin"."Show Desktop" = "Meta+D"; "kwin"."ShowDesktopGrid" = "Meta+F8"; "kwin"."Suspend Compositing" = "Alt+Shift+F12"; @@ -923,143 +931,143 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = [ ]; - "kwin"."Switch to Desktop 11" = [ ]; - "kwin"."Switch to Desktop 12" = [ ]; - "kwin"."Switch to Desktop 13" = [ ]; - "kwin"."Switch to Desktop 14" = [ ]; - "kwin"."Switch to Desktop 15" = [ ]; - "kwin"."Switch to Desktop 16" = [ ]; - "kwin"."Switch to Desktop 17" = [ ]; - "kwin"."Switch to Desktop 18" = [ ]; - "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 10" = []; + "kwin"."Switch to Desktop 11" = []; + "kwin"."Switch to Desktop 12" = []; + "kwin"."Switch to Desktop 13" = []; + "kwin"."Switch to Desktop 14" = []; + "kwin"."Switch to Desktop 15" = []; + "kwin"."Switch to Desktop 16" = []; + "kwin"."Switch to Desktop 17" = []; + "kwin"."Switch to Desktop 18" = []; + "kwin"."Switch to Desktop 19" = []; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 20" = []; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = [ ]; - "kwin"."Switch to Desktop 6" = [ ]; - "kwin"."Switch to Desktop 7" = [ ]; - "kwin"."Switch to Desktop 8" = [ ]; - "kwin"."Switch to Desktop 9" = [ ]; - "kwin"."Switch to Next Desktop" = [ ]; - "kwin"."Switch to Next Screen" = [ ]; - "kwin"."Switch to Previous Desktop" = [ ]; - "kwin"."Switch to Previous Screen" = [ ]; - "kwin"."Switch to Screen 0" = [ ]; - "kwin"."Switch to Screen 1" = [ ]; - "kwin"."Switch to Screen 2" = [ ]; - "kwin"."Switch to Screen 3" = [ ]; - "kwin"."Switch to Screen 4" = [ ]; - "kwin"."Switch to Screen 5" = [ ]; - "kwin"."Switch to Screen 6" = [ ]; - "kwin"."Switch to Screen 7" = [ ]; - "kwin"."Switch to Screen Above" = [ ]; - "kwin"."Switch to Screen Below" = [ ]; - "kwin"."Switch to Screen to the Left" = [ ]; - "kwin"."Switch to Screen to the Right" = [ ]; - "kwin"."Toggle Night Color" = [ ]; - "kwin"."Toggle Window Raise/Lower" = [ ]; - "kwin"."Walk Through Desktop List" = [ ]; - "kwin"."Walk Through Desktop List (Reverse)" = [ ]; - "kwin"."Walk Through Desktops" = [ ]; - "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Switch to Desktop 5" = []; + "kwin"."Switch to Desktop 6" = []; + "kwin"."Switch to Desktop 7" = []; + "kwin"."Switch to Desktop 8" = []; + "kwin"."Switch to Desktop 9" = []; + "kwin"."Switch to Next Desktop" = []; + "kwin"."Switch to Next Screen" = []; + "kwin"."Switch to Previous Desktop" = []; + "kwin"."Switch to Previous Screen" = []; + "kwin"."Switch to Screen 0" = []; + "kwin"."Switch to Screen 1" = []; + "kwin"."Switch to Screen 2" = []; + "kwin"."Switch to Screen 3" = []; + "kwin"."Switch to Screen 4" = []; + "kwin"."Switch to Screen 5" = []; + "kwin"."Switch to Screen 6" = []; + "kwin"."Switch to Screen 7" = []; + "kwin"."Switch to Screen Above" = []; + "kwin"."Switch to Screen Below" = []; + "kwin"."Switch to Screen to the Left" = []; + "kwin"."Switch to Screen to the Right" = []; + "kwin"."Toggle Night Color" = []; + "kwin"."Toggle Window Raise/Lower" = []; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = [ ]; - "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows Alternative" = []; + "kwin"."Walk Through Windows Alternative (Reverse)" = []; "kwin"."Walk Through Windows of Current Application" = "Alt+`"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; - "kwin"."Window Above Other Windows" = [ ]; - "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative" = []; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; + "kwin"."Window Above Other Windows" = []; + "kwin"."Window Below Other Windows" = []; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = [ ]; - "kwin"."Window Grow Horizontal" = [ ]; - "kwin"."Window Grow Vertical" = [ ]; - "kwin"."Window Lower" = [ ]; + "kwin"."Window Fullscreen" = []; + "kwin"."Window Grow Horizontal" = []; + "kwin"."Window Grow Vertical" = []; + "kwin"."Window Lower" = []; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = [ ]; - "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Maximize Horizontal" = []; + "kwin"."Window Maximize Vertical" = []; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = [ ]; - "kwin"."Window Move Center" = [ ]; - "kwin"."Window No Border" = [ ]; - "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window Move" = []; + "kwin"."Window Move Center" = []; + "kwin"."Window No Border" = []; + "kwin"."Window On All Desktops" = []; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = [ ]; - "kwin"."Window One Screen Up" = [ ]; - "kwin"."Window One Screen to the Left" = [ ]; - "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window One Screen Down" = []; + "kwin"."Window One Screen Up" = []; + "kwin"."Window One Screen to the Left" = []; + "kwin"."Window One Screen to the Right" = []; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = [ ]; - "kwin"."Window Pack Left" = [ ]; - "kwin"."Window Pack Right" = [ ]; - "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Pack Down" = []; + "kwin"."Window Pack Left" = []; + "kwin"."Window Pack Right" = []; + "kwin"."Window Pack Up" = []; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = [ ]; - "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Bottom Left" = []; + "kwin"."Window Quick Tile Bottom Right" = []; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = [ ]; - "kwin"."Window Quick Tile Top Right" = [ ]; - "kwin"."Window Raise" = [ ]; - "kwin"."Window Resize" = [ ]; - "kwin"."Window Shade" = [ ]; - "kwin"."Window Shrink Horizontal" = [ ]; - "kwin"."Window Shrink Vertical" = [ ]; - "kwin"."Window to Desktop 1" = [ ]; - "kwin"."Window to Desktop 10" = [ ]; - "kwin"."Window to Desktop 11" = [ ]; - "kwin"."Window to Desktop 12" = [ ]; - "kwin"."Window to Desktop 13" = [ ]; - "kwin"."Window to Desktop 14" = [ ]; - "kwin"."Window to Desktop 15" = [ ]; - "kwin"."Window to Desktop 16" = [ ]; - "kwin"."Window to Desktop 17" = [ ]; - "kwin"."Window to Desktop 18" = [ ]; - "kwin"."Window to Desktop 19" = [ ]; - "kwin"."Window to Desktop 2" = [ ]; - "kwin"."Window to Desktop 20" = [ ]; - "kwin"."Window to Desktop 3" = [ ]; - "kwin"."Window to Desktop 4" = [ ]; - "kwin"."Window to Desktop 5" = [ ]; - "kwin"."Window to Desktop 6" = [ ]; - "kwin"."Window to Desktop 7" = [ ]; - "kwin"."Window to Desktop 8" = [ ]; - "kwin"."Window to Desktop 9" = [ ]; - "kwin"."Window to Next Desktop" = [ ]; - "kwin"."Window to Next Screen" = [ ]; - "kwin"."Window to Previous Desktop" = [ ]; - "kwin"."Window to Previous Screen" = [ ]; - "kwin"."Window to Screen 0" = [ ]; - "kwin"."Window to Screen 1" = [ ]; - "kwin"."Window to Screen 2" = [ ]; - "kwin"."Window to Screen 3" = [ ]; - "kwin"."Window to Screen 4" = [ ]; - "kwin"."Window to Screen 5" = [ ]; - "kwin"."Window to Screen 6" = [ ]; - "kwin"."Window to Screen 7" = [ ]; + "kwin"."Window Quick Tile Top Left" = []; + "kwin"."Window Quick Tile Top Right" = []; + "kwin"."Window Raise" = []; + "kwin"."Window Resize" = []; + "kwin"."Window Shade" = []; + "kwin"."Window Shrink Horizontal" = []; + "kwin"."Window Shrink Vertical" = []; + "kwin"."Window to Desktop 1" = []; + "kwin"."Window to Desktop 10" = []; + "kwin"."Window to Desktop 11" = []; + "kwin"."Window to Desktop 12" = []; + "kwin"."Window to Desktop 13" = []; + "kwin"."Window to Desktop 14" = []; + "kwin"."Window to Desktop 15" = []; + "kwin"."Window to Desktop 16" = []; + "kwin"."Window to Desktop 17" = []; + "kwin"."Window to Desktop 18" = []; + "kwin"."Window to Desktop 19" = []; + "kwin"."Window to Desktop 2" = []; + "kwin"."Window to Desktop 20" = []; + "kwin"."Window to Desktop 3" = []; + "kwin"."Window to Desktop 4" = []; + "kwin"."Window to Desktop 5" = []; + "kwin"."Window to Desktop 6" = []; + "kwin"."Window to Desktop 7" = []; + "kwin"."Window to Desktop 8" = []; + "kwin"."Window to Desktop 9" = []; + "kwin"."Window to Next Desktop" = []; + "kwin"."Window to Next Screen" = []; + "kwin"."Window to Previous Desktop" = []; + "kwin"."Window to Previous Screen" = []; + "kwin"."Window to Screen 0" = []; + "kwin"."Window to Screen 1" = []; + "kwin"."Window to Screen 2" = []; + "kwin"."Window to Screen 3" = []; + "kwin"."Window to Screen 4" = []; + "kwin"."Window to Screen 5" = []; + "kwin"."Window to Screen 6" = []; + "kwin"."Window to Screen 7" = []; "kwin"."view_actual_size" = "Meta+0"; "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = [ ]; - "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."mediavolumedown" = []; + "mediacontrol"."mediavolumeup" = []; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playmedia" = []; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; "org.kde.dolphin.desktop"."_launch" = "Meta+E"; "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; - "org.kde.konsole.desktop"."NewTab" = [ ]; - "org.kde.konsole.desktop"."NewWindow" = [ ]; + "org.kde.konsole.desktop"."NewTab" = []; + "org.kde.konsole.desktop"."NewWindow" = []; "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; @@ -1080,9 +1088,9 @@ "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."Turn Off Screen" = []; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 10" = []; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -1091,29 +1099,29 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = [ ]; + "plasmashell"."clear-history" = []; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = [ ]; - "plasmashell"."cyclePrevAction" = [ ]; - "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."cycleNextAction" = []; + "plasmashell"."cyclePrevAction" = []; + "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; "plasmashell"."next activity" = "Meta+Tab"; "plasmashell"."previous activity" = "Meta+Shift+Tab"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-barcode" = []; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = [ ]; - "plasmashell"."switch to previous activity" = [ ]; - "plasmashell"."toggle do not disturb" = [ ]; + "plasmashell"."switch to next activity" = []; + "plasmashell"."switch to previous activity" = []; + "plasmashell"."toggle do not disturb" = []; "systemsettings.desktop"."_launch" = "Tools"; - "systemsettings.desktop"."kcm-kscreen" = [ ]; - "systemsettings.desktop"."kcm-lookandfeel" = [ ]; - "systemsettings.desktop"."kcm-users" = [ ]; - "systemsettings.desktop"."powerdevilprofilesconfig" = [ ]; - "systemsettings.desktop"."screenlocker" = [ ]; + "systemsettings.desktop"."kcm-kscreen" = []; + "systemsettings.desktop"."kcm-lookandfeel" = []; + "systemsettings.desktop"."kcm-users" = []; + "systemsettings.desktop"."powerdevilprofilesconfig" = []; + "systemsettings.desktop"."screenlocker" = []; }; configFile = { "baloofilerc"."General"."dbVersion" = 2; From 9175191d23d03c01be34a16159cabb3cc6b249cb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 13:42:07 +0100 Subject: [PATCH 1029/2308] Set up plasma with nix (hopefully) --- home-manager/hosts/EDI/EDI-Lillian.nix | 1 + home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/hosts/EDI/EDI-Lillian.nix b/home-manager/hosts/EDI/EDI-Lillian.nix index 196022c..613434a 100644 --- a/home-manager/hosts/EDI/EDI-Lillian.nix +++ b/home-manager/hosts/EDI/EDI-Lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop/configuration.nix + ./package-configs/plasma-desktop/configuration.nix ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index a861636..bf89721 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -19,7 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop/configuration.nix - #./package-configs/plasma-desktop/configuration.nix + ./package-configs/plasma-desktop/configuration.nix ]; home.packages = with pkgs; [ From 0fbfe51adbea87285e42ae72e686a97585ccb069 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 13:42:07 +0100 Subject: [PATCH 1030/2308] Set up plasma with nix (hopefully) --- home-manager/hosts/EDI/EDI-Lillian.nix | 1 + home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/hosts/EDI/EDI-Lillian.nix b/home-manager/hosts/EDI/EDI-Lillian.nix index 196022c..613434a 100644 --- a/home-manager/hosts/EDI/EDI-Lillian.nix +++ b/home-manager/hosts/EDI/EDI-Lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop/configuration.nix + ./package-configs/plasma-desktop/configuration.nix ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index a861636..bf89721 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -19,7 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop/configuration.nix - #./package-configs/plasma-desktop/configuration.nix + ./package-configs/plasma-desktop/configuration.nix ]; home.packages = with pkgs; [ From a0b98a53c55a7dd235da9e0f506dd5a24477e8ed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 13:45:02 +0100 Subject: [PATCH 1031/2308] Ad home manager module in flake --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 7342ca4..e6726ed 100644 --- a/flake.nix +++ b/flake.nix @@ -61,6 +61,7 @@ # > Our main nixos configuration file < ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops + plasma-manager.homeManagerModules.plasma-manager ]; }; }; @@ -73,7 +74,7 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops - #plasma-manager.homeManagerModules.plasma-manager + plasma-manager.homeManagerModules.plasma-manager home-manager.nixosModules.home-manager ]; }; From c0a0897041dda44ed65bbff34273c01f246aad71 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 13:45:02 +0100 Subject: [PATCH 1032/2308] Ad home manager module in flake --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 7342ca4..e6726ed 100644 --- a/flake.nix +++ b/flake.nix @@ -61,6 +61,7 @@ # > Our main nixos configuration file < ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops + plasma-manager.homeManagerModules.plasma-manager ]; }; }; @@ -73,7 +74,7 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops - #plasma-manager.homeManagerModules.plasma-manager + plasma-manager.homeManagerModules.plasma-manager home-manager.nixosModules.home-manager ]; }; From c076b05453fb4c0c514fd57284979d2e11e056f7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 15:38:26 +0100 Subject: [PATCH 1033/2308] Add python code formatter to vscode --- home-manager/desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 3d465dc..e9669b3 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -106,6 +106,7 @@ kamadorueda.alejandra ms-toolsai.jupyter ms-pyright.pyright + ms-python.black-formatter #ms-python.python ms-python.vscode-pylance #ms-vscode-remote.remote-containers From 4998d6849fb628c8113f8abc8578bdbc354b0ff4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Jan 2024 15:38:26 +0100 Subject: [PATCH 1034/2308] Add python code formatter to vscode --- home-manager/desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 3d465dc..e9669b3 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -106,6 +106,7 @@ kamadorueda.alejandra ms-toolsai.jupyter ms-pyright.pyright + ms-python.black-formatter #ms-python.python ms-python.vscode-pylance #ms-vscode-remote.remote-containers From 40666e922f2e87cc5e15f004e018db2dcf8b1c1f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Jan 2024 10:29:41 +0100 Subject: [PATCH 1035/2308] Update plasma manager config, and set default git branch to main --- flake.nix | 13 +++++++++++-- home-manager/desktop/configuration.nix | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index e6726ed..6ef8ebb 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,12 @@ # > Our main nixos configuration file < ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops - plasma-manager.homeManagerModules.plasma-manager + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; + } ]; }; }; @@ -74,8 +79,12 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops - plasma-manager.homeManagerModules.plasma-manager home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; + } ]; }; }; diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index e9669b3..4d896bc 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -123,6 +123,11 @@ enable = true; userEmail = "git@lillianviolet.dev"; userName = "Lillian-Violet"; + extraConfig = { + init = { + defaultBranch = "main"; + }; + }; }; # Nicely reload system units when changing configs From a20e12c51c05784d116e96769dec15a94d0d2b61 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Jan 2024 10:29:41 +0100 Subject: [PATCH 1036/2308] Update plasma manager config, and set default git branch to main --- flake.nix | 13 +++++++++++-- home-manager/desktop/configuration.nix | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index e6726ed..6ef8ebb 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,12 @@ # > Our main nixos configuration file < ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops - plasma-manager.homeManagerModules.plasma-manager + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; + } ]; }; }; @@ -74,8 +79,12 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops - plasma-manager.homeManagerModules.plasma-manager home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; + } ]; }; }; diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index e9669b3..4d896bc 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -123,6 +123,11 @@ enable = true; userEmail = "git@lillianviolet.dev"; userName = "Lillian-Violet"; + extraConfig = { + init = { + defaultBranch = "main"; + }; + }; }; # Nicely reload system units when changing configs From 53da8fcb901fb062c8abb2c0f0e378d44a31c248 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Jan 2024 10:31:08 +0100 Subject: [PATCH 1037/2308] Need this since I don't feel like sorting this rn --- flake.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flake.nix b/flake.nix index 6ef8ebb..5374ed2 100644 --- a/flake.nix +++ b/flake.nix @@ -63,8 +63,6 @@ sops-nix.nixosModules.sops home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; } ]; @@ -81,8 +79,6 @@ sops-nix.nixosModules.sops home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; } ]; From 0517723e784a04862d8dad1b9e8582179d0ca23e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Jan 2024 10:31:08 +0100 Subject: [PATCH 1038/2308] Need this since I don't feel like sorting this rn --- flake.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flake.nix b/flake.nix index 6ef8ebb..5374ed2 100644 --- a/flake.nix +++ b/flake.nix @@ -63,8 +63,6 @@ sops-nix.nixosModules.sops home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; } ]; @@ -81,8 +79,6 @@ sops-nix.nixosModules.sops home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; } ]; From 45914cf7ea043b025edb62b38818a3ac858e7d22 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Jan 2024 15:02:27 +0100 Subject: [PATCH 1039/2308] Try and add devshell commands to desktop --- nixos/desktop/configuration.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 07c9017..9c1cd86 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -59,6 +59,7 @@ # System tools age alejandra + direnv docker docker-compose git-filter-repo @@ -89,8 +90,35 @@ # User tools noisetorch + + writeShellApplication + { + name = "dvd"; + + runtimeInputs = [echo direnv]; + + text = '' + echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc + direnv allow + ''; + } + writeShellApplication + { + name = "dvt"; + + runtimeInputs = [direnv nix]; + + text = '' + nix flake init -t "github:the-nix-way/dev-templates#$1" + direnv allow + ''; + } ]; + programs.direnv = { + enable = true; + }; + # Enable networking networking.networkmanager.enable = true; From 20d57a270628e5e451b782b1b8929fcd05a6d655 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Jan 2024 15:02:27 +0100 Subject: [PATCH 1040/2308] Try and add devshell commands to desktop --- nixos/desktop/configuration.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 07c9017..9c1cd86 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -59,6 +59,7 @@ # System tools age alejandra + direnv docker docker-compose git-filter-repo @@ -89,8 +90,35 @@ # User tools noisetorch + + writeShellApplication + { + name = "dvd"; + + runtimeInputs = [echo direnv]; + + text = '' + echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc + direnv allow + ''; + } + writeShellApplication + { + name = "dvt"; + + runtimeInputs = [direnv nix]; + + text = '' + nix flake init -t "github:the-nix-way/dev-templates#$1" + direnv allow + ''; + } ]; + programs.direnv = { + enable = true; + }; + # Enable networking networking.networkmanager.enable = true; From 66a1fd45d39b44a3d16e3911c32aa7a2986373ab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Jan 2024 15:25:52 +0100 Subject: [PATCH 1041/2308] Install them this way? --- nixos/desktop/configuration.nix | 49 ++++++++++++++++++--------------- nixos/shared/scripts/dvd.nix | 17 ++++++++++++ nixos/shared/scripts/dvt.nix | 17 ++++++++++++ 3 files changed, 61 insertions(+), 22 deletions(-) create mode 100644 nixos/shared/scripts/dvd.nix create mode 100644 nixos/shared/scripts/dvt.nix diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 9c1cd86..42c7557 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -55,6 +55,31 @@ }; }; + pkgs = [ + writeShellApplication + { + name = "dvd"; + + runtimeInputs = [echo direnv]; + + text = '' + echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc + direnv allow + ''; + } + writeShellApplication + { + name = "dvt"; + + runtimeInputs = [direnv nix]; + + text = '' + nix flake init -t "github:the-nix-way/dev-templates#$1" + direnv allow + ''; + } + ]; + environment.systemPackages = with pkgs; [ # System tools age @@ -91,28 +116,8 @@ # User tools noisetorch - writeShellApplication - { - name = "dvd"; - - runtimeInputs = [echo direnv]; - - text = '' - echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc - direnv allow - ''; - } - writeShellApplication - { - name = "dvt"; - - runtimeInputs = [direnv nix]; - - text = '' - nix flake init -t "github:the-nix-way/dev-templates#$1" - direnv allow - ''; - } + (callPackage ../shared/scripts/dvd.nix {}) + (callPackage ../shared/scripts/dvt.nix {}) ]; programs.direnv = { diff --git a/nixos/shared/scripts/dvd.nix b/nixos/shared/scripts/dvd.nix new file mode 100644 index 0000000..7b10c3f --- /dev/null +++ b/nixos/shared/scripts/dvd.nix @@ -0,0 +1,17 @@ +{ + lib, + stdenv, + direnv, + writeShellApplication, +}: +writeShellApplication +{ + name = "dvd"; + + runtimeInputs = [echo direnv]; + + text = '' + echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc + direnv allow + ''; +} diff --git a/nixos/shared/scripts/dvt.nix b/nixos/shared/scripts/dvt.nix new file mode 100644 index 0000000..641c030 --- /dev/null +++ b/nixos/shared/scripts/dvt.nix @@ -0,0 +1,17 @@ +{ + lib, + stdenv, + direnv, + writeShellApplication, +}: +writeShellApplication +{ + name = "dvt"; + + runtimeInputs = [direnv nix]; + + text = '' + nix flake init -t "github:the-nix-way/dev-templates#$1" + direnv allow + ''; +} From f1b4f907ee9460900991dd35d4636d823e4921d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Jan 2024 15:25:52 +0100 Subject: [PATCH 1042/2308] Install them this way? --- nixos/desktop/configuration.nix | 49 ++++++++++++++++++--------------- nixos/shared/scripts/dvd.nix | 17 ++++++++++++ nixos/shared/scripts/dvt.nix | 17 ++++++++++++ 3 files changed, 61 insertions(+), 22 deletions(-) create mode 100644 nixos/shared/scripts/dvd.nix create mode 100644 nixos/shared/scripts/dvt.nix diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 9c1cd86..42c7557 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -55,6 +55,31 @@ }; }; + pkgs = [ + writeShellApplication + { + name = "dvd"; + + runtimeInputs = [echo direnv]; + + text = '' + echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc + direnv allow + ''; + } + writeShellApplication + { + name = "dvt"; + + runtimeInputs = [direnv nix]; + + text = '' + nix flake init -t "github:the-nix-way/dev-templates#$1" + direnv allow + ''; + } + ]; + environment.systemPackages = with pkgs; [ # System tools age @@ -91,28 +116,8 @@ # User tools noisetorch - writeShellApplication - { - name = "dvd"; - - runtimeInputs = [echo direnv]; - - text = '' - echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc - direnv allow - ''; - } - writeShellApplication - { - name = "dvt"; - - runtimeInputs = [direnv nix]; - - text = '' - nix flake init -t "github:the-nix-way/dev-templates#$1" - direnv allow - ''; - } + (callPackage ../shared/scripts/dvd.nix {}) + (callPackage ../shared/scripts/dvt.nix {}) ]; programs.direnv = { diff --git a/nixos/shared/scripts/dvd.nix b/nixos/shared/scripts/dvd.nix new file mode 100644 index 0000000..7b10c3f --- /dev/null +++ b/nixos/shared/scripts/dvd.nix @@ -0,0 +1,17 @@ +{ + lib, + stdenv, + direnv, + writeShellApplication, +}: +writeShellApplication +{ + name = "dvd"; + + runtimeInputs = [echo direnv]; + + text = '' + echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc + direnv allow + ''; +} diff --git a/nixos/shared/scripts/dvt.nix b/nixos/shared/scripts/dvt.nix new file mode 100644 index 0000000..641c030 --- /dev/null +++ b/nixos/shared/scripts/dvt.nix @@ -0,0 +1,17 @@ +{ + lib, + stdenv, + direnv, + writeShellApplication, +}: +writeShellApplication +{ + name = "dvt"; + + runtimeInputs = [direnv nix]; + + text = '' + nix flake init -t "github:the-nix-way/dev-templates#$1" + direnv allow + ''; +} From a104c3068f4eed035093de2be11974c2d9a7e1a1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 11:59:01 +0100 Subject: [PATCH 1043/2308] Let's refactor based on the template, maybe this works --- flake.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/flake.nix b/flake.nix index 5374ed2..3b565c4 100644 --- a/flake.nix +++ b/flake.nix @@ -50,7 +50,25 @@ ... } @ inputs: let inherit (self) outputs; + # Supported systems for your flake packages, shell, etc. + systems = [ + "armv7l-linux" + "x86_64-linux" + ]; + # This is a function that generates an attribute by calling a function you + # pass to it, with each system as an argument + forAllSystems = nixpkgs.lib.genAttrs systems; in { + # Your custom packages + # Accessible through 'nix build', 'nix shell', etc + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # Formatter for your nix files, available through 'nix fmt' + # Other options beside 'alejandra' include 'nixpkgs-fmt' + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + + # Your custom packages and modifications, exported as overlays + overlays = import ./overlays {inherit inputs;}; + # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { From f3ad77abf0d7e7cded863c2cad324ffea0082c19 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 11:59:01 +0100 Subject: [PATCH 1044/2308] Let's refactor based on the template, maybe this works --- flake.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/flake.nix b/flake.nix index 5374ed2..3b565c4 100644 --- a/flake.nix +++ b/flake.nix @@ -50,7 +50,25 @@ ... } @ inputs: let inherit (self) outputs; + # Supported systems for your flake packages, shell, etc. + systems = [ + "armv7l-linux" + "x86_64-linux" + ]; + # This is a function that generates an attribute by calling a function you + # pass to it, with each system as an argument + forAllSystems = nixpkgs.lib.genAttrs systems; in { + # Your custom packages + # Accessible through 'nix build', 'nix shell', etc + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # Formatter for your nix files, available through 'nix fmt' + # Other options beside 'alejandra' include 'nixpkgs-fmt' + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + + # Your custom packages and modifications, exported as overlays + overlays = import ./overlays {inherit inputs;}; + # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { From e376176dc3bfdbe2030bdc42612e15900a12f568 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 11:59:33 +0100 Subject: [PATCH 1045/2308] Did that not commit everything? Weird --- overlays/default.nix | 23 +++++++++++++++++++++++ {nixos/shared/scripts => pkgs}/dvd.nix | 0 {nixos/shared/scripts => pkgs}/dvt.nix | 0 3 files changed, 23 insertions(+) create mode 100644 overlays/default.nix rename {nixos/shared/scripts => pkgs}/dvd.nix (100%) rename {nixos/shared/scripts => pkgs}/dvt.nix (100%) diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..a13ea3c --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,23 @@ +# This file defines overlays +{inputs, ...}: { + # This one brings our custom packages from the 'pkgs' directory + additions = final: _prev: import ../pkgs {pkgs = final;}; + + # This one contains whatever you want to overlay + # You can change versions, add patches, set compilation flags, anything really. + # https://nixos.wiki/wiki/Overlays + modifications = final: prev: { + # example = prev.example.overrideAttrs (oldAttrs: rec { + # ... + # }); + }; + + # When applied, the unstable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.unstable' + unstable-packages = final: _prev: { + unstable = import inputs.nixpkgs-unstable { + system = final.system; + config.allowUnfree = true; + }; + }; +} diff --git a/nixos/shared/scripts/dvd.nix b/pkgs/dvd.nix similarity index 100% rename from nixos/shared/scripts/dvd.nix rename to pkgs/dvd.nix diff --git a/nixos/shared/scripts/dvt.nix b/pkgs/dvt.nix similarity index 100% rename from nixos/shared/scripts/dvt.nix rename to pkgs/dvt.nix From ed65a762f23c20906346d9e556193a5f948cbf9a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 11:59:33 +0100 Subject: [PATCH 1046/2308] Did that not commit everything? Weird --- overlays/default.nix | 23 +++++++++++++++++++++++ {nixos/shared/scripts => pkgs}/dvd.nix | 0 {nixos/shared/scripts => pkgs}/dvt.nix | 0 3 files changed, 23 insertions(+) create mode 100644 overlays/default.nix rename {nixos/shared/scripts => pkgs}/dvd.nix (100%) rename {nixos/shared/scripts => pkgs}/dvt.nix (100%) diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..a13ea3c --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,23 @@ +# This file defines overlays +{inputs, ...}: { + # This one brings our custom packages from the 'pkgs' directory + additions = final: _prev: import ../pkgs {pkgs = final;}; + + # This one contains whatever you want to overlay + # You can change versions, add patches, set compilation flags, anything really. + # https://nixos.wiki/wiki/Overlays + modifications = final: prev: { + # example = prev.example.overrideAttrs (oldAttrs: rec { + # ... + # }); + }; + + # When applied, the unstable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.unstable' + unstable-packages = final: _prev: { + unstable = import inputs.nixpkgs-unstable { + system = final.system; + config.allowUnfree = true; + }; + }; +} diff --git a/nixos/shared/scripts/dvd.nix b/pkgs/dvd.nix similarity index 100% rename from nixos/shared/scripts/dvd.nix rename to pkgs/dvd.nix diff --git a/nixos/shared/scripts/dvt.nix b/pkgs/dvt.nix similarity index 100% rename from nixos/shared/scripts/dvt.nix rename to pkgs/dvt.nix From 31a8662f05fc219f291f11c1f9d89424ab7e03a2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:02:33 +0100 Subject: [PATCH 1047/2308] default.nix seems to be a significant name --- pkgs/default.nix | 6 ++++++ pkgs/{dvd.nix => dvd/default.nix} | 0 pkgs/{dvt.nix => dvt/default.nix} | 0 3 files changed, 6 insertions(+) create mode 100644 pkgs/default.nix rename pkgs/{dvd.nix => dvd/default.nix} (100%) rename pkgs/{dvt.nix => dvt/default.nix} (100%) diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..819fb05 --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,6 @@ +# Custom packages, that can be defined similarly to ones from nixpkgs +# You can build them using 'nix build .#example' +pkgs: { + dvd = pkgs.callPackage ./dvd {}; + dvt = pkgs.callPackage ./dvt {}; +} diff --git a/pkgs/dvd.nix b/pkgs/dvd/default.nix similarity index 100% rename from pkgs/dvd.nix rename to pkgs/dvd/default.nix diff --git a/pkgs/dvt.nix b/pkgs/dvt/default.nix similarity index 100% rename from pkgs/dvt.nix rename to pkgs/dvt/default.nix From de317057a3d4fdcb4a21505ce32167f8ec666d10 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:02:33 +0100 Subject: [PATCH 1048/2308] default.nix seems to be a significant name --- pkgs/default.nix | 6 ++++++ pkgs/{dvd.nix => dvd/default.nix} | 0 pkgs/{dvt.nix => dvt/default.nix} | 0 3 files changed, 6 insertions(+) create mode 100644 pkgs/default.nix rename pkgs/{dvd.nix => dvd/default.nix} (100%) rename pkgs/{dvt.nix => dvt/default.nix} (100%) diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..819fb05 --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,6 @@ +# Custom packages, that can be defined similarly to ones from nixpkgs +# You can build them using 'nix build .#example' +pkgs: { + dvd = pkgs.callPackage ./dvd {}; + dvt = pkgs.callPackage ./dvt {}; +} diff --git a/pkgs/dvd.nix b/pkgs/dvd/default.nix similarity index 100% rename from pkgs/dvd.nix rename to pkgs/dvd/default.nix diff --git a/pkgs/dvt.nix b/pkgs/dvt/default.nix similarity index 100% rename from pkgs/dvt.nix rename to pkgs/dvt/default.nix From b662302a8a454886cf0a23cf6eb0cd3f07a11239 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:03:52 +0100 Subject: [PATCH 1049/2308] stdenv.writeShellApplication instead I think --- pkgs/dvd/default.nix | 2 +- pkgs/dvt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index 7b10c3f..bf11d56 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -4,7 +4,7 @@ direnv, writeShellApplication, }: -writeShellApplication +stdenv.writeShellApplication { name = "dvd"; diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index 641c030..fa88539 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -4,7 +4,7 @@ direnv, writeShellApplication, }: -writeShellApplication +stdenv.writeShellApplication { name = "dvt"; From 8ed378e493d0fb6eff29723f579d6c69d2fb6c15 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:03:52 +0100 Subject: [PATCH 1050/2308] stdenv.writeShellApplication instead I think --- pkgs/dvd/default.nix | 2 +- pkgs/dvt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index 7b10c3f..bf11d56 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -4,7 +4,7 @@ direnv, writeShellApplication, }: -writeShellApplication +stdenv.writeShellApplication { name = "dvd"; diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index 641c030..fa88539 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -4,7 +4,7 @@ direnv, writeShellApplication, }: -writeShellApplication +stdenv.writeShellApplication { name = "dvt"; From 127dc51075de865ca7172a43552445cc06eb14f0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:05:44 +0100 Subject: [PATCH 1051/2308] Alright that was some drafts that I don't need --- nixos/desktop/configuration.nix | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 42c7557..ea2eca0 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -55,32 +55,11 @@ }; }; - pkgs = [ - writeShellApplication - { - name = "dvd"; - - runtimeInputs = [echo direnv]; - - text = '' - echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc - direnv allow - ''; - } - writeShellApplication - { - name = "dvt"; - - runtimeInputs = [direnv nix]; - - text = '' - nix flake init -t "github:the-nix-way/dev-templates#$1" - direnv allow - ''; - } - ]; - environment.systemPackages = with pkgs; [ + # Custom tools + dvd + dvt + # System tools age alejandra @@ -115,9 +94,6 @@ # User tools noisetorch - - (callPackage ../shared/scripts/dvd.nix {}) - (callPackage ../shared/scripts/dvt.nix {}) ]; programs.direnv = { From e712b4a48691491da9cd742c46bd910457216da8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:05:44 +0100 Subject: [PATCH 1052/2308] Alright that was some drafts that I don't need --- nixos/desktop/configuration.nix | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 42c7557..ea2eca0 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -55,32 +55,11 @@ }; }; - pkgs = [ - writeShellApplication - { - name = "dvd"; - - runtimeInputs = [echo direnv]; - - text = '' - echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc - direnv allow - ''; - } - writeShellApplication - { - name = "dvt"; - - runtimeInputs = [direnv nix]; - - text = '' - nix flake init -t "github:the-nix-way/dev-templates#$1" - direnv allow - ''; - } - ]; - environment.systemPackages = with pkgs; [ + # Custom tools + dvd + dvt + # System tools age alejandra @@ -115,9 +94,6 @@ # User tools noisetorch - - (callPackage ../shared/scripts/dvd.nix {}) - (callPackage ../shared/scripts/dvt.nix {}) ]; programs.direnv = { From ec324876f572b3b565e56d850919b549cbad5f6c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:06:31 +0100 Subject: [PATCH 1053/2308] That shouldn't go there I guess --- nixos/desktop/configuration.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index ea2eca0..58fcd2a 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -56,10 +56,6 @@ }; environment.systemPackages = with pkgs; [ - # Custom tools - dvd - dvt - # System tools age alejandra From 5fd661bd996f239ad593a5a96223f8fad160242a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:06:31 +0100 Subject: [PATCH 1054/2308] That shouldn't go there I guess --- nixos/desktop/configuration.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index ea2eca0..58fcd2a 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -56,10 +56,6 @@ }; environment.systemPackages = with pkgs; [ - # Custom tools - dvd - dvt - # System tools age alejandra From 3ec28a852ba09080268808a87be7e18ab05afed7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:08:28 +0100 Subject: [PATCH 1055/2308] Might not need these inputs --- pkgs/dvd/default.nix | 2 +- pkgs/dvt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index bf11d56..fdb201e 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -8,7 +8,7 @@ stdenv.writeShellApplication { name = "dvd"; - runtimeInputs = [echo direnv]; + runtimeInputs = [direnv]; text = '' echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index fa88539..d3c10b4 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -8,7 +8,7 @@ stdenv.writeShellApplication { name = "dvt"; - runtimeInputs = [direnv nix]; + runtimeInputs = [direnv]; text = '' nix flake init -t "github:the-nix-way/dev-templates#$1" From 29451acf6923a734b7a4ba34771c05d4cb4f7b08 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:08:28 +0100 Subject: [PATCH 1056/2308] Might not need these inputs --- pkgs/dvd/default.nix | 2 +- pkgs/dvt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index bf11d56..fdb201e 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -8,7 +8,7 @@ stdenv.writeShellApplication { name = "dvd"; - runtimeInputs = [echo direnv]; + runtimeInputs = [direnv]; text = '' echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index fa88539..d3c10b4 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -8,7 +8,7 @@ stdenv.writeShellApplication { name = "dvt"; - runtimeInputs = [direnv nix]; + runtimeInputs = [direnv]; text = '' nix flake init -t "github:the-nix-way/dev-templates#$1" From 817b162ff51ad6d94e48626a0b3297434b69fedb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:26:17 +0100 Subject: [PATCH 1057/2308] no stdenv.writeShellAPplication, but just write shell --- pkgs/dvd/default.nix | 2 +- pkgs/dvt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index fdb201e..07445af 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -4,7 +4,7 @@ direnv, writeShellApplication, }: -stdenv.writeShellApplication +writeShellApplication { name = "dvd"; diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index d3c10b4..a092d4c 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -4,7 +4,7 @@ direnv, writeShellApplication, }: -stdenv.writeShellApplication +writeShellApplication { name = "dvt"; From 1d2edcf72f75674719f83805a4721afee329d27e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:26:17 +0100 Subject: [PATCH 1058/2308] no stdenv.writeShellAPplication, but just write shell --- pkgs/dvd/default.nix | 2 +- pkgs/dvt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index fdb201e..07445af 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -4,7 +4,7 @@ direnv, writeShellApplication, }: -stdenv.writeShellApplication +writeShellApplication { name = "dvd"; diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index d3c10b4..a092d4c 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -4,7 +4,7 @@ direnv, writeShellApplication, }: -stdenv.writeShellApplication +writeShellApplication { name = "dvt"; From 2524cb0f81196fc3bd8200c0b195073017e393ea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:46:31 +0100 Subject: [PATCH 1059/2308] Let's try adding it again? --- nixos/desktop/configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 58fcd2a..090719f 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -15,6 +15,9 @@ # You can add overlays here overlays = [ # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default @@ -56,6 +59,10 @@ }; environment.systemPackages = with pkgs; [ + # Custom tools + dvd + dvt + # System tools age alejandra From 0e7f2c1e87fcc5a67714469f6ca1e2be900a992f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:46:31 +0100 Subject: [PATCH 1060/2308] Let's try adding it again? --- nixos/desktop/configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 58fcd2a..090719f 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -15,6 +15,9 @@ # You can add overlays here overlays = [ # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default @@ -56,6 +59,10 @@ }; environment.systemPackages = with pkgs; [ + # Custom tools + dvd + dvt + # System tools age alejandra From 2a1021f7f680fe940eb4fa6732b382edbc6c3041 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:52:44 +0100 Subject: [PATCH 1061/2308] Found this here https://github.com/the-furry-hubofeverything/hubble-systems/commit/e056cfdce1c277afe3cf9fad02ecac65f02d3551 --- overlays/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/overlays/default.nix b/overlays/default.nix index a13ea3c..8728c22 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,11 @@ # This file defines overlays {inputs, ...}: { # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: import ../pkgs {pkgs = final;}; + additions = final: _prev: + import ../pkgs { + inherit (final) callPackage; + pkgs = final; + }; # This one contains whatever you want to overlay # You can change versions, add patches, set compilation flags, anything really. From 921e7bfa1d46fd4c75f6f57ea673f3062e912875 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 12:52:44 +0100 Subject: [PATCH 1062/2308] Found this here https://github.com/the-furry-hubofeverything/hubble-systems/commit/e056cfdce1c277afe3cf9fad02ecac65f02d3551 --- overlays/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/overlays/default.nix b/overlays/default.nix index a13ea3c..8728c22 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,11 @@ # This file defines overlays {inputs, ...}: { # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: import ../pkgs {pkgs = final;}; + additions = final: _prev: + import ../pkgs { + inherit (final) callPackage; + pkgs = final; + }; # This one contains whatever you want to overlay # You can change versions, add patches, set compilation flags, anything really. From 72862fa8fa5dd37112161c2b32b92c23466280b0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 14:14:06 +0100 Subject: [PATCH 1063/2308] Let's use my repo instead (has fixes too, and can add data science project templates) --- pkgs/dvd/default.nix | 2 +- pkgs/dvt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index 07445af..d9ccf86 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -11,7 +11,7 @@ writeShellApplication runtimeInputs = [direnv]; text = '' - echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc + echo "use flake \"git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates?dir=$1\"" >> .envrc direnv allow ''; } diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index a092d4c..7540001 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -11,7 +11,7 @@ writeShellApplication runtimeInputs = [direnv]; text = '' - nix flake init -t "github:the-nix-way/dev-templates#$1" + nix flake init -t "git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates#$1" direnv allow ''; } From 7ed37c2bf32b58a7b03f22658cef6cffbe06a06b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 14:14:06 +0100 Subject: [PATCH 1064/2308] Let's use my repo instead (has fixes too, and can add data science project templates) --- pkgs/dvd/default.nix | 2 +- pkgs/dvt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index 07445af..d9ccf86 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -11,7 +11,7 @@ writeShellApplication runtimeInputs = [direnv]; text = '' - echo "use flake \"github:the-nix-way/dev-templates?dir=$1\"" >> .envrc + echo "use flake \"git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates?dir=$1\"" >> .envrc direnv allow ''; } diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index a092d4c..7540001 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -11,7 +11,7 @@ writeShellApplication runtimeInputs = [direnv]; text = '' - nix flake init -t "github:the-nix-way/dev-templates#$1" + nix flake init -t "git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates#$1" direnv allow ''; } From 2143ac35bed0ee0cbcb596e61ac6f895aaee00ce Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 14:29:28 +0100 Subject: [PATCH 1065/2308] I might need to add the .git --- pkgs/dvd/default.nix | 2 +- pkgs/dvt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index d9ccf86..bc5cab9 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -11,7 +11,7 @@ writeShellApplication runtimeInputs = [direnv]; text = '' - echo "use flake \"git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates?dir=$1\"" >> .envrc + echo "use flake \"git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git?dir=$1\" --no-write-lock-file" >> .envrc direnv allow ''; } diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index 7540001..eabc160 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -11,7 +11,7 @@ writeShellApplication runtimeInputs = [direnv]; text = '' - nix flake init -t "git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates#$1" + nix flake init -t "git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git#$1" direnv allow ''; } From 472667c531e7ba73fac39718a07046d7ee76be6b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 14:29:28 +0100 Subject: [PATCH 1066/2308] I might need to add the .git --- pkgs/dvd/default.nix | 2 +- pkgs/dvt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index d9ccf86..bc5cab9 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -11,7 +11,7 @@ writeShellApplication runtimeInputs = [direnv]; text = '' - echo "use flake \"git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates?dir=$1\"" >> .envrc + echo "use flake \"git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git?dir=$1\" --no-write-lock-file" >> .envrc direnv allow ''; } diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index 7540001..eabc160 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -11,7 +11,7 @@ writeShellApplication runtimeInputs = [direnv]; text = '' - nix flake init -t "git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates#$1" + nix flake init -t "git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git#$1" direnv allow ''; } From 152e8d16815cc1dfa7984087bff5eede4f990685 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 14:39:28 +0100 Subject: [PATCH 1067/2308] Can remove the no write lock file --- pkgs/dvd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index bc5cab9..7c6f81f 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -11,7 +11,7 @@ writeShellApplication runtimeInputs = [direnv]; text = '' - echo "use flake \"git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git?dir=$1\" --no-write-lock-file" >> .envrc + echo "use flake \"git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git?dir=$1\"" >> .envrc direnv allow ''; } From 26ff1d7d7ba3e548ff382931a09db428cb0c7861 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 14:39:28 +0100 Subject: [PATCH 1068/2308] Can remove the no write lock file --- pkgs/dvd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index bc5cab9..7c6f81f 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -11,7 +11,7 @@ writeShellApplication runtimeInputs = [direnv]; text = '' - echo "use flake \"git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git?dir=$1\" --no-write-lock-file" >> .envrc + echo "use flake \"git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git?dir=$1\"" >> .envrc direnv allow ''; } From 86a73efe8a04120f1c564bf541b834346373f824 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 15:08:36 +0100 Subject: [PATCH 1069/2308] Flake lock update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d210982..820b5e4 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1705392270, - "narHash": "sha256-Y11fcK0ETTpfBxJ58w9amqTKuJSQ+lSs6nIV8DoplKo=", + "lastModified": 1705535278, + "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf4b576f84e1ce54ec886836bae7695738aa5a6c", + "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705231543, - "narHash": "sha256-W8j0A5n2WOpCgdFRqMqwd9adNORcN1r/DpjRVxiFkAw=", + "lastModified": 1705487282, + "narHash": "sha256-eX/0O2ybmFKD/MzYO8gDlr4tAurekDbJQa7olAFFbRo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ab807f9740c533070e8b68b0d86034d4a293b5f1", + "rev": "a00331e522b9a732f876cf707174ce37ae702762", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705303754, - "narHash": "sha256-loWkd7lUzSvGBU9xnva37iPB2rr5ulq1qBLT44KjzGA=", + "lastModified": 1705566941, + "narHash": "sha256-CLNtVRDA8eUPk+bxsCCZtRO0Cp+SpHdn1nNOLoFypLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e0629618b4b419a47e2c8a3cab223e2a7f3a8f97", + "rev": "b06ff4bf8f4ad900fe0c2a61fc2946edc3a84be7", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1705496572, + "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1705496572, + "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "type": "github" }, "original": { From b4a10acd694235184f0c6ebc9dc5659874217e69 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 15:08:36 +0100 Subject: [PATCH 1070/2308] Flake lock update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d210982..820b5e4 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1705392270, - "narHash": "sha256-Y11fcK0ETTpfBxJ58w9amqTKuJSQ+lSs6nIV8DoplKo=", + "lastModified": 1705535278, + "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf4b576f84e1ce54ec886836bae7695738aa5a6c", + "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705231543, - "narHash": "sha256-W8j0A5n2WOpCgdFRqMqwd9adNORcN1r/DpjRVxiFkAw=", + "lastModified": 1705487282, + "narHash": "sha256-eX/0O2ybmFKD/MzYO8gDlr4tAurekDbJQa7olAFFbRo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ab807f9740c533070e8b68b0d86034d4a293b5f1", + "rev": "a00331e522b9a732f876cf707174ce37ae702762", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705303754, - "narHash": "sha256-loWkd7lUzSvGBU9xnva37iPB2rr5ulq1qBLT44KjzGA=", + "lastModified": 1705566941, + "narHash": "sha256-CLNtVRDA8eUPk+bxsCCZtRO0Cp+SpHdn1nNOLoFypLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e0629618b4b419a47e2c8a3cab223e2a7f3a8f97", + "rev": "b06ff4bf8f4ad900fe0c2a61fc2946edc3a84be7", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1705496572, + "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1705496572, + "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "type": "github" }, "original": { From 9d62b15777f0931315edaa7329811cfb598d54dd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 18:19:11 +0100 Subject: [PATCH 1071/2308] Let's make glados the same as edi (I'll simplify/deduplicate later) --- .../plasma-desktop/configuration.nix | 891 +----------------- 1 file changed, 10 insertions(+), 881 deletions(-) diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix index 93f8663..a193e98 100644 --- a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix +++ b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix @@ -5,8 +5,7 @@ config, pkgs, ... -}: -{ +}: { programs.plasma = { enable = true; shortcuts = { @@ -271,13 +270,12 @@ "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; - "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "844,598"; - "kdeglobals"."General"."BrowserApplication" = "librewolf.desktop"; + "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; "kdeglobals"."KDE"."SingleClick" = false; "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; - "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; @@ -287,7 +285,7 @@ "kdeglobals"."KFileDialog Settings"."Show Preview" = false; "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; - "kdeglobals"."KFileDialog Settings"."Sort by" = "Name"; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; @@ -801,7 +799,6 @@ "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."DirSelect Dialog"."DirSelectDialog Size[$d]" = ""; "khotkeysrc"."General"."BrowserApplication[$d]" = ""; "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; "khotkeysrc"."General"."ColorScheme[$d]" = ""; @@ -845,6 +842,9 @@ "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; "kiorc"."Confirmations"."ConfirmDelete" = true; "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "krunnerrc"."Plugins"."locationsEnabled" = true; + "krunnerrc"."Plugins"."placesEnabled" = true; + "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; "kwalletrc"."Wallet"."First Use" = false; "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; @@ -856,10 +856,9 @@ "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; "kwinrc"."NightColor"."LongitudeFixed" = 5.44; "kwinrc"."NightColor"."Mode" = "Location"; - "kwinrc"."NightColor"."NightTemperature" = 1200; + "kwinrc"."NightColor"."NightTemperature" = 1400; "kwinrc"."Plugins"."wobblywindowsEnabled" = true; "kwinrc"."Tiling"."padding" = 4; - "kwinrc"."Tiling.250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Xwayland"."Scale" = 1; @@ -868,879 +867,9 @@ "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MONETARY" = "en_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; - "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; - }; - }; -} -{ - programs.plasma = { - enable = true; - shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; - "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; - "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; - "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; - "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; - "kded5"."Show System Activity" = "Ctrl+Esc"; - "kded5"."display" = ["Display" "Meta+P"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; - "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; - "kmix"."decrease_volume" = "Volume Down"; - "kmix"."increase_microphone_volume" = "Microphone Volume Up"; - "kmix"."increase_volume" = "Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; - "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = []; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; - "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = []; - "ksmserver"."Reboot Without Confirmation" = []; - "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Decrease Opacity" = []; - "kwin"."Edit Tiles" = "Meta+T"; - "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; - "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = []; - "kwin"."Increase Opacity" = []; - "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = []; - "kwin"."MoveMouseToCenter" = "Meta+F6"; - "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = []; - "kwin"."MoveZoomLeft" = []; - "kwin"."MoveZoomRight" = []; - "kwin"."MoveZoomUp" = []; - "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = []; - "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12"; - "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; - "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; - "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; - "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; - "kwin"."Switch Window Down" = "Meta+Alt+Down"; - "kwin"."Switch Window Left" = "Meta+Alt+Left"; - "kwin"."Switch Window Right" = "Meta+Alt+Right"; - "kwin"."Switch Window Up" = "Meta+Alt+Up"; - "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = []; - "kwin"."Switch to Desktop 11" = []; - "kwin"."Switch to Desktop 12" = []; - "kwin"."Switch to Desktop 13" = []; - "kwin"."Switch to Desktop 14" = []; - "kwin"."Switch to Desktop 15" = []; - "kwin"."Switch to Desktop 16" = []; - "kwin"."Switch to Desktop 17" = []; - "kwin"."Switch to Desktop 18" = []; - "kwin"."Switch to Desktop 19" = []; - "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = []; - "kwin"."Switch to Desktop 3" = "Ctrl+F3"; - "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = []; - "kwin"."Switch to Desktop 6" = []; - "kwin"."Switch to Desktop 7" = []; - "kwin"."Switch to Desktop 8" = []; - "kwin"."Switch to Desktop 9" = []; - "kwin"."Switch to Next Desktop" = []; - "kwin"."Switch to Next Screen" = []; - "kwin"."Switch to Previous Desktop" = []; - "kwin"."Switch to Previous Screen" = []; - "kwin"."Switch to Screen 0" = []; - "kwin"."Switch to Screen 1" = []; - "kwin"."Switch to Screen 2" = []; - "kwin"."Switch to Screen 3" = []; - "kwin"."Switch to Screen 4" = []; - "kwin"."Switch to Screen 5" = []; - "kwin"."Switch to Screen 6" = []; - "kwin"."Switch to Screen 7" = []; - "kwin"."Switch to Screen Above" = []; - "kwin"."Switch to Screen Below" = []; - "kwin"."Switch to Screen to the Left" = []; - "kwin"."Switch to Screen to the Right" = []; - "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = []; - "kwin"."Walk Through Desktop List" = []; - "kwin"."Walk Through Desktop List (Reverse)" = []; - "kwin"."Walk Through Desktops" = []; - "kwin"."Walk Through Desktops (Reverse)" = []; - "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = []; - "kwin"."Walk Through Windows Alternative (Reverse)" = []; - "kwin"."Walk Through Windows of Current Application" = "Alt+`"; - "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = []; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; - "kwin"."Window Above Other Windows" = []; - "kwin"."Window Below Other Windows" = []; - "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = []; - "kwin"."Window Grow Horizontal" = []; - "kwin"."Window Grow Vertical" = []; - "kwin"."Window Lower" = []; - "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = []; - "kwin"."Window Maximize Vertical" = []; - "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = []; - "kwin"."Window Move Center" = []; - "kwin"."Window No Border" = []; - "kwin"."Window On All Desktops" = []; - "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; - "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; - "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; - "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = []; - "kwin"."Window One Screen Up" = []; - "kwin"."Window One Screen to the Left" = []; - "kwin"."Window One Screen to the Right" = []; - "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = []; - "kwin"."Window Pack Left" = []; - "kwin"."Window Pack Right" = []; - "kwin"."Window Pack Up" = []; - "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = []; - "kwin"."Window Quick Tile Bottom Right" = []; - "kwin"."Window Quick Tile Left" = "Meta+Left"; - "kwin"."Window Quick Tile Right" = "Meta+Right"; - "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = []; - "kwin"."Window Quick Tile Top Right" = []; - "kwin"."Window Raise" = []; - "kwin"."Window Resize" = []; - "kwin"."Window Shade" = []; - "kwin"."Window Shrink Horizontal" = []; - "kwin"."Window Shrink Vertical" = []; - "kwin"."Window to Desktop 1" = []; - "kwin"."Window to Desktop 10" = []; - "kwin"."Window to Desktop 11" = []; - "kwin"."Window to Desktop 12" = []; - "kwin"."Window to Desktop 13" = []; - "kwin"."Window to Desktop 14" = []; - "kwin"."Window to Desktop 15" = []; - "kwin"."Window to Desktop 16" = []; - "kwin"."Window to Desktop 17" = []; - "kwin"."Window to Desktop 18" = []; - "kwin"."Window to Desktop 19" = []; - "kwin"."Window to Desktop 2" = []; - "kwin"."Window to Desktop 20" = []; - "kwin"."Window to Desktop 3" = []; - "kwin"."Window to Desktop 4" = []; - "kwin"."Window to Desktop 5" = []; - "kwin"."Window to Desktop 6" = []; - "kwin"."Window to Desktop 7" = []; - "kwin"."Window to Desktop 8" = []; - "kwin"."Window to Desktop 9" = []; - "kwin"."Window to Next Desktop" = []; - "kwin"."Window to Next Screen" = []; - "kwin"."Window to Previous Desktop" = []; - "kwin"."Window to Previous Screen" = []; - "kwin"."Window to Screen 0" = []; - "kwin"."Window to Screen 1" = []; - "kwin"."Window to Screen 2" = []; - "kwin"."Window to Screen 3" = []; - "kwin"."Window to Screen 4" = []; - "kwin"."Window to Screen 5" = []; - "kwin"."Window to Screen 6" = []; - "kwin"."Window to Screen 7" = []; - "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; - "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = []; - "mediacontrol"."mediavolumeup" = []; - "mediacontrol"."nextmedia" = "Media Next"; - "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = []; - "mediacontrol"."playpausemedia" = "Media Play"; - "mediacontrol"."previousmedia" = "Media Previous"; - "mediacontrol"."stopmedia" = "Media Stop"; - "org.kde.dolphin.desktop"."_launch" = "Meta+E"; - "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; - "org.kde.konsole.desktop"."NewTab" = []; - "org.kde.konsole.desktop"."NewWindow" = []; - "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; - "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; - "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; - "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; - "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; - "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; - "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; - "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; - "org.kde.spectacle.desktop"."_launch" = "Print"; - "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; - "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; - "org_kde_powerdevil"."Hibernate" = "Hibernate"; - "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; - "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; - "org_kde_powerdevil"."PowerDown" = "Power Down"; - "org_kde_powerdevil"."PowerOff" = "Power Off"; - "org_kde_powerdevil"."Sleep" = "Sleep"; - "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = []; - "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = []; - "plasmashell"."activate task manager entry 2" = "Meta+2"; - "plasmashell"."activate task manager entry 3" = "Meta+3"; - "plasmashell"."activate task manager entry 4" = "Meta+4"; - "plasmashell"."activate task manager entry 5" = "Meta+5"; - "plasmashell"."activate task manager entry 6" = "Meta+6"; - "plasmashell"."activate task manager entry 7" = "Meta+7"; - "plasmashell"."activate task manager entry 8" = "Meta+8"; - "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = []; - "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; - "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = []; - "plasmashell"."cyclePrevAction" = []; - "plasmashell"."edit_clipboard" = []; - "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = "Meta+Tab"; - "plasmashell"."previous activity" = "Meta+Shift+Tab"; - "plasmashell"."repeat_action" = "Meta+Ctrl+R"; - "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = []; - "plasmashell"."show-on-mouse-pos" = "Meta+V"; - "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = []; - "plasmashell"."switch to previous activity" = []; - "plasmashell"."toggle do not disturb" = []; - "systemsettings.desktop"."_launch" = "Tools"; - "systemsettings.desktop"."kcm-kscreen" = []; - "systemsettings.desktop"."kcm-lookandfeel" = []; - "systemsettings.desktop"."kcm-users" = []; - "systemsettings.desktop"."powerdevilprofilesconfig" = []; - "systemsettings.desktop"."screenlocker" = []; - }; - configFile = { - "baloofilerc"."General"."dbVersion" = 2; - "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; - "baloofilerc"."General"."exclude filters version" = 8; - "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; - "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; - "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; - "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; - "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; - "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; - "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; - "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; - "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; - "kded5rc"."Module-browserintegrationreminder"."autoload" = false; - "kded5rc"."Module-device_automounter"."autoload" = false; - "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; - "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "844,598"; - "kdeglobals"."General"."BrowserApplication" = "librewolf.desktop"; - "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; - "kdeglobals"."KDE"."SingleClick" = false; - "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; - "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; - "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true; - "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; - "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; - "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; - "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; - "kdeglobals"."KFileDialog Settings"."Show Preview" = false; - "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; - "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; - "kdeglobals"."KFileDialog Settings"."Sort by" = "Name"; - "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; - "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; - "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; - "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; - "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; - "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; - "kdeglobals"."WM"."activeBackground" = "49,54,59"; - "kdeglobals"."WM"."activeBlend" = "252,252,252"; - "kdeglobals"."WM"."activeForeground" = "252,252,252"; - "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; - "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; - "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; - "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; - "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; - "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; - "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; - "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; - "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; - "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; - "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; - "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; - "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; - "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; - "kglobalshortcutsrc"."org.kde.kcalc.desktop"."_k_friendly_name" = "KCalc"; - "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; - "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; - "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Emoji Selector"; - "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; - "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Power Management"; - "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; - "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "System Settings"; - "khotkeysrc"."Data"."DataCount" = 3; - "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; - "khotkeysrc"."Data_1"."DataCount" = 1; - "khotkeysrc"."Data_1"."Enabled" = true; - "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; - "khotkeysrc"."Data_1"."SystemGroup" = 1; - "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1"."Comment" = "Comment"; - "khotkeysrc"."Data_1_1"."Enabled" = true; - "khotkeysrc"."Data_1_1"."Name" = "Search"; - "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; - "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; - "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; - "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; - "khotkeysrc"."Data_2"."DataCount" = 8; - "khotkeysrc"."Data_2"."Enabled" = false; - "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; - "khotkeysrc"."Data_2"."Name" = "Examples"; - "khotkeysrc"."Data_2"."SystemGroup" = 0; - "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; - "khotkeysrc"."Data_2_1"."Enabled" = false; - "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; - "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; - "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; - "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; - "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; - "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; - "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; - "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; - "khotkeysrc"."Data_2_2"."Enabled" = false; - "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; - "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; - "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; - "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; - "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; - "khotkeysrc"."Data_2_3"."Enabled" = false; - "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; - "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; - "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; - "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; - "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; - "khotkeysrc"."Data_2_4"."Enabled" = false; - "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; - "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; - "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; - "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; - "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; - "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; - "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; - "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; - "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; - "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; - "khotkeysrc"."Data_2_5"."Enabled" = false; - "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; - "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; - "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; - "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; - "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; - "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; - "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; - "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; - "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; - "khotkeysrc"."Data_2_6"."Enabled" = false; - "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; - "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; - "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; - "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; - "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; - "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; - "khotkeysrc"."Data_2_7"."DataCount" = 4; - "khotkeysrc"."Data_2_7"."Enabled" = false; - "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; - "khotkeysrc"."Data_2_7"."SystemGroup" = 0; - "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_7_1"."Comment" = ""; - "khotkeysrc"."Data_2_7_1"."Enabled" = false; - "khotkeysrc"."Data_2_7_1"."Name" = "Back"; - "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2"."Comment" = ""; - "khotkeysrc"."Data_2_7_2"."Enabled" = false; - "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; - "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3"."Comment" = ""; - "khotkeysrc"."Data_2_7_3"."Enabled" = false; - "khotkeysrc"."Data_2_7_3"."Name" = "Up"; - "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4"."Comment" = ""; - "khotkeysrc"."Data_2_7_4"."Enabled" = false; - "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; - "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; - "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; - "khotkeysrc"."Data_2_8"."Enabled" = false; - "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; - "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; - "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; - "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; - "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; - "khotkeysrc"."Data_3"."DataCount" = 14; - "khotkeysrc"."Data_3"."Enabled" = true; - "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; - "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; - "khotkeysrc"."Data_3"."SystemGroup" = 0; - "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; - "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; - "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; - "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; - "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; - "khotkeysrc"."Data_3_1"."Enabled" = true; - "khotkeysrc"."Data_3_1"."Name" = "Back"; - "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; - "khotkeysrc"."Data_3_10"."Enabled" = false; - "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; - "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; - "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; - "khotkeysrc"."Data_3_11"."Enabled" = true; - "khotkeysrc"."Data_3_11"."Name" = "Up"; - "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; - "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; - "khotkeysrc"."Data_3_12"."Enabled" = false; - "khotkeysrc"."Data_3_12"."Name" = "Up #2"; - "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; - "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; - "khotkeysrc"."Data_3_13"."Enabled" = true; - "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; - "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; - "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; - "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; - "khotkeysrc"."Data_3_14"."Enabled" = true; - "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; - "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; - "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; - "khotkeysrc"."Data_3_2"."Enabled" = true; - "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; - "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; - "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; - "khotkeysrc"."Data_3_3"."Enabled" = true; - "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; - "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; - "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; - "khotkeysrc"."Data_3_4"."Enabled" = true; - "khotkeysrc"."Data_3_4"."Name" = "Forward"; - "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; - "khotkeysrc"."Data_3_5"."Enabled" = true; - "khotkeysrc"."Data_3_5"."Name" = "Home"; - "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; - "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; - "khotkeysrc"."Data_3_6"."Enabled" = true; - "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; - "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; - "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; - "khotkeysrc"."Data_3_7"."Enabled" = true; - "khotkeysrc"."Data_3_7"."Name" = "New Tab"; - "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; - "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; - "khotkeysrc"."Data_3_8"."Enabled" = true; - "khotkeysrc"."Data_3_8"."Name" = "New Window"; - "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; - "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; - "khotkeysrc"."Data_3_9"."Enabled" = true; - "khotkeysrc"."Data_3_9"."Name" = "Reload"; - "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; - "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."DirSelect Dialog"."DirSelectDialog Size[$d]" = ""; - "khotkeysrc"."General"."BrowserApplication[$d]" = ""; - "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; - "khotkeysrc"."General"."ColorScheme[$d]" = ""; - "khotkeysrc"."Gestures"."Disabled" = true; - "khotkeysrc"."Gestures"."MouseButton" = 2; - "khotkeysrc"."Gestures"."Timeout" = 300; - "khotkeysrc"."GesturesExclude"."Comment" = ""; - "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; - "khotkeysrc"."Icons"."Theme[$d]" = ""; - "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; - "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; - "khotkeysrc"."KDE"."SingleClick[$d]" = ""; - "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; - "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; - "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; - "khotkeysrc"."Main"."Disabled" = false; - "khotkeysrc"."Voice"."Shortcut" = ""; - "khotkeysrc"."WM"."activeBackground[$d]" = ""; - "khotkeysrc"."WM"."activeBlend[$d]" = ""; - "khotkeysrc"."WM"."activeForeground[$d]" = ""; - "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; - "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; - "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; - "kiorc"."Confirmations"."ConfirmDelete" = true; - "krunnerrc"."Plugins"."baloosearchEnabled" = false; - "kwalletrc"."Wallet"."First Use" = false; - "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; - "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; - "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; - "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; - "kwinrc"."Desktops"."Number" = 4; - "kwinrc"."Desktops"."Rows" = 2; - "kwinrc"."NightColor"."Active" = true; - "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; - "kwinrc"."NightColor"."LongitudeFixed" = 5.44; - "kwinrc"."NightColor"."Mode" = "Location"; - "kwinrc"."NightColor"."NightTemperature" = 1200; - "kwinrc"."Plugins"."wobblywindowsEnabled" = true; - "kwinrc"."Tiling"."padding" = 4; - "kwinrc"."Tiling.250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Xwayland"."Scale" = 1; - "kxkbrc"."Layout"."Options" = "compose:caps"; - "kxkbrc"."Layout"."ResetOldOptions" = true; - "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; - "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MONETARY" = "en_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; From 549878742df9e4a554b424d1078e04ba5d55e975 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 18:19:11 +0100 Subject: [PATCH 1072/2308] Let's make glados the same as edi (I'll simplify/deduplicate later) --- .../plasma-desktop/configuration.nix | 891 +----------------- 1 file changed, 10 insertions(+), 881 deletions(-) diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix index 93f8663..a193e98 100644 --- a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix +++ b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix @@ -5,8 +5,7 @@ config, pkgs, ... -}: -{ +}: { programs.plasma = { enable = true; shortcuts = { @@ -271,13 +270,12 @@ "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; - "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "844,598"; - "kdeglobals"."General"."BrowserApplication" = "librewolf.desktop"; + "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; "kdeglobals"."KDE"."SingleClick" = false; "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; - "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; @@ -287,7 +285,7 @@ "kdeglobals"."KFileDialog Settings"."Show Preview" = false; "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; - "kdeglobals"."KFileDialog Settings"."Sort by" = "Name"; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; @@ -801,7 +799,6 @@ "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."DirSelect Dialog"."DirSelectDialog Size[$d]" = ""; "khotkeysrc"."General"."BrowserApplication[$d]" = ""; "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; "khotkeysrc"."General"."ColorScheme[$d]" = ""; @@ -845,6 +842,9 @@ "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; "kiorc"."Confirmations"."ConfirmDelete" = true; "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "krunnerrc"."Plugins"."locationsEnabled" = true; + "krunnerrc"."Plugins"."placesEnabled" = true; + "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; "kwalletrc"."Wallet"."First Use" = false; "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; @@ -856,10 +856,9 @@ "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; "kwinrc"."NightColor"."LongitudeFixed" = 5.44; "kwinrc"."NightColor"."Mode" = "Location"; - "kwinrc"."NightColor"."NightTemperature" = 1200; + "kwinrc"."NightColor"."NightTemperature" = 1400; "kwinrc"."Plugins"."wobblywindowsEnabled" = true; "kwinrc"."Tiling"."padding" = 4; - "kwinrc"."Tiling.250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Xwayland"."Scale" = 1; @@ -868,879 +867,9 @@ "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MONETARY" = "en_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; - "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; - }; - }; -} -{ - programs.plasma = { - enable = true; - shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; - "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; - "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; - "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; - "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; - "kded5"."Show System Activity" = "Ctrl+Esc"; - "kded5"."display" = ["Display" "Meta+P"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; - "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; - "kmix"."decrease_volume" = "Volume Down"; - "kmix"."increase_microphone_volume" = "Microphone Volume Up"; - "kmix"."increase_volume" = "Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; - "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = []; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; - "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = []; - "ksmserver"."Reboot Without Confirmation" = []; - "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Decrease Opacity" = []; - "kwin"."Edit Tiles" = "Meta+T"; - "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; - "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = []; - "kwin"."Increase Opacity" = []; - "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = []; - "kwin"."MoveMouseToCenter" = "Meta+F6"; - "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = []; - "kwin"."MoveZoomLeft" = []; - "kwin"."MoveZoomRight" = []; - "kwin"."MoveZoomUp" = []; - "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = []; - "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12"; - "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; - "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; - "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; - "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; - "kwin"."Switch Window Down" = "Meta+Alt+Down"; - "kwin"."Switch Window Left" = "Meta+Alt+Left"; - "kwin"."Switch Window Right" = "Meta+Alt+Right"; - "kwin"."Switch Window Up" = "Meta+Alt+Up"; - "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = []; - "kwin"."Switch to Desktop 11" = []; - "kwin"."Switch to Desktop 12" = []; - "kwin"."Switch to Desktop 13" = []; - "kwin"."Switch to Desktop 14" = []; - "kwin"."Switch to Desktop 15" = []; - "kwin"."Switch to Desktop 16" = []; - "kwin"."Switch to Desktop 17" = []; - "kwin"."Switch to Desktop 18" = []; - "kwin"."Switch to Desktop 19" = []; - "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = []; - "kwin"."Switch to Desktop 3" = "Ctrl+F3"; - "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = []; - "kwin"."Switch to Desktop 6" = []; - "kwin"."Switch to Desktop 7" = []; - "kwin"."Switch to Desktop 8" = []; - "kwin"."Switch to Desktop 9" = []; - "kwin"."Switch to Next Desktop" = []; - "kwin"."Switch to Next Screen" = []; - "kwin"."Switch to Previous Desktop" = []; - "kwin"."Switch to Previous Screen" = []; - "kwin"."Switch to Screen 0" = []; - "kwin"."Switch to Screen 1" = []; - "kwin"."Switch to Screen 2" = []; - "kwin"."Switch to Screen 3" = []; - "kwin"."Switch to Screen 4" = []; - "kwin"."Switch to Screen 5" = []; - "kwin"."Switch to Screen 6" = []; - "kwin"."Switch to Screen 7" = []; - "kwin"."Switch to Screen Above" = []; - "kwin"."Switch to Screen Below" = []; - "kwin"."Switch to Screen to the Left" = []; - "kwin"."Switch to Screen to the Right" = []; - "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = []; - "kwin"."Walk Through Desktop List" = []; - "kwin"."Walk Through Desktop List (Reverse)" = []; - "kwin"."Walk Through Desktops" = []; - "kwin"."Walk Through Desktops (Reverse)" = []; - "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = []; - "kwin"."Walk Through Windows Alternative (Reverse)" = []; - "kwin"."Walk Through Windows of Current Application" = "Alt+`"; - "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = []; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; - "kwin"."Window Above Other Windows" = []; - "kwin"."Window Below Other Windows" = []; - "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = []; - "kwin"."Window Grow Horizontal" = []; - "kwin"."Window Grow Vertical" = []; - "kwin"."Window Lower" = []; - "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = []; - "kwin"."Window Maximize Vertical" = []; - "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = []; - "kwin"."Window Move Center" = []; - "kwin"."Window No Border" = []; - "kwin"."Window On All Desktops" = []; - "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; - "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; - "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; - "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = []; - "kwin"."Window One Screen Up" = []; - "kwin"."Window One Screen to the Left" = []; - "kwin"."Window One Screen to the Right" = []; - "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = []; - "kwin"."Window Pack Left" = []; - "kwin"."Window Pack Right" = []; - "kwin"."Window Pack Up" = []; - "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = []; - "kwin"."Window Quick Tile Bottom Right" = []; - "kwin"."Window Quick Tile Left" = "Meta+Left"; - "kwin"."Window Quick Tile Right" = "Meta+Right"; - "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = []; - "kwin"."Window Quick Tile Top Right" = []; - "kwin"."Window Raise" = []; - "kwin"."Window Resize" = []; - "kwin"."Window Shade" = []; - "kwin"."Window Shrink Horizontal" = []; - "kwin"."Window Shrink Vertical" = []; - "kwin"."Window to Desktop 1" = []; - "kwin"."Window to Desktop 10" = []; - "kwin"."Window to Desktop 11" = []; - "kwin"."Window to Desktop 12" = []; - "kwin"."Window to Desktop 13" = []; - "kwin"."Window to Desktop 14" = []; - "kwin"."Window to Desktop 15" = []; - "kwin"."Window to Desktop 16" = []; - "kwin"."Window to Desktop 17" = []; - "kwin"."Window to Desktop 18" = []; - "kwin"."Window to Desktop 19" = []; - "kwin"."Window to Desktop 2" = []; - "kwin"."Window to Desktop 20" = []; - "kwin"."Window to Desktop 3" = []; - "kwin"."Window to Desktop 4" = []; - "kwin"."Window to Desktop 5" = []; - "kwin"."Window to Desktop 6" = []; - "kwin"."Window to Desktop 7" = []; - "kwin"."Window to Desktop 8" = []; - "kwin"."Window to Desktop 9" = []; - "kwin"."Window to Next Desktop" = []; - "kwin"."Window to Next Screen" = []; - "kwin"."Window to Previous Desktop" = []; - "kwin"."Window to Previous Screen" = []; - "kwin"."Window to Screen 0" = []; - "kwin"."Window to Screen 1" = []; - "kwin"."Window to Screen 2" = []; - "kwin"."Window to Screen 3" = []; - "kwin"."Window to Screen 4" = []; - "kwin"."Window to Screen 5" = []; - "kwin"."Window to Screen 6" = []; - "kwin"."Window to Screen 7" = []; - "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; - "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = []; - "mediacontrol"."mediavolumeup" = []; - "mediacontrol"."nextmedia" = "Media Next"; - "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = []; - "mediacontrol"."playpausemedia" = "Media Play"; - "mediacontrol"."previousmedia" = "Media Previous"; - "mediacontrol"."stopmedia" = "Media Stop"; - "org.kde.dolphin.desktop"."_launch" = "Meta+E"; - "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; - "org.kde.konsole.desktop"."NewTab" = []; - "org.kde.konsole.desktop"."NewWindow" = []; - "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; - "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; - "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; - "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; - "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; - "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; - "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; - "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; - "org.kde.spectacle.desktop"."_launch" = "Print"; - "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; - "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; - "org_kde_powerdevil"."Hibernate" = "Hibernate"; - "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; - "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; - "org_kde_powerdevil"."PowerDown" = "Power Down"; - "org_kde_powerdevil"."PowerOff" = "Power Off"; - "org_kde_powerdevil"."Sleep" = "Sleep"; - "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = []; - "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = []; - "plasmashell"."activate task manager entry 2" = "Meta+2"; - "plasmashell"."activate task manager entry 3" = "Meta+3"; - "plasmashell"."activate task manager entry 4" = "Meta+4"; - "plasmashell"."activate task manager entry 5" = "Meta+5"; - "plasmashell"."activate task manager entry 6" = "Meta+6"; - "plasmashell"."activate task manager entry 7" = "Meta+7"; - "plasmashell"."activate task manager entry 8" = "Meta+8"; - "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = []; - "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; - "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = []; - "plasmashell"."cyclePrevAction" = []; - "plasmashell"."edit_clipboard" = []; - "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = "Meta+Tab"; - "plasmashell"."previous activity" = "Meta+Shift+Tab"; - "plasmashell"."repeat_action" = "Meta+Ctrl+R"; - "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = []; - "plasmashell"."show-on-mouse-pos" = "Meta+V"; - "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = []; - "plasmashell"."switch to previous activity" = []; - "plasmashell"."toggle do not disturb" = []; - "systemsettings.desktop"."_launch" = "Tools"; - "systemsettings.desktop"."kcm-kscreen" = []; - "systemsettings.desktop"."kcm-lookandfeel" = []; - "systemsettings.desktop"."kcm-users" = []; - "systemsettings.desktop"."powerdevilprofilesconfig" = []; - "systemsettings.desktop"."screenlocker" = []; - }; - configFile = { - "baloofilerc"."General"."dbVersion" = 2; - "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; - "baloofilerc"."General"."exclude filters version" = 8; - "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; - "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; - "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; - "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; - "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; - "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; - "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; - "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; - "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; - "kded5rc"."Module-browserintegrationreminder"."autoload" = false; - "kded5rc"."Module-device_automounter"."autoload" = false; - "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; - "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "844,598"; - "kdeglobals"."General"."BrowserApplication" = "librewolf.desktop"; - "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; - "kdeglobals"."KDE"."SingleClick" = false; - "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; - "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; - "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true; - "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; - "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; - "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; - "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; - "kdeglobals"."KFileDialog Settings"."Show Preview" = false; - "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; - "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; - "kdeglobals"."KFileDialog Settings"."Sort by" = "Name"; - "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; - "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; - "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; - "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; - "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; - "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; - "kdeglobals"."WM"."activeBackground" = "49,54,59"; - "kdeglobals"."WM"."activeBlend" = "252,252,252"; - "kdeglobals"."WM"."activeForeground" = "252,252,252"; - "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; - "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; - "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; - "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; - "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; - "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; - "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; - "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; - "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; - "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; - "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; - "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; - "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; - "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; - "kglobalshortcutsrc"."org.kde.kcalc.desktop"."_k_friendly_name" = "KCalc"; - "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; - "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; - "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Emoji Selector"; - "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; - "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Power Management"; - "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; - "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "System Settings"; - "khotkeysrc"."Data"."DataCount" = 3; - "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; - "khotkeysrc"."Data_1"."DataCount" = 1; - "khotkeysrc"."Data_1"."Enabled" = true; - "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; - "khotkeysrc"."Data_1"."SystemGroup" = 1; - "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1"."Comment" = "Comment"; - "khotkeysrc"."Data_1_1"."Enabled" = true; - "khotkeysrc"."Data_1_1"."Name" = "Search"; - "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; - "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; - "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; - "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; - "khotkeysrc"."Data_2"."DataCount" = 8; - "khotkeysrc"."Data_2"."Enabled" = false; - "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; - "khotkeysrc"."Data_2"."Name" = "Examples"; - "khotkeysrc"."Data_2"."SystemGroup" = 0; - "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; - "khotkeysrc"."Data_2_1"."Enabled" = false; - "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; - "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; - "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; - "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; - "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; - "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; - "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; - "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; - "khotkeysrc"."Data_2_2"."Enabled" = false; - "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; - "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; - "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; - "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; - "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; - "khotkeysrc"."Data_2_3"."Enabled" = false; - "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; - "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; - "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; - "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; - "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; - "khotkeysrc"."Data_2_4"."Enabled" = false; - "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; - "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; - "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; - "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; - "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; - "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; - "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; - "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; - "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; - "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; - "khotkeysrc"."Data_2_5"."Enabled" = false; - "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; - "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; - "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; - "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; - "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; - "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; - "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; - "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; - "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; - "khotkeysrc"."Data_2_6"."Enabled" = false; - "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; - "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; - "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; - "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; - "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; - "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; - "khotkeysrc"."Data_2_7"."DataCount" = 4; - "khotkeysrc"."Data_2_7"."Enabled" = false; - "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; - "khotkeysrc"."Data_2_7"."SystemGroup" = 0; - "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_7_1"."Comment" = ""; - "khotkeysrc"."Data_2_7_1"."Enabled" = false; - "khotkeysrc"."Data_2_7_1"."Name" = "Back"; - "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2"."Comment" = ""; - "khotkeysrc"."Data_2_7_2"."Enabled" = false; - "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; - "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3"."Comment" = ""; - "khotkeysrc"."Data_2_7_3"."Enabled" = false; - "khotkeysrc"."Data_2_7_3"."Name" = "Up"; - "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4"."Comment" = ""; - "khotkeysrc"."Data_2_7_4"."Enabled" = false; - "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; - "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; - "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; - "khotkeysrc"."Data_2_8"."Enabled" = false; - "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; - "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; - "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; - "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; - "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; - "khotkeysrc"."Data_3"."DataCount" = 14; - "khotkeysrc"."Data_3"."Enabled" = true; - "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; - "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; - "khotkeysrc"."Data_3"."SystemGroup" = 0; - "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; - "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; - "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; - "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; - "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; - "khotkeysrc"."Data_3_1"."Enabled" = true; - "khotkeysrc"."Data_3_1"."Name" = "Back"; - "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; - "khotkeysrc"."Data_3_10"."Enabled" = false; - "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; - "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; - "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; - "khotkeysrc"."Data_3_11"."Enabled" = true; - "khotkeysrc"."Data_3_11"."Name" = "Up"; - "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; - "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; - "khotkeysrc"."Data_3_12"."Enabled" = false; - "khotkeysrc"."Data_3_12"."Name" = "Up #2"; - "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; - "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; - "khotkeysrc"."Data_3_13"."Enabled" = true; - "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; - "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; - "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; - "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; - "khotkeysrc"."Data_3_14"."Enabled" = true; - "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; - "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; - "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; - "khotkeysrc"."Data_3_2"."Enabled" = true; - "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; - "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; - "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; - "khotkeysrc"."Data_3_3"."Enabled" = true; - "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; - "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; - "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; - "khotkeysrc"."Data_3_4"."Enabled" = true; - "khotkeysrc"."Data_3_4"."Name" = "Forward"; - "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; - "khotkeysrc"."Data_3_5"."Enabled" = true; - "khotkeysrc"."Data_3_5"."Name" = "Home"; - "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; - "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; - "khotkeysrc"."Data_3_6"."Enabled" = true; - "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; - "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; - "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; - "khotkeysrc"."Data_3_7"."Enabled" = true; - "khotkeysrc"."Data_3_7"."Name" = "New Tab"; - "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; - "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; - "khotkeysrc"."Data_3_8"."Enabled" = true; - "khotkeysrc"."Data_3_8"."Name" = "New Window"; - "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; - "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; - "khotkeysrc"."Data_3_9"."Enabled" = true; - "khotkeysrc"."Data_3_9"."Name" = "Reload"; - "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; - "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."DirSelect Dialog"."DirSelectDialog Size[$d]" = ""; - "khotkeysrc"."General"."BrowserApplication[$d]" = ""; - "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; - "khotkeysrc"."General"."ColorScheme[$d]" = ""; - "khotkeysrc"."Gestures"."Disabled" = true; - "khotkeysrc"."Gestures"."MouseButton" = 2; - "khotkeysrc"."Gestures"."Timeout" = 300; - "khotkeysrc"."GesturesExclude"."Comment" = ""; - "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; - "khotkeysrc"."Icons"."Theme[$d]" = ""; - "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; - "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; - "khotkeysrc"."KDE"."SingleClick[$d]" = ""; - "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; - "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; - "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; - "khotkeysrc"."Main"."Disabled" = false; - "khotkeysrc"."Voice"."Shortcut" = ""; - "khotkeysrc"."WM"."activeBackground[$d]" = ""; - "khotkeysrc"."WM"."activeBlend[$d]" = ""; - "khotkeysrc"."WM"."activeForeground[$d]" = ""; - "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; - "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; - "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; - "kiorc"."Confirmations"."ConfirmDelete" = true; - "krunnerrc"."Plugins"."baloosearchEnabled" = false; - "kwalletrc"."Wallet"."First Use" = false; - "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; - "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; - "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; - "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; - "kwinrc"."Desktops"."Number" = 4; - "kwinrc"."Desktops"."Rows" = 2; - "kwinrc"."NightColor"."Active" = true; - "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; - "kwinrc"."NightColor"."LongitudeFixed" = 5.44; - "kwinrc"."NightColor"."Mode" = "Location"; - "kwinrc"."NightColor"."NightTemperature" = 1200; - "kwinrc"."Plugins"."wobblywindowsEnabled" = true; - "kwinrc"."Tiling"."padding" = 4; - "kwinrc"."Tiling.250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Xwayland"."Scale" = 1; - "kxkbrc"."Layout"."Options" = "compose:caps"; - "kxkbrc"."Layout"."ResetOldOptions" = true; - "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; - "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MONETARY" = "en_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; From 09257256ee98f3f374fb68423b06b96b0c8bcc96 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 23:09:29 +0100 Subject: [PATCH 1073/2308] Added ssh domain to forgejo --- nixos/server/package-configs/forgejo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 0c8ff72..6c631b3 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -58,6 +58,7 @@ DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; + SSH_DOMAIN = git.lillianviolet.dev; }; }; }; From 28c887f2a2b81705dbbbd76f579c8195f80e20ed Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 18 Jan 2024 23:09:29 +0100 Subject: [PATCH 1074/2308] Added ssh domain to forgejo --- nixos/server/package-configs/forgejo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 0c8ff72..6c631b3 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -58,6 +58,7 @@ DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; + SSH_DOMAIN = git.lillianviolet.dev; }; }; }; From c7d6449d958408ea7d016dc4a32c6eae2b141ef7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 23:18:40 +0100 Subject: [PATCH 1075/2308] Should probably make that a string --- nixos/server/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 6c631b3..2adf3cc 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -58,7 +58,7 @@ DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; - SSH_DOMAIN = git.lillianviolet.dev; + SSH_DOMAIN = "git.lillianviolet.dev"; }; }; }; From 7641556583b49dbb8c8bc7f6612d16a21779ac8a Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 18 Jan 2024 23:18:40 +0100 Subject: [PATCH 1076/2308] Should probably make that a string --- nixos/server/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 6c631b3..2adf3cc 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -58,7 +58,7 @@ DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; - SSH_DOMAIN = git.lillianviolet.dev; + SSH_DOMAIN = "git.lillianviolet.dev"; }; }; }; From bf4d442df37a507b078ca9ad6cae538227fc63c5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 23:33:22 +0100 Subject: [PATCH 1077/2308] Open ssh port for forgejo --- nixos/server/package-configs/forgejo/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 2adf3cc..b3f378b 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -19,6 +19,9 @@ sops.secrets."mailpassunhash".mode = "0440"; sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; + networking.firewall.allowedTCPPorts = [3218]; + + services.forgejo = { enable = true; user = "gitea"; From 437e8a9d4de9bac155596350249c28041a8a2f8d Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 18 Jan 2024 23:33:22 +0100 Subject: [PATCH 1078/2308] Open ssh port for forgejo --- nixos/server/package-configs/forgejo/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 2adf3cc..b3f378b 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -19,6 +19,9 @@ sops.secrets."mailpassunhash".mode = "0440"; sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; + networking.firewall.allowedTCPPorts = [3218]; + + services.forgejo = { enable = true; user = "gitea"; From 1e9e85b15b0b0d89fe03dc05e991177d7797a059 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 23:36:48 +0100 Subject: [PATCH 1079/2308] Enable ssh services? --- nixos/server/package-configs/forgejo/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index b3f378b..ae49468 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -61,6 +61,8 @@ DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; + DISABLE_SSH = false; + START_SSH_SERVER = true; SSH_DOMAIN = "git.lillianviolet.dev"; }; }; From c2594abd8da687dd9051dd879a29474f720bbb8f Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 18 Jan 2024 23:36:48 +0100 Subject: [PATCH 1080/2308] Enable ssh services? --- nixos/server/package-configs/forgejo/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index b3f378b..ae49468 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -61,6 +61,8 @@ DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; + DISABLE_SSH = false; + START_SSH_SERVER = true; SSH_DOMAIN = "git.lillianviolet.dev"; }; }; From 376c587f0b0a83c03bdc13b9901f9d963fe18f82 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 23:45:54 +0100 Subject: [PATCH 1081/2308] Maybe host ssh on a different port than the website huh --- nixos/server/package-configs/forgejo/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index ae49468..1ecd91b 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -19,7 +19,7 @@ sops.secrets."mailpassunhash".mode = "0440"; sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; - networking.firewall.allowedTCPPorts = [3218]; + networking.firewall.allowedTCPPorts = [2228]; services.forgejo = { @@ -63,7 +63,7 @@ HTTP_PORT = 3218; DISABLE_SSH = false; START_SSH_SERVER = true; - SSH_DOMAIN = "git.lillianviolet.dev"; + SSH_DOMAIN = "git.lillianviolet.dev:2228"; }; }; }; From 0e5dc697332dbbf6ce0ae3b77008527d6cd6cd3e Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 18 Jan 2024 23:45:54 +0100 Subject: [PATCH 1082/2308] Maybe host ssh on a different port than the website huh --- nixos/server/package-configs/forgejo/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index ae49468..1ecd91b 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -19,7 +19,7 @@ sops.secrets."mailpassunhash".mode = "0440"; sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; - networking.firewall.allowedTCPPorts = [3218]; + networking.firewall.allowedTCPPorts = [2228]; services.forgejo = { @@ -63,7 +63,7 @@ HTTP_PORT = 3218; DISABLE_SSH = false; START_SSH_SERVER = true; - SSH_DOMAIN = "git.lillianviolet.dev"; + SSH_DOMAIN = "git.lillianviolet.dev:2228"; }; }; }; From aac8215e029221bf3f3619c82b7f52c5a51043d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 23:56:38 +0100 Subject: [PATCH 1083/2308] We don't need this, just an ssh key for the gitea user (I think) --- nixos/server/package-configs/forgejo/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 1ecd91b..d3c96a8 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -61,9 +61,6 @@ DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; - DISABLE_SSH = false; - START_SSH_SERVER = true; - SSH_DOMAIN = "git.lillianviolet.dev:2228"; }; }; }; From 73c44bfea3a35be628c966d630eab23bd62b87be Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 18 Jan 2024 23:56:38 +0100 Subject: [PATCH 1084/2308] We don't need this, just an ssh key for the gitea user (I think) --- nixos/server/package-configs/forgejo/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 1ecd91b..d3c96a8 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -61,9 +61,6 @@ DOMAIN = "git.lillianviolet.dev"; ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; - DISABLE_SSH = false; - START_SSH_SERVER = true; - SSH_DOMAIN = "git.lillianviolet.dev:2228"; }; }; }; From 3b6780665925afb9e45a61f241199d0952d1d0e1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Jan 2024 23:58:13 +0100 Subject: [PATCH 1085/2308] Add the ssh keys --- nixos/server/package-configs/forgejo/configuration.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index d3c96a8..67c1f09 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -10,6 +10,10 @@ users.groups.gitea = {}; users.users = { gitea = { + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + ]; isSystemUser = true; isNormalUser = false; group = "gitea"; @@ -19,9 +23,6 @@ sops.secrets."mailpassunhash".mode = "0440"; sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; - networking.firewall.allowedTCPPorts = [2228]; - - services.forgejo = { enable = true; user = "gitea"; From 2c756bbb1a1f38d6be954a239079bdc472c3c06b Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Thu, 18 Jan 2024 23:58:13 +0100 Subject: [PATCH 1086/2308] Add the ssh keys --- nixos/server/package-configs/forgejo/configuration.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index d3c96a8..67c1f09 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -10,6 +10,10 @@ users.groups.gitea = {}; users.users = { gitea = { + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + ]; isSystemUser = true; isNormalUser = false; group = "gitea"; @@ -19,9 +23,6 @@ sops.secrets."mailpassunhash".mode = "0440"; sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; - networking.firewall.allowedTCPPorts = [2228]; - - services.forgejo = { enable = true; user = "gitea"; From d34bbc934c3ad318029e23127dc8fdfaf7553559 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 00:12:52 +0100 Subject: [PATCH 1087/2308] Let's see if forgejo can manage the user on its own --- .../package-configs/forgejo/configuration.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 67c1f09..cfb6f7d 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -7,19 +7,20 @@ ... }: { imports = []; - users.groups.gitea = {}; - users.users = { - gitea = { - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" - ]; - isSystemUser = true; - isNormalUser = false; - group = "gitea"; - extraGroups = ["virtualMail"]; - }; - }; + #users.groups.gitea = {}; + #users.users = { + # gitea = { + # openssh.authorizedKeys.keys = [ + # "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + # ]; + # isSystemUser = true; + # isNormalUser = false; + # group = "gitea"; + # extraGroups = ["virtualMail"]; + # }; + #}; + sops.secrets."mailpassunhash".mode = "0440"; sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; From ec29a18b1dbf01fb7cd7ec5d0b0fca727ac2ade1 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 19 Jan 2024 00:12:52 +0100 Subject: [PATCH 1088/2308] Let's see if forgejo can manage the user on its own --- .../package-configs/forgejo/configuration.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 67c1f09..cfb6f7d 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -7,19 +7,20 @@ ... }: { imports = []; - users.groups.gitea = {}; - users.users = { - gitea = { - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" - ]; - isSystemUser = true; - isNormalUser = false; - group = "gitea"; - extraGroups = ["virtualMail"]; - }; - }; + #users.groups.gitea = {}; + #users.users = { + # gitea = { + # openssh.authorizedKeys.keys = [ + # "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + # ]; + # isSystemUser = true; + # isNormalUser = false; + # group = "gitea"; + # extraGroups = ["virtualMail"]; + # }; + #}; + sops.secrets."mailpassunhash".mode = "0440"; sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; From ebc58c560e017cce5257005677d3a0f719499f82 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 00:59:24 +0100 Subject: [PATCH 1089/2308] Let's try that again (change db and user db to forgejo) --- nixos/server/package-configs/forgejo/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index cfb6f7d..f0de946 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -32,8 +32,8 @@ #TODO: different mail passwords for different services mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { - user = "gitea"; - name = "gitea"; + #user = "gitea"; + #name = "gitea"; type = "postgres"; }; settings = { From 9a2f9f4cd2578831d11ef9a0e6731fe6a512c2d9 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 19 Jan 2024 00:59:24 +0100 Subject: [PATCH 1090/2308] Let's try that again (change db and user db to forgejo) --- nixos/server/package-configs/forgejo/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index cfb6f7d..f0de946 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -32,8 +32,8 @@ #TODO: different mail passwords for different services mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { - user = "gitea"; - name = "gitea"; + #user = "gitea"; + #name = "gitea"; type = "postgres"; }; settings = { From 2761496399b619576422f5da300bd79b67bb3d54 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:00:20 +0100 Subject: [PATCH 1091/2308] And remove the other gitea user definitions (I think the old db dump might have caused this?) --- nixos/server/package-configs/forgejo/configuration.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index f0de946..41f5d63 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -21,13 +21,13 @@ # }; #}; - sops.secrets."mailpassunhash".mode = "0440"; - sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; + #sops.secrets."mailpassunhash".mode = "0440"; + #sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; services.forgejo = { enable = true; - user = "gitea"; - group = "gitea"; + #user = "gitea"; + #group = "gitea"; stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services mailerPasswordFile = config.sops.secrets."mailpassunhash".path; From e5873d64a2e9ea3190efe9b5a6edff9e28421dc8 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 19 Jan 2024 01:00:20 +0100 Subject: [PATCH 1092/2308] And remove the other gitea user definitions (I think the old db dump might have caused this?) --- nixos/server/package-configs/forgejo/configuration.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index f0de946..41f5d63 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -21,13 +21,13 @@ # }; #}; - sops.secrets."mailpassunhash".mode = "0440"; - sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; + #sops.secrets."mailpassunhash".mode = "0440"; + #sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; services.forgejo = { enable = true; - user = "gitea"; - group = "gitea"; + #user = "gitea"; + #group = "gitea"; stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services mailerPasswordFile = config.sops.secrets."mailpassunhash".path; From 0bf37bb0c1761578222db7d1ed4ae217fbe41d69 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:03:09 +0100 Subject: [PATCH 1093/2308] Also remove the mailer password file definition again --- nixos/server/package-configs/forgejo/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 41f5d63..aca74e3 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -20,7 +20,7 @@ # extraGroups = ["virtualMail"]; # }; #}; - + #sops.secrets."mailpassunhash".mode = "0440"; #sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; @@ -30,7 +30,7 @@ #group = "gitea"; stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services - mailerPasswordFile = config.sops.secrets."mailpassunhash".path; + #mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { #user = "gitea"; #name = "gitea"; From acb700e41f4128ba6feca9cf5eab0db591fd9c5c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:03:09 +0100 Subject: [PATCH 1094/2308] Also remove the mailer password file definition again --- nixos/server/package-configs/forgejo/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index 41f5d63..aca74e3 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -20,7 +20,7 @@ # extraGroups = ["virtualMail"]; # }; #}; - + #sops.secrets."mailpassunhash".mode = "0440"; #sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; @@ -30,7 +30,7 @@ #group = "gitea"; stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services - mailerPasswordFile = config.sops.secrets."mailpassunhash".path; + #mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { #user = "gitea"; #name = "gitea"; From 9cf4e12c67e1fdc3db20d601f94d7d400e8bc2fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:04:02 +0100 Subject: [PATCH 1095/2308] Also disable mail for gotosocial for now --- .../package-configs/gotosocial/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/server/package-configs/gotosocial/configuration.nix b/nixos/server/package-configs/gotosocial/configuration.nix index a09cc3e..9e3afdf 100644 --- a/nixos/server/package-configs/gotosocial/configuration.nix +++ b/nixos/server/package-configs/gotosocial/configuration.nix @@ -35,11 +35,11 @@ media-image-max-size = 41943040; media-video-max-size = 209715200; media-description-max-chars = 2000; - smtp-host = "localhost"; - smtp-port = 587; - smtp-username = "no-reply@social.gladtherescake.eu"; - smtp-password = config.sops.secrets."mailpassunhash".path; - smtp-from = "no-reply@social.gladtherescake.eu"; + #smtp-host = "localhost"; + #smtp-port = 587; + #smtp-username = "no-reply@social.gladtherescake.eu"; + #smtp-password = config.sops.secrets."mailpassunhash".path; + #smtp-from = "no-reply@social.gladtherescake.eu"; }; }; From 0cbee329a8f73271d3ebf4bf863c67a3d2342a55 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:04:02 +0100 Subject: [PATCH 1096/2308] Also disable mail for gotosocial for now --- .../package-configs/gotosocial/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/server/package-configs/gotosocial/configuration.nix b/nixos/server/package-configs/gotosocial/configuration.nix index a09cc3e..9e3afdf 100644 --- a/nixos/server/package-configs/gotosocial/configuration.nix +++ b/nixos/server/package-configs/gotosocial/configuration.nix @@ -35,11 +35,11 @@ media-image-max-size = 41943040; media-video-max-size = 209715200; media-description-max-chars = 2000; - smtp-host = "localhost"; - smtp-port = 587; - smtp-username = "no-reply@social.gladtherescake.eu"; - smtp-password = config.sops.secrets."mailpassunhash".path; - smtp-from = "no-reply@social.gladtherescake.eu"; + #smtp-host = "localhost"; + #smtp-port = 587; + #smtp-username = "no-reply@social.gladtherescake.eu"; + #smtp-password = config.sops.secrets."mailpassunhash".path; + #smtp-from = "no-reply@social.gladtherescake.eu"; }; }; From 4ba4ff66e6ec370a351af90343f522b461aab6ed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:08:56 +0100 Subject: [PATCH 1097/2308] Forgot the state dir, that was a hassle to change --- nixos/server/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index aca74e3..8911594 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -28,7 +28,7 @@ enable = true; #user = "gitea"; #group = "gitea"; - stateDir = "/var/lib/gitea"; + #stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services #mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { From 07479337586c9b270bdc274a6c2cc5f605e6c9b7 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Fri, 19 Jan 2024 01:08:56 +0100 Subject: [PATCH 1098/2308] Forgot the state dir, that was a hassle to change --- nixos/server/package-configs/forgejo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/configuration.nix index aca74e3..8911594 100644 --- a/nixos/server/package-configs/forgejo/configuration.nix +++ b/nixos/server/package-configs/forgejo/configuration.nix @@ -28,7 +28,7 @@ enable = true; #user = "gitea"; #group = "gitea"; - stateDir = "/var/lib/gitea"; + #stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services #mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { From 322370de41c0cf0cc7bf2ecc0402c6cbcd19b5a2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:23:26 +0100 Subject: [PATCH 1099/2308] Changing to 23.11 might fix the mail server --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 2bef11c..1fac047 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -184,5 +184,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.11"; } From a339da83ce0ceba805f6e10fccac1ee864340b42 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:23:26 +0100 Subject: [PATCH 1100/2308] Changing to 23.11 might fix the mail server --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 2bef11c..1fac047 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -184,5 +184,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.11"; } From 8cfee6f607c8e0b51053478b0eac88cd01a6a1d2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:26:02 +0100 Subject: [PATCH 1101/2308] change mail server to 23.11 version --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 3b565c4..844c330 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; flake-utils.url = "github:numtide/flake-utils"; plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; From 5f2c8d56265e6dd9e7ac029ec7f5c86805409eb7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:26:02 +0100 Subject: [PATCH 1102/2308] change mail server to 23.11 version --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 3b565c4..844c330 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; flake-utils.url = "github:numtide/flake-utils"; plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; From 0d60861a6af168de5e9abd84a04c8ccdebc2ddf3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:26:41 +0100 Subject: [PATCH 1103/2308] Update flake lock --- flake.lock | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 820b5e4..c123bc4 100644 --- a/flake.lock +++ b/flake.lock @@ -213,6 +213,21 @@ "type": "indirect" } }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1701539137, + "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1705033721, @@ -379,19 +394,20 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" }, "locked": { - "lastModified": 1703666786, - "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "lastModified": 1703023684, + "narHash": "sha256-XQU4OaacV0F2tf9cNAvIMqlC0HBIrAtvb0MLjIHt+7M=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", + "rev": "4bfb8eb058f098302c97b909df2d019926e11220", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "master", + "ref": "nixos-23.11", "repo": "nixos-mailserver", "type": "gitlab" } From 5644053a08895d6322304ccc73c11cb59a122d1b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:26:41 +0100 Subject: [PATCH 1104/2308] Update flake lock --- flake.lock | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 820b5e4..c123bc4 100644 --- a/flake.lock +++ b/flake.lock @@ -213,6 +213,21 @@ "type": "indirect" } }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1701539137, + "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1705033721, @@ -379,19 +394,20 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" }, "locked": { - "lastModified": 1703666786, - "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "lastModified": 1703023684, + "narHash": "sha256-XQU4OaacV0F2tf9cNAvIMqlC0HBIrAtvb0MLjIHt+7M=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", + "rev": "4bfb8eb058f098302c97b909df2d019926e11220", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "master", + "ref": "nixos-23.11", "repo": "nixos-mailserver", "type": "gitlab" } From f55a7a7477bbc14edcd9027afddbce9469b121ff Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:31:01 +0100 Subject: [PATCH 1105/2308] Try and use stable packages for the server --- flake.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- overlays/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 844c330..861afd9 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ plasma-manager.inputs.home-manager.follows = "home-manager"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1fac047..4c789ff 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -84,7 +84,7 @@ }; }; - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs.stable; [ akkoma age fzf diff --git a/overlays/default.nix b/overlays/default.nix index 8728c22..1f7d740 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -18,8 +18,8 @@ # When applied, the unstable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { + stable-packages = final: _prev: { + stable = import inputs.nixpkgs-stable { system = final.system; config.allowUnfree = true; }; From 903358904762728a0e0ab4d6fe5946f29e7166b4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:31:01 +0100 Subject: [PATCH 1106/2308] Try and use stable packages for the server --- flake.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- overlays/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 844c330..861afd9 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ plasma-manager.inputs.home-manager.follows = "home-manager"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1fac047..4c789ff 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -84,7 +84,7 @@ }; }; - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs.stable; [ akkoma age fzf diff --git a/overlays/default.nix b/overlays/default.nix index 8728c22..1f7d740 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -18,8 +18,8 @@ # When applied, the unstable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { + stable-packages = final: _prev: { + stable = import inputs.nixpkgs-stable { system = final.system; config.allowUnfree = true; }; From 8cff7b8a7b37c4760446cdd0775c2fe12174e182 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:32:20 +0100 Subject: [PATCH 1107/2308] Update flake lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c123bc4..4d5b4a7 100644 --- a/flake.lock +++ b/flake.lock @@ -229,6 +229,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1705458851, + "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1705033721, "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", @@ -244,22 +260,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1705133751, @@ -380,7 +380,7 @@ "jovian": "jovian", "linger": "linger", "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-stable": "nixpkgs-stable", "pihole": "pihole", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -415,7 +415,7 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1705356877, From e08db9ab4b20af4242b6bf3b330b8a908568ad9e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:32:20 +0100 Subject: [PATCH 1108/2308] Update flake lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c123bc4..4d5b4a7 100644 --- a/flake.lock +++ b/flake.lock @@ -229,6 +229,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1705458851, + "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1705033721, "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", @@ -244,22 +260,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1705133751, @@ -380,7 +380,7 @@ "jovian": "jovian", "linger": "linger", "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-stable": "nixpkgs-stable", "pihole": "pihole", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -415,7 +415,7 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1705356877, From 6af0025744479a90d3faaa91cc0758d050869811 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:38:05 +0100 Subject: [PATCH 1109/2308] Add stable to outputs --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 861afd9..a16b87b 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,7 @@ outputs = { self, nixpkgs, + nixpkgs-stable, home-manager, sops-nix, simple-nixos-mailserver, From c381493ac72f11513eec9b155962410ecde5631a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:38:05 +0100 Subject: [PATCH 1110/2308] Add stable to outputs --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 861afd9..a16b87b 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,7 @@ outputs = { self, nixpkgs, + nixpkgs-stable, home-manager, sops-nix, simple-nixos-mailserver, From eda72f9018df2a79e60312d76a4a125af0705489 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:47:09 +0100 Subject: [PATCH 1111/2308] Let's try this instead? --- overlays/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index 1f7d740..54f7d69 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -16,12 +16,11 @@ # }); }; - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - stable-packages = final: _prev: { - stable = import inputs.nixpkgs-stable { - system = final.system; - config.allowUnfree = true; - }; - }; + # When applied, the stable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.stable' + pkg-sets = ( + final: prev: { + stable = import inputs.nixos-stable {system = final.system;}; + } + ); } From 0743958f865985297615bea31fefbda2f7cde94e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:47:09 +0100 Subject: [PATCH 1112/2308] Let's try this instead? --- overlays/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index 1f7d740..54f7d69 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -16,12 +16,11 @@ # }); }; - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - stable-packages = final: _prev: { - stable = import inputs.nixpkgs-stable { - system = final.system; - config.allowUnfree = true; - }; - }; + # When applied, the stable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.stable' + pkg-sets = ( + final: prev: { + stable = import inputs.nixos-stable {system = final.system;}; + } + ); } From 25fedc1cc4f82f86e1ee08d2648c12c011639606 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:53:05 +0100 Subject: [PATCH 1113/2308] Let's try this instead... --- flake.nix | 2 +- nixos/hosts/queen/configuration.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index a16b87b..6ed4891 100644 --- a/flake.nix +++ b/flake.nix @@ -107,7 +107,7 @@ nixosConfigurations = { queen = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; + specialArgs = {inherit inputs outputs nixpkgs-stable;}; modules = [ # > Our main nixos configuration file < ./nixos/hosts/queen/configuration.nix diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 4c789ff..6a20d8e 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -4,6 +4,7 @@ lib, config, pkgs, + nixpkgs-stable, ... }: { imports = [ @@ -84,7 +85,7 @@ }; }; - environment.systemPackages = with pkgs.stable; [ + environment.systemPackages = with nixpkgs-stable; [ akkoma age fzf From 49b32e74d8febde7360b9bffb5d82f776b964dfc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 01:53:05 +0100 Subject: [PATCH 1114/2308] Let's try this instead... --- flake.nix | 2 +- nixos/hosts/queen/configuration.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index a16b87b..6ed4891 100644 --- a/flake.nix +++ b/flake.nix @@ -107,7 +107,7 @@ nixosConfigurations = { queen = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; + specialArgs = {inherit inputs outputs nixpkgs-stable;}; modules = [ # > Our main nixos configuration file < ./nixos/hosts/queen/configuration.nix diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 4c789ff..6a20d8e 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -4,6 +4,7 @@ lib, config, pkgs, + nixpkgs-stable, ... }: { imports = [ @@ -84,7 +85,7 @@ }; }; - environment.systemPackages = with pkgs.stable; [ + environment.systemPackages = with nixpkgs-stable; [ akkoma age fzf From f7a69135d0958547f2f6de67c7e591c2c206a549 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 15:25:52 +0100 Subject: [PATCH 1115/2308] Change mailserver to pull request fix --- flake.lock | 46 ++++++++++------------------- flake.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- 3 files changed, 17 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 4d5b4a7..b38dab6 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1705535278, - "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", + "lastModified": 1705660020, + "narHash": "sha256-1tOuNh+UbiZlaC8RrpQzzypgnLBC67eRlBunfkE4sbQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", + "rev": "2064348e555b6aa963da6372a8f14e6acb80a176", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705487282, - "narHash": "sha256-eX/0O2ybmFKD/MzYO8gDlr4tAurekDbJQa7olAFFbRo=", + "lastModified": 1705667791, + "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a00331e522b9a732f876cf707174ce37ae702762", + "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705566941, - "narHash": "sha256-CLNtVRDA8eUPk+bxsCCZtRO0Cp+SpHdn1nNOLoFypLs=", + "lastModified": 1705635624, + "narHash": "sha256-DU0schxQOtBNO1c9hUsgYl+QMOXQMfRT7Qw/mg+ayno=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b06ff4bf8f4ad900fe0c2a61fc2946edc3a84be7", + "rev": "4471857c0a4a8a0ffc7bdbeaf1b998746ce12a82", "type": "github" }, "original": { @@ -213,21 +213,6 @@ "type": "indirect" } }, - "nixpkgs-23_11": { - "locked": { - "lastModified": 1701539137, - "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1705458851, @@ -394,20 +379,19 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" }, "locked": { - "lastModified": 1703023684, - "narHash": "sha256-XQU4OaacV0F2tf9cNAvIMqlC0HBIrAtvb0MLjIHt+7M=", - "owner": "simple-nixos-mailserver", + "lastModified": 1705361146, + "narHash": "sha256-oN6fJdswGueekl3VYLyP8GyZR76In8Au338JdNYX88Q=", + "owner": "dotlambda", "repo": "nixos-mailserver", - "rev": "4bfb8eb058f098302c97b909df2d019926e11220", + "rev": "c0c812117d67e346a94c3b546d04ab4820ed38d3", "type": "gitlab" }, "original": { - "owner": "simple-nixos-mailserver", - "ref": "nixos-23.11", + "owner": "dotlambda", + "ref": "sieve-fix", "repo": "nixos-mailserver", "type": "gitlab" } diff --git a/flake.nix b/flake.nix index 6ed4891..23dc586 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; + simple-nixos-mailserver.url = "gitlab:dotlambda/nixos-mailserver/sieve-fix"; flake-utils.url = "github:numtide/flake-utils"; plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 6a20d8e..1a473bc 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -85,7 +85,7 @@ }; }; - environment.systemPackages = with nixpkgs-stable; [ + environment.systemPackages = with pkgs; [ akkoma age fzf From 3fd7fbc66f7ffc5f0c11fd7905cff0ee87afeff3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 15:25:52 +0100 Subject: [PATCH 1116/2308] Change mailserver to pull request fix --- flake.lock | 46 ++++++++++------------------- flake.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- 3 files changed, 17 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 4d5b4a7..b38dab6 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1705535278, - "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", + "lastModified": 1705660020, + "narHash": "sha256-1tOuNh+UbiZlaC8RrpQzzypgnLBC67eRlBunfkE4sbQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", + "rev": "2064348e555b6aa963da6372a8f14e6acb80a176", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705487282, - "narHash": "sha256-eX/0O2ybmFKD/MzYO8gDlr4tAurekDbJQa7olAFFbRo=", + "lastModified": 1705667791, + "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a00331e522b9a732f876cf707174ce37ae702762", + "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705566941, - "narHash": "sha256-CLNtVRDA8eUPk+bxsCCZtRO0Cp+SpHdn1nNOLoFypLs=", + "lastModified": 1705635624, + "narHash": "sha256-DU0schxQOtBNO1c9hUsgYl+QMOXQMfRT7Qw/mg+ayno=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b06ff4bf8f4ad900fe0c2a61fc2946edc3a84be7", + "rev": "4471857c0a4a8a0ffc7bdbeaf1b998746ce12a82", "type": "github" }, "original": { @@ -213,21 +213,6 @@ "type": "indirect" } }, - "nixpkgs-23_11": { - "locked": { - "lastModified": 1701539137, - "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1705458851, @@ -394,20 +379,19 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" }, "locked": { - "lastModified": 1703023684, - "narHash": "sha256-XQU4OaacV0F2tf9cNAvIMqlC0HBIrAtvb0MLjIHt+7M=", - "owner": "simple-nixos-mailserver", + "lastModified": 1705361146, + "narHash": "sha256-oN6fJdswGueekl3VYLyP8GyZR76In8Au338JdNYX88Q=", + "owner": "dotlambda", "repo": "nixos-mailserver", - "rev": "4bfb8eb058f098302c97b909df2d019926e11220", + "rev": "c0c812117d67e346a94c3b546d04ab4820ed38d3", "type": "gitlab" }, "original": { - "owner": "simple-nixos-mailserver", - "ref": "nixos-23.11", + "owner": "dotlambda", + "ref": "sieve-fix", "repo": "nixos-mailserver", "type": "gitlab" } diff --git a/flake.nix b/flake.nix index 6ed4891..23dc586 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; + simple-nixos-mailserver.url = "gitlab:dotlambda/nixos-mailserver/sieve-fix"; flake-utils.url = "github:numtide/flake-utils"; plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 6a20d8e..1a473bc 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -85,7 +85,7 @@ }; }; - environment.systemPackages = with nixpkgs-stable; [ + environment.systemPackages = with pkgs; [ akkoma age fzf From e26af96491e813b5fcb7d3ea26f79772054bc8d5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 15:33:18 +0100 Subject: [PATCH 1117/2308] Let's retain the unstable state version --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1a473bc..d178c9b 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -185,5 +185,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.11"; + system.stateVersion = "unstable"; } From d011a78b8d45a5c5663426769f58a4a279aa183f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 15:33:18 +0100 Subject: [PATCH 1118/2308] Let's retain the unstable state version --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1a473bc..d178c9b 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -185,5 +185,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.11"; + system.stateVersion = "unstable"; } From a72fb745367ab580a88a85fc6336f70a31c4f82c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 15:43:14 +0100 Subject: [PATCH 1119/2308] Downgrade flake and lock until mailserver updates --- flake.lock | 202 +++++++++++++---------------------------------------- flake.nix | 7 +- 2 files changed, 51 insertions(+), 158 deletions(-) diff --git a/flake.lock b/flake.lock index b38dab6..9770d24 100644 --- a/flake.lock +++ b/flake.lock @@ -67,24 +67,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -92,11 +74,11 @@ ] }, "locked": { - "lastModified": 1705660020, - "narHash": "sha256-1tOuNh+UbiZlaC8RrpQzzypgnLBC67eRlBunfkE4sbQ=", + "lastModified": 1704980804, + "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", "owner": "nix-community", "repo": "home-manager", - "rev": "2064348e555b6aa963da6372a8f14e6acb80a176", + "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", "type": "github" }, "original": { @@ -112,11 +94,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705667791, - "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", + "lastModified": 1704665257, + "narHash": "sha256-Cycz00I26e8QZ9sZtCz0uIz6Cad5ld3zM7N2I+5beqI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", + "rev": "8951673c6c216ddd6bac3db3e88e3f2281b3511a", "type": "github" }, "original": { @@ -125,26 +107,6 @@ "type": "github" } }, - "linger": { - "inputs": { - "flake-utils": [ - "flake-utils" - ] - }, - "locked": { - "lastModified": 1670283645, - "narHash": "sha256-SuC/SuQ8RUaM6RthNAkNTSnlpRXJxEmuym2OyPLLpWk=", - "owner": "mindsbackyard", - "repo": "linger-flake", - "rev": "9f8632c0621dc562dd42e9eacfdb6dae82aebf8b", - "type": "github" - }, - "original": { - "owner": "mindsbackyard", - "repo": "linger-flake", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -169,11 +131,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705635624, - "narHash": "sha256-DU0schxQOtBNO1c9hUsgYl+QMOXQMfRT7Qw/mg+ayno=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4471857c0a4a8a0ffc7bdbeaf1b998746ce12a82", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -215,27 +177,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1705458851, - "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -245,13 +191,29 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -263,11 +225,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { @@ -294,11 +256,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1704161960, + "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "63143ac2c9186be6d9da6035fa22620018c85932", "type": "github" }, "original": { @@ -308,66 +270,13 @@ "type": "github" } }, - "pihole": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "linger": [ - "linger" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1670284048, - "narHash": "sha256-lNyJ7vrDAdsPVcNBXqDUXseBBL9Kf2q64/A8ntEKXWI=", - "owner": "mindsbackyard", - "repo": "pihole-flake", - "rev": "9daaf65415ad6d3f5a8daa617d8737bc405f9dd8", - "type": "github" - }, - "original": { - "owner": "mindsbackyard", - "repo": "pihole-flake", - "type": "github" - } - }, - "plasma-manager": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1705257805, - "narHash": "sha256-hx88TjxRWR9hEYrePm2aR/rKAu4VFx4irgN7AofE0Wg=", - "owner": "pjones", - "repo": "plasma-manager", - "rev": "87ca0e29c6fccfb7f09be6ff137716db5a7c8d8f", - "type": "github" - }, - "original": { - "owner": "pjones", - "repo": "plasma-manager", - "type": "github" - } - }, "root": { "inputs": { "extest": "extest", - "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", - "linger": "linger", "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable", - "pihole": "pihole", - "plasma-manager": "plasma-manager", + "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" } @@ -382,16 +291,16 @@ "utils": "utils" }, "locked": { - "lastModified": 1705361146, - "narHash": "sha256-oN6fJdswGueekl3VYLyP8GyZR76In8Au338JdNYX88Q=", - "owner": "dotlambda", + "lastModified": 1703666786, + "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c0c812117d67e346a94c3b546d04ab4820ed38d3", + "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", "type": "gitlab" }, "original": { - "owner": "dotlambda", - "ref": "sieve-fix", + "owner": "simple-nixos-mailserver", + "ref": "master", "repo": "nixos-mailserver", "type": "gitlab" } @@ -399,14 +308,14 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1705356877, - "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=", + "lastModified": 1704908274, + "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "87755331580fdf23df7e39b46d63ac88236bf42c", + "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", "type": "github" }, "original": { @@ -415,21 +324,6 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/flake.nix b/flake.nix index 23dc586..3b565c4 100644 --- a/flake.nix +++ b/flake.nix @@ -5,14 +5,14 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; - simple-nixos-mailserver.url = "gitlab:dotlambda/nixos-mailserver/sieve-fix"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; flake-utils.url = "github:numtide/flake-utils"; plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.inputs.home-manager.follows = "home-manager"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; @@ -41,7 +41,6 @@ outputs = { self, nixpkgs, - nixpkgs-stable, home-manager, sops-nix, simple-nixos-mailserver, @@ -107,7 +106,7 @@ nixosConfigurations = { queen = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs outputs nixpkgs-stable;}; + specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < ./nixos/hosts/queen/configuration.nix From 21c4ae5809d5a155b4cfee8c68d4cb1b78569c86 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 15:43:14 +0100 Subject: [PATCH 1120/2308] Downgrade flake and lock until mailserver updates --- flake.lock | 202 +++++++++++++---------------------------------------- flake.nix | 7 +- 2 files changed, 51 insertions(+), 158 deletions(-) diff --git a/flake.lock b/flake.lock index b38dab6..9770d24 100644 --- a/flake.lock +++ b/flake.lock @@ -67,24 +67,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -92,11 +74,11 @@ ] }, "locked": { - "lastModified": 1705660020, - "narHash": "sha256-1tOuNh+UbiZlaC8RrpQzzypgnLBC67eRlBunfkE4sbQ=", + "lastModified": 1704980804, + "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", "owner": "nix-community", "repo": "home-manager", - "rev": "2064348e555b6aa963da6372a8f14e6acb80a176", + "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", "type": "github" }, "original": { @@ -112,11 +94,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705667791, - "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", + "lastModified": 1704665257, + "narHash": "sha256-Cycz00I26e8QZ9sZtCz0uIz6Cad5ld3zM7N2I+5beqI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", + "rev": "8951673c6c216ddd6bac3db3e88e3f2281b3511a", "type": "github" }, "original": { @@ -125,26 +107,6 @@ "type": "github" } }, - "linger": { - "inputs": { - "flake-utils": [ - "flake-utils" - ] - }, - "locked": { - "lastModified": 1670283645, - "narHash": "sha256-SuC/SuQ8RUaM6RthNAkNTSnlpRXJxEmuym2OyPLLpWk=", - "owner": "mindsbackyard", - "repo": "linger-flake", - "rev": "9f8632c0621dc562dd42e9eacfdb6dae82aebf8b", - "type": "github" - }, - "original": { - "owner": "mindsbackyard", - "repo": "linger-flake", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -169,11 +131,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705635624, - "narHash": "sha256-DU0schxQOtBNO1c9hUsgYl+QMOXQMfRT7Qw/mg+ayno=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4471857c0a4a8a0ffc7bdbeaf1b998746ce12a82", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -215,27 +177,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1705458851, - "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -245,13 +191,29 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -263,11 +225,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { @@ -294,11 +256,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1704161960, + "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "63143ac2c9186be6d9da6035fa22620018c85932", "type": "github" }, "original": { @@ -308,66 +270,13 @@ "type": "github" } }, - "pihole": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "linger": [ - "linger" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1670284048, - "narHash": "sha256-lNyJ7vrDAdsPVcNBXqDUXseBBL9Kf2q64/A8ntEKXWI=", - "owner": "mindsbackyard", - "repo": "pihole-flake", - "rev": "9daaf65415ad6d3f5a8daa617d8737bc405f9dd8", - "type": "github" - }, - "original": { - "owner": "mindsbackyard", - "repo": "pihole-flake", - "type": "github" - } - }, - "plasma-manager": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1705257805, - "narHash": "sha256-hx88TjxRWR9hEYrePm2aR/rKAu4VFx4irgN7AofE0Wg=", - "owner": "pjones", - "repo": "plasma-manager", - "rev": "87ca0e29c6fccfb7f09be6ff137716db5a7c8d8f", - "type": "github" - }, - "original": { - "owner": "pjones", - "repo": "plasma-manager", - "type": "github" - } - }, "root": { "inputs": { "extest": "extest", - "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", - "linger": "linger", "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable", - "pihole": "pihole", - "plasma-manager": "plasma-manager", + "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" } @@ -382,16 +291,16 @@ "utils": "utils" }, "locked": { - "lastModified": 1705361146, - "narHash": "sha256-oN6fJdswGueekl3VYLyP8GyZR76In8Au338JdNYX88Q=", - "owner": "dotlambda", + "lastModified": 1703666786, + "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c0c812117d67e346a94c3b546d04ab4820ed38d3", + "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", "type": "gitlab" }, "original": { - "owner": "dotlambda", - "ref": "sieve-fix", + "owner": "simple-nixos-mailserver", + "ref": "master", "repo": "nixos-mailserver", "type": "gitlab" } @@ -399,14 +308,14 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1705356877, - "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=", + "lastModified": 1704908274, + "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "87755331580fdf23df7e39b46d63ac88236bf42c", + "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", "type": "github" }, "original": { @@ -415,21 +324,6 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/flake.nix b/flake.nix index 23dc586..3b565c4 100644 --- a/flake.nix +++ b/flake.nix @@ -5,14 +5,14 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; - simple-nixos-mailserver.url = "gitlab:dotlambda/nixos-mailserver/sieve-fix"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; flake-utils.url = "github:numtide/flake-utils"; plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.inputs.home-manager.follows = "home-manager"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; @@ -41,7 +41,6 @@ outputs = { self, nixpkgs, - nixpkgs-stable, home-manager, sops-nix, simple-nixos-mailserver, @@ -107,7 +106,7 @@ nixosConfigurations = { queen = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs outputs nixpkgs-stable;}; + specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < ./nixos/hosts/queen/configuration.nix From 56e27ec5f889b2d90792203f646c64311e8fafd7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 22:58:18 +0100 Subject: [PATCH 1121/2308] Add conduit --- nixos/hosts/queen/configuration.nix | 2 + .../package-configs/conduit/configuration.nix | 143 ++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 nixos/server/package-configs/conduit/configuration.nix diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index d178c9b..c328563 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -32,6 +32,7 @@ ../../server/package-configs/jellyfin/configuration.nix ../../server/package-configs/ombi/configuration.nix ../../server/package-configs/aria2/configuration.nix + ../../server/package-configs/conduit/configuration.nix ]; boot.tmp.cleanOnBoot = true; @@ -89,6 +90,7 @@ akkoma age fzf + matrix-conduit docker docker-compose git diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix new file mode 100644 index 0000000..60b25fc --- /dev/null +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -0,0 +1,143 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: let + # You'll need to edit these values + # The hostname that will appear in your user and room IDs + server_name = "matrix.gladtherescake.eu"; + + # The hostname that Conduit actually runs on + # + # This can be the same as `server_name` if you want. This is only necessary + # when Conduit is running on a different machine than the one hosting your + # root domain. This configuration also assumes this is all running on a single + # machine, some tweaks will need to be made if this is not the case. + matrix_hostname = "${server_name}"; + + # Build a dervation that stores the content of `${server_name}/.well-known/matrix/server` + well_known_server = pkgs.writeText "well-known-matrix-server" '' + { + "m.server": "${matrix_hostname}" + } + ''; + + # Build a dervation that stores the content of `${server_name}/.well-known/matrix/client` + well_known_client = pkgs.writeText "well-known-matrix-client" '' + { + "m.homeserver": { + "base_url": "https://${matrix_hostname}" + } + } + ''; +in { + # Configure Conduit itself + services.matrix-conduit = { + enable = true; + + # This causes NixOS to use the flake defined in this repository instead of + # the build of Conduit built into nixpkgs. + package = flake-inputs.conduit.packages.${pkgs.system}.default; + + settings.global = { + inherit server_name; + }; + }; + + # ACME data must be readable by the NGINX user + users.users.nginx.extraGroups = [ + "acme" + ]; + + # Configure NGINX as a reverse proxy + services.nginx = { + enable = true; + recommendedProxySettings = true; + + virtualHosts = { + "${matrix_hostname}" = { + forceSSL = true; + enableACME = true; + + listen = [ + { + addr = "0.0.0.0"; + port = 443; + ssl = true; + } + { + addr = "[::]"; + port = 443; + ssl = true; + } + { + addr = "0.0.0.0"; + port = 8448; + ssl = true; + } + { + addr = "[::]"; + port = 8448; + ssl = true; + } + ]; + + locations."/_matrix/" = { + proxyPass = "http://backend_conduit$request_uri"; + proxyWebsockets = true; + extraConfig = '' + proxy_set_header Host $host; + proxy_buffering off; + ''; + }; + + extraConfig = '' + merge_slashes off; + ''; + }; + + "${server_name}" = { + forceSSL = true; + enableACME = true; + + locations."=/.well-known/matrix/server" = { + # Use the contents of the derivation built previously + alias = "${well_known_server}"; + + extraConfig = '' + # Set the header since by default NGINX thinks it's just bytes + default_type application/json; + ''; + }; + + locations."=/.well-known/matrix/client" = { + # Use the contents of the derivation built previously + alias = "${well_known_client}"; + + extraConfig = '' + # Set the header since by default NGINX thinks it's just bytes + default_type application/json; + + # https://matrix.org/docs/spec/client_server/r0.4.0#web-browser-clients + add_header Access-Control-Allow-Origin "*"; + ''; + }; + }; + }; + + upstreams = { + "backend_conduit" = { + servers = { + "[::1]:${toString config.services.matrix-conduit.settings.global.port}" = {}; + }; + }; + }; + }; + + # Open firewall ports for HTTP, HTTPS, and Matrix federation + networking.firewall.allowedTCPPorts = [80 443 8448]; + networking.firewall.allowedUDPPorts = [80 443 8448]; +} From de21486c39afb61b355baa3f2e4787ee7fe11c09 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 22:58:18 +0100 Subject: [PATCH 1122/2308] Add conduit --- nixos/hosts/queen/configuration.nix | 2 + .../package-configs/conduit/configuration.nix | 143 ++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 nixos/server/package-configs/conduit/configuration.nix diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index d178c9b..c328563 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -32,6 +32,7 @@ ../../server/package-configs/jellyfin/configuration.nix ../../server/package-configs/ombi/configuration.nix ../../server/package-configs/aria2/configuration.nix + ../../server/package-configs/conduit/configuration.nix ]; boot.tmp.cleanOnBoot = true; @@ -89,6 +90,7 @@ akkoma age fzf + matrix-conduit docker docker-compose git diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix new file mode 100644 index 0000000..60b25fc --- /dev/null +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -0,0 +1,143 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: let + # You'll need to edit these values + # The hostname that will appear in your user and room IDs + server_name = "matrix.gladtherescake.eu"; + + # The hostname that Conduit actually runs on + # + # This can be the same as `server_name` if you want. This is only necessary + # when Conduit is running on a different machine than the one hosting your + # root domain. This configuration also assumes this is all running on a single + # machine, some tweaks will need to be made if this is not the case. + matrix_hostname = "${server_name}"; + + # Build a dervation that stores the content of `${server_name}/.well-known/matrix/server` + well_known_server = pkgs.writeText "well-known-matrix-server" '' + { + "m.server": "${matrix_hostname}" + } + ''; + + # Build a dervation that stores the content of `${server_name}/.well-known/matrix/client` + well_known_client = pkgs.writeText "well-known-matrix-client" '' + { + "m.homeserver": { + "base_url": "https://${matrix_hostname}" + } + } + ''; +in { + # Configure Conduit itself + services.matrix-conduit = { + enable = true; + + # This causes NixOS to use the flake defined in this repository instead of + # the build of Conduit built into nixpkgs. + package = flake-inputs.conduit.packages.${pkgs.system}.default; + + settings.global = { + inherit server_name; + }; + }; + + # ACME data must be readable by the NGINX user + users.users.nginx.extraGroups = [ + "acme" + ]; + + # Configure NGINX as a reverse proxy + services.nginx = { + enable = true; + recommendedProxySettings = true; + + virtualHosts = { + "${matrix_hostname}" = { + forceSSL = true; + enableACME = true; + + listen = [ + { + addr = "0.0.0.0"; + port = 443; + ssl = true; + } + { + addr = "[::]"; + port = 443; + ssl = true; + } + { + addr = "0.0.0.0"; + port = 8448; + ssl = true; + } + { + addr = "[::]"; + port = 8448; + ssl = true; + } + ]; + + locations."/_matrix/" = { + proxyPass = "http://backend_conduit$request_uri"; + proxyWebsockets = true; + extraConfig = '' + proxy_set_header Host $host; + proxy_buffering off; + ''; + }; + + extraConfig = '' + merge_slashes off; + ''; + }; + + "${server_name}" = { + forceSSL = true; + enableACME = true; + + locations."=/.well-known/matrix/server" = { + # Use the contents of the derivation built previously + alias = "${well_known_server}"; + + extraConfig = '' + # Set the header since by default NGINX thinks it's just bytes + default_type application/json; + ''; + }; + + locations."=/.well-known/matrix/client" = { + # Use the contents of the derivation built previously + alias = "${well_known_client}"; + + extraConfig = '' + # Set the header since by default NGINX thinks it's just bytes + default_type application/json; + + # https://matrix.org/docs/spec/client_server/r0.4.0#web-browser-clients + add_header Access-Control-Allow-Origin "*"; + ''; + }; + }; + }; + + upstreams = { + "backend_conduit" = { + servers = { + "[::1]:${toString config.services.matrix-conduit.settings.global.port}" = {}; + }; + }; + }; + }; + + # Open firewall ports for HTTP, HTTPS, and Matrix federation + networking.firewall.allowedTCPPorts = [80 443 8448]; + networking.firewall.allowedUDPPorts = [80 443 8448]; +} From e1a2b772b22ab64a464088b98e80fa00eb753de3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:02:09 +0100 Subject: [PATCH 1123/2308] Don't use the flake! --- nixos/server/package-configs/conduit/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 60b25fc..2909f71 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -40,7 +40,7 @@ in { # This causes NixOS to use the flake defined in this repository instead of # the build of Conduit built into nixpkgs. - package = flake-inputs.conduit.packages.${pkgs.system}.default; + package = pkgs.conduit; settings.global = { inherit server_name; From dd0dcedee05be016eea3bc47dc935da90ddf66d5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:02:09 +0100 Subject: [PATCH 1124/2308] Don't use the flake! --- nixos/server/package-configs/conduit/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 60b25fc..2909f71 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -40,7 +40,7 @@ in { # This causes NixOS to use the flake defined in this repository instead of # the build of Conduit built into nixpkgs. - package = flake-inputs.conduit.packages.${pkgs.system}.default; + package = pkgs.conduit; settings.global = { inherit server_name; From 8627274c7b31ee8e769189786640de6724222353 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:04:36 +0100 Subject: [PATCH 1125/2308] Let's try this then --- nixos/server/package-configs/conduit/configuration.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 2909f71..2df9dcd 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -97,11 +97,6 @@ in { extraConfig = '' merge_slashes off; ''; - }; - - "${server_name}" = { - forceSSL = true; - enableACME = true; locations."=/.well-known/matrix/server" = { # Use the contents of the derivation built previously From b2823ee73bd6ecb8d99020cd55cbc30484129fe9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:04:36 +0100 Subject: [PATCH 1126/2308] Let's try this then --- nixos/server/package-configs/conduit/configuration.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 2909f71..2df9dcd 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -97,11 +97,6 @@ in { extraConfig = '' merge_slashes off; ''; - }; - - "${server_name}" = { - forceSSL = true; - enableACME = true; locations."=/.well-known/matrix/server" = { # Use the contents of the derivation built previously From 98f15912a864772d450d00bb2d7d44bab80ddbe6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:08:09 +0100 Subject: [PATCH 1127/2308] Wrong package name and add the right inputs to flake lock --- flake.lock | 106 ++++++++++++++++++ .../package-configs/conduit/configuration.nix | 2 +- 2 files changed, 107 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 9770d24..31906c6 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -107,6 +125,26 @@ "type": "github" } }, + "linger": { + "inputs": { + "flake-utils": [ + "flake-utils" + ] + }, + "locked": { + "lastModified": 1670283645, + "narHash": "sha256-SuC/SuQ8RUaM6RthNAkNTSnlpRXJxEmuym2OyPLLpWk=", + "owner": "mindsbackyard", + "repo": "linger-flake", + "rev": "9f8632c0621dc562dd42e9eacfdb6dae82aebf8b", + "type": "github" + }, + "original": { + "owner": "mindsbackyard", + "repo": "linger-flake", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -270,13 +308,66 @@ "type": "github" } }, + "pihole": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "linger": [ + "linger" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1670284048, + "narHash": "sha256-lNyJ7vrDAdsPVcNBXqDUXseBBL9Kf2q64/A8ntEKXWI=", + "owner": "mindsbackyard", + "repo": "pihole-flake", + "rev": "9daaf65415ad6d3f5a8daa617d8737bc405f9dd8", + "type": "github" + }, + "original": { + "owner": "mindsbackyard", + "repo": "pihole-flake", + "type": "github" + } + }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705257805, + "narHash": "sha256-hx88TjxRWR9hEYrePm2aR/rKAu4VFx4irgN7AofE0Wg=", + "owner": "pjones", + "repo": "plasma-manager", + "rev": "87ca0e29c6fccfb7f09be6ff137716db5a7c8d8f", + "type": "github" + }, + "original": { + "owner": "pjones", + "repo": "plasma-manager", + "type": "github" + } + }, "root": { "inputs": { "extest": "extest", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", + "linger": "linger", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "pihole": "pihole", + "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" } @@ -324,6 +415,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 2df9dcd..1a0e2d5 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -40,7 +40,7 @@ in { # This causes NixOS to use the flake defined in this repository instead of # the build of Conduit built into nixpkgs. - package = pkgs.conduit; + package = pkgs.matrix-conduit; settings.global = { inherit server_name; From 52ce43e9a5fcf31d254d277e1e2ff16e497acb3c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:08:09 +0100 Subject: [PATCH 1128/2308] Wrong package name and add the right inputs to flake lock --- flake.lock | 106 ++++++++++++++++++ .../package-configs/conduit/configuration.nix | 2 +- 2 files changed, 107 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 9770d24..31906c6 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -107,6 +125,26 @@ "type": "github" } }, + "linger": { + "inputs": { + "flake-utils": [ + "flake-utils" + ] + }, + "locked": { + "lastModified": 1670283645, + "narHash": "sha256-SuC/SuQ8RUaM6RthNAkNTSnlpRXJxEmuym2OyPLLpWk=", + "owner": "mindsbackyard", + "repo": "linger-flake", + "rev": "9f8632c0621dc562dd42e9eacfdb6dae82aebf8b", + "type": "github" + }, + "original": { + "owner": "mindsbackyard", + "repo": "linger-flake", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -270,13 +308,66 @@ "type": "github" } }, + "pihole": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "linger": [ + "linger" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1670284048, + "narHash": "sha256-lNyJ7vrDAdsPVcNBXqDUXseBBL9Kf2q64/A8ntEKXWI=", + "owner": "mindsbackyard", + "repo": "pihole-flake", + "rev": "9daaf65415ad6d3f5a8daa617d8737bc405f9dd8", + "type": "github" + }, + "original": { + "owner": "mindsbackyard", + "repo": "pihole-flake", + "type": "github" + } + }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705257805, + "narHash": "sha256-hx88TjxRWR9hEYrePm2aR/rKAu4VFx4irgN7AofE0Wg=", + "owner": "pjones", + "repo": "plasma-manager", + "rev": "87ca0e29c6fccfb7f09be6ff137716db5a7c8d8f", + "type": "github" + }, + "original": { + "owner": "pjones", + "repo": "plasma-manager", + "type": "github" + } + }, "root": { "inputs": { "extest": "extest", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", + "linger": "linger", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "pihole": "pihole", + "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" } @@ -324,6 +415,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 2df9dcd..1a0e2d5 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -40,7 +40,7 @@ in { # This causes NixOS to use the flake defined in this repository instead of # the build of Conduit built into nixpkgs. - package = pkgs.conduit; + package = pkgs.matrix-conduit; settings.global = { inherit server_name; From bf6dd3d7eb3f2bb7e9f5d375151225db1b7dfeba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:38:51 +0100 Subject: [PATCH 1129/2308] Remove ipv6 shit --- .../server/package-configs/conduit/configuration.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 1a0e2d5..0284c20 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -68,21 +68,11 @@ in { port = 443; ssl = true; } - { - addr = "[::]"; - port = 443; - ssl = true; - } { addr = "0.0.0.0"; port = 8448; ssl = true; } - { - addr = "[::]"; - port = 8448; - ssl = true; - } ]; locations."/_matrix/" = { @@ -126,7 +116,7 @@ in { upstreams = { "backend_conduit" = { servers = { - "[::1]:${toString config.services.matrix-conduit.settings.global.port}" = {}; + "[0.0.0.0]:${toString config.services.matrix-conduit.settings.global.port}" = {}; }; }; }; From 080b75d7e020d9dd286b16b7e63821bbf753dcaa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:38:51 +0100 Subject: [PATCH 1130/2308] Remove ipv6 shit --- .../server/package-configs/conduit/configuration.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 1a0e2d5..0284c20 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -68,21 +68,11 @@ in { port = 443; ssl = true; } - { - addr = "[::]"; - port = 443; - ssl = true; - } { addr = "0.0.0.0"; port = 8448; ssl = true; } - { - addr = "[::]"; - port = 8448; - ssl = true; - } ]; locations."/_matrix/" = { @@ -126,7 +116,7 @@ in { upstreams = { "backend_conduit" = { servers = { - "[::1]:${toString config.services.matrix-conduit.settings.global.port}" = {}; + "[0.0.0.0]:${toString config.services.matrix-conduit.settings.global.port}" = {}; }; }; }; From 8ea883be8534a676217aeccbe1d1a81f28fb1aed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:41:16 +0100 Subject: [PATCH 1131/2308] Change localhost to the IP of the host --- nixos/server/package-configs/conduit/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 0284c20..71d8546 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -116,7 +116,7 @@ in { upstreams = { "backend_conduit" = { servers = { - "[0.0.0.0]:${toString config.services.matrix-conduit.settings.global.port}" = {}; + "[62.171.160.195]:${toString config.services.matrix-conduit.settings.global.port}" = {}; }; }; }; From e624dcd0f15d116da9e058220826ce5a081dd500 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:41:16 +0100 Subject: [PATCH 1132/2308] Change localhost to the IP of the host --- nixos/server/package-configs/conduit/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 0284c20..71d8546 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -116,7 +116,7 @@ in { upstreams = { "backend_conduit" = { servers = { - "[0.0.0.0]:${toString config.services.matrix-conduit.settings.global.port}" = {}; + "[62.171.160.195]:${toString config.services.matrix-conduit.settings.global.port}" = {}; }; }; }; From cc25326fa5dcabc7622ee3038721636bd8666943 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:43:05 +0100 Subject: [PATCH 1133/2308] Let's just remove this "upstreams" block whatever --- nixos/server/package-configs/conduit/configuration.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 71d8546..624669e 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -112,14 +112,6 @@ in { }; }; }; - - upstreams = { - "backend_conduit" = { - servers = { - "[62.171.160.195]:${toString config.services.matrix-conduit.settings.global.port}" = {}; - }; - }; - }; }; # Open firewall ports for HTTP, HTTPS, and Matrix federation From 6ef5940cc60e8effb8a31c734bd48b048271b025 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:43:05 +0100 Subject: [PATCH 1134/2308] Let's just remove this "upstreams" block whatever --- nixos/server/package-configs/conduit/configuration.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 71d8546..624669e 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -112,14 +112,6 @@ in { }; }; }; - - upstreams = { - "backend_conduit" = { - servers = { - "[62.171.160.195]:${toString config.services.matrix-conduit.settings.global.port}" = {}; - }; - }; - }; }; # Open firewall ports for HTTP, HTTPS, and Matrix federation From b70b946a37c7353bf384beca873a3d7dd8b188b6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Jan 2024 14:15:30 +0100 Subject: [PATCH 1135/2308] Try simplifying it? --- .../package-configs/conduit/configuration.nix | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 624669e..ebf6096 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -74,42 +74,6 @@ in { ssl = true; } ]; - - locations."/_matrix/" = { - proxyPass = "http://backend_conduit$request_uri"; - proxyWebsockets = true; - extraConfig = '' - proxy_set_header Host $host; - proxy_buffering off; - ''; - }; - - extraConfig = '' - merge_slashes off; - ''; - - locations."=/.well-known/matrix/server" = { - # Use the contents of the derivation built previously - alias = "${well_known_server}"; - - extraConfig = '' - # Set the header since by default NGINX thinks it's just bytes - default_type application/json; - ''; - }; - - locations."=/.well-known/matrix/client" = { - # Use the contents of the derivation built previously - alias = "${well_known_client}"; - - extraConfig = '' - # Set the header since by default NGINX thinks it's just bytes - default_type application/json; - - # https://matrix.org/docs/spec/client_server/r0.4.0#web-browser-clients - add_header Access-Control-Allow-Origin "*"; - ''; - }; }; }; }; From da5c38d0ad896dda3a6bd033d3a982e95482e59e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Jan 2024 14:15:30 +0100 Subject: [PATCH 1136/2308] Try simplifying it? --- .../package-configs/conduit/configuration.nix | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 624669e..ebf6096 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -74,42 +74,6 @@ in { ssl = true; } ]; - - locations."/_matrix/" = { - proxyPass = "http://backend_conduit$request_uri"; - proxyWebsockets = true; - extraConfig = '' - proxy_set_header Host $host; - proxy_buffering off; - ''; - }; - - extraConfig = '' - merge_slashes off; - ''; - - locations."=/.well-known/matrix/server" = { - # Use the contents of the derivation built previously - alias = "${well_known_server}"; - - extraConfig = '' - # Set the header since by default NGINX thinks it's just bytes - default_type application/json; - ''; - }; - - locations."=/.well-known/matrix/client" = { - # Use the contents of the derivation built previously - alias = "${well_known_client}"; - - extraConfig = '' - # Set the header since by default NGINX thinks it's just bytes - default_type application/json; - - # https://matrix.org/docs/spec/client_server/r0.4.0#web-browser-clients - add_header Access-Control-Allow-Origin "*"; - ''; - }; }; }; }; From d15abd39b8f737669d435ba5286238f6a3cee3fe Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Jan 2024 14:20:16 +0100 Subject: [PATCH 1137/2308] Remove the acme things too --- .../package-configs/conduit/configuration.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index ebf6096..309b941 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -17,22 +17,6 @@ # root domain. This configuration also assumes this is all running on a single # machine, some tweaks will need to be made if this is not the case. matrix_hostname = "${server_name}"; - - # Build a dervation that stores the content of `${server_name}/.well-known/matrix/server` - well_known_server = pkgs.writeText "well-known-matrix-server" '' - { - "m.server": "${matrix_hostname}" - } - ''; - - # Build a dervation that stores the content of `${server_name}/.well-known/matrix/client` - well_known_client = pkgs.writeText "well-known-matrix-client" '' - { - "m.homeserver": { - "base_url": "https://${matrix_hostname}" - } - } - ''; in { # Configure Conduit itself services.matrix-conduit = { From c644b8a006dd28f17082d84fa23167de3143fcab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Jan 2024 14:20:16 +0100 Subject: [PATCH 1138/2308] Remove the acme things too --- .../package-configs/conduit/configuration.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index ebf6096..309b941 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -17,22 +17,6 @@ # root domain. This configuration also assumes this is all running on a single # machine, some tweaks will need to be made if this is not the case. matrix_hostname = "${server_name}"; - - # Build a dervation that stores the content of `${server_name}/.well-known/matrix/server` - well_known_server = pkgs.writeText "well-known-matrix-server" '' - { - "m.server": "${matrix_hostname}" - } - ''; - - # Build a dervation that stores the content of `${server_name}/.well-known/matrix/client` - well_known_client = pkgs.writeText "well-known-matrix-client" '' - { - "m.homeserver": { - "base_url": "https://${matrix_hostname}" - } - } - ''; in { # Configure Conduit itself services.matrix-conduit = { From 3f142fdbd70f581e2bd9371099dc8e73d9c17c35 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Jan 2024 14:25:16 +0100 Subject: [PATCH 1139/2308] Disable conduit for now --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index c328563..938bb96 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -32,7 +32,7 @@ ../../server/package-configs/jellyfin/configuration.nix ../../server/package-configs/ombi/configuration.nix ../../server/package-configs/aria2/configuration.nix - ../../server/package-configs/conduit/configuration.nix + #../../server/package-configs/conduit/configuration.nix ]; boot.tmp.cleanOnBoot = true; From eed5ef018014e7a9f82994b83cf4ea72d2180db1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Jan 2024 14:25:16 +0100 Subject: [PATCH 1140/2308] Disable conduit for now --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index c328563..938bb96 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -32,7 +32,7 @@ ../../server/package-configs/jellyfin/configuration.nix ../../server/package-configs/ombi/configuration.nix ../../server/package-configs/aria2/configuration.nix - ../../server/package-configs/conduit/configuration.nix + #../../server/package-configs/conduit/configuration.nix ]; boot.tmp.cleanOnBoot = true; From 6cb90643aff0c66e9db7481a1e7b1a1c332cb44a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Jan 2024 17:08:52 +0100 Subject: [PATCH 1141/2308] Let's try this, it won't work probably but to build on and get the cert --- .../package-configs/conduit/configuration.nix | 52 ++++--------------- 1 file changed, 9 insertions(+), 43 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 309b941..d9f44a9 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -5,59 +5,25 @@ config, pkgs, ... -}: let - # You'll need to edit these values - # The hostname that will appear in your user and room IDs - server_name = "matrix.gladtherescake.eu"; - - # The hostname that Conduit actually runs on - # - # This can be the same as `server_name` if you want. This is only necessary - # when Conduit is running on a different machine than the one hosting your - # root domain. This configuration also assumes this is all running on a single - # machine, some tweaks will need to be made if this is not the case. - matrix_hostname = "${server_name}"; -in { - # Configure Conduit itself +}: { services.matrix-conduit = { enable = true; - - # This causes NixOS to use the flake defined in this repository instead of - # the build of Conduit built into nixpkgs. - package = pkgs.matrix-conduit; - settings.global = { - inherit server_name; + allow_registration = true; + server_name = "matrix.gladtherescake.eu"; + port = 6167; }; }; - # ACME data must be readable by the NGINX user - users.users.nginx.extraGroups = [ - "acme" - ]; - - # Configure NGINX as a reverse proxy services.nginx = { - enable = true; - recommendedProxySettings = true; - virtualHosts = { - "${matrix_hostname}" = { + "matrix.gladtherescake.eu" = { forceSSL = true; enableACME = true; - - listen = [ - { - addr = "0.0.0.0"; - port = 443; - ssl = true; - } - { - addr = "0.0.0.0"; - port = 8448; - ssl = true; - } - ]; + locations."/" = { + proxyPass = "http://localhost:6167"; + proxyWebsockets = true; + }; }; }; }; From 66603bc3f8ce8076ff68beb2f93f1359c3fbbd06 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Jan 2024 17:08:52 +0100 Subject: [PATCH 1142/2308] Let's try this, it won't work probably but to build on and get the cert --- .../package-configs/conduit/configuration.nix | 52 ++++--------------- 1 file changed, 9 insertions(+), 43 deletions(-) diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 309b941..d9f44a9 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -5,59 +5,25 @@ config, pkgs, ... -}: let - # You'll need to edit these values - # The hostname that will appear in your user and room IDs - server_name = "matrix.gladtherescake.eu"; - - # The hostname that Conduit actually runs on - # - # This can be the same as `server_name` if you want. This is only necessary - # when Conduit is running on a different machine than the one hosting your - # root domain. This configuration also assumes this is all running on a single - # machine, some tweaks will need to be made if this is not the case. - matrix_hostname = "${server_name}"; -in { - # Configure Conduit itself +}: { services.matrix-conduit = { enable = true; - - # This causes NixOS to use the flake defined in this repository instead of - # the build of Conduit built into nixpkgs. - package = pkgs.matrix-conduit; - settings.global = { - inherit server_name; + allow_registration = true; + server_name = "matrix.gladtherescake.eu"; + port = 6167; }; }; - # ACME data must be readable by the NGINX user - users.users.nginx.extraGroups = [ - "acme" - ]; - - # Configure NGINX as a reverse proxy services.nginx = { - enable = true; - recommendedProxySettings = true; - virtualHosts = { - "${matrix_hostname}" = { + "matrix.gladtherescake.eu" = { forceSSL = true; enableACME = true; - - listen = [ - { - addr = "0.0.0.0"; - port = 443; - ssl = true; - } - { - addr = "0.0.0.0"; - port = 8448; - ssl = true; - } - ]; + locations."/" = { + proxyPass = "http://localhost:6167"; + proxyWebsockets = true; + }; }; }; }; From c99362747f6ae52d635f0768285792e009d256f6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Jan 2024 17:09:55 +0100 Subject: [PATCH 1143/2308] Enable conduit again for testing --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 938bb96..c328563 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -32,7 +32,7 @@ ../../server/package-configs/jellyfin/configuration.nix ../../server/package-configs/ombi/configuration.nix ../../server/package-configs/aria2/configuration.nix - #../../server/package-configs/conduit/configuration.nix + ../../server/package-configs/conduit/configuration.nix ]; boot.tmp.cleanOnBoot = true; From d5cbc0920f2b6ea2b393a095b4dcb84f631f8a3a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Jan 2024 17:09:55 +0100 Subject: [PATCH 1144/2308] Enable conduit again for testing --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 938bb96..c328563 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -32,7 +32,7 @@ ../../server/package-configs/jellyfin/configuration.nix ../../server/package-configs/ombi/configuration.nix ../../server/package-configs/aria2/configuration.nix - #../../server/package-configs/conduit/configuration.nix + ../../server/package-configs/conduit/configuration.nix ]; boot.tmp.cleanOnBoot = true; From 7776b29d40d28ab2cc92387b52b76205da0936d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 10:51:02 +0100 Subject: [PATCH 1145/2308] Add gitignore for vscode and direnv --- home-manager/desktop/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 4d896bc..c390731 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -128,6 +128,10 @@ defaultBranch = "main"; }; }; + ignores = [ + ".direnv" + ".vscode" + ]; }; # Nicely reload system units when changing configs From 5a0ccdc29f5021096c65cd4b58176138d49f9508 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 10:51:02 +0100 Subject: [PATCH 1146/2308] Add gitignore for vscode and direnv --- home-manager/desktop/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 4d896bc..c390731 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -128,6 +128,10 @@ defaultBranch = "main"; }; }; + ignores = [ + ".direnv" + ".vscode" + ]; }; # Nicely reload system units when changing configs From 41c68ed66216ffbf498360021b38f27affa63743 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 10:52:23 +0100 Subject: [PATCH 1147/2308] Comment this out, the output doesn't exist --- nixos/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 090719f..3c5d1d8 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -17,7 +17,7 @@ # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions outputs.overlays.modifications - outputs.overlays.unstable-packages + #outputs.overlays.unstable-packages # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default From f265222ba35ed30b1b463f7104352df129422c36 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 10:52:23 +0100 Subject: [PATCH 1148/2308] Comment this out, the output doesn't exist --- nixos/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 090719f..3c5d1d8 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -17,7 +17,7 @@ # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions outputs.overlays.modifications - outputs.overlays.unstable-packages + #outputs.overlays.unstable-packages # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default From f2527c80f208d8aadd5d4a0f180d2a0ba39f12c9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 10:56:09 +0100 Subject: [PATCH 1149/2308] Maybe ignore them everywhere --- home-manager/desktop/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index c390731..a1862a0 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -129,8 +129,8 @@ }; }; ignores = [ - ".direnv" - ".vscode" + "*.direnv" + "*.vscode" ]; }; From 34ec59cba7cee34ea3b5812dc38ab4775d59fdda Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 10:56:09 +0100 Subject: [PATCH 1150/2308] Maybe ignore them everywhere --- home-manager/desktop/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index c390731..a1862a0 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -129,8 +129,8 @@ }; }; ignores = [ - ".direnv" - ".vscode" + "*.direnv" + "*.vscode" ]; }; From 598f387d86dda15f0e49ce905cd34f433c45ae60 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 11:40:34 +0100 Subject: [PATCH 1151/2308] Update the readme to be more explanatory --- README.md | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 99e42c4..57c70b9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,42 @@ # NixOS-Config -My NixOS configuration for my different hosts. \ No newline at end of file +The configuration of different NixOS hosts using flakes and home-manager. It is assumed you have already installed NixOS and git to your system (note: git is not installed by default with the NixOS image, you can grab it with ``nix-shell -p git``), this configuration does not have image artifacts nor can it create them. + +## Building and deploying the configuration + +The first step is to add your age keyfile to the /nix/var/secrets folder with the name "keys.txt" (if you don't have one, remove the imports from the configuration files; the import can be found under +``hosts//configuration.nix``). + +Then run this command within your cloned github repo (I put mine in /etc/nixos): + +``sudo nixos-rebuild --flake .# switch`` + +This should rebuild the OS with all programs and settings defined as in the configuration. + +## Updating the flake lock + +In order to have updated packages you will have to update the flake.lock file, this can be done by running the following command in the repository: + +``nix flake update`` + +Please note that you should commit and push after you do this. It is therefore advisable to do this not in your deployment directory, but your local dev environment. Not commiting the files will dirty your git history, which can have unintended consequences as nix flakes work via git. + +## Testing the evaluation + +To test if your build succeeds the basic checks and can start building the artifacts, you can run the following command: + +``nix flake check`` + +Note: this does not build the full configuration, and errors might still happen in deployment, especially for dependencies that rely on external services like webservers to be called. For obvious reasons the test building does not actually pull in all the artifacts, and does not make external calls aside from to the package files (You will need a built nix store, or a connection to the git repository that hosts your packages, like an internet connection to github, to make the test run) + +## Technical details + +### Home manager +Home manager is imported as a module within the global configuration, it is therefor not needed to build home-manager packages separately in this configuration. On multi user systems it might be useful to pull the home-manager configurations from separate repos for different users, so you don't have to give your users access to the global configuration. + +### Sops +The secrets are managed in sops files within the hosts folders, there is only one sops file per host, but this can be changed quite easily. The command to edit the sops file is as follows: + +``nix-shell -p sops --run "sops ./nixos/hosts//secrets/sops.yaml"`` + +This requires your system to have the keyfile available for sops to use, by default sops looks in the sops/age folder in your user folder for a keys.txt file with the private key. You can change this behaviour by setting the **$SOPS_AGE_KEY_FILE** environment variable, or setting the **SOPS_AGE_KEY** environment variable to the key itself. \ No newline at end of file From 46d6df4346f507592d33826513fc8d78742fafa0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 11:40:34 +0100 Subject: [PATCH 1152/2308] Update the readme to be more explanatory --- README.md | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 99e42c4..57c70b9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,42 @@ # NixOS-Config -My NixOS configuration for my different hosts. \ No newline at end of file +The configuration of different NixOS hosts using flakes and home-manager. It is assumed you have already installed NixOS and git to your system (note: git is not installed by default with the NixOS image, you can grab it with ``nix-shell -p git``), this configuration does not have image artifacts nor can it create them. + +## Building and deploying the configuration + +The first step is to add your age keyfile to the /nix/var/secrets folder with the name "keys.txt" (if you don't have one, remove the imports from the configuration files; the import can be found under +``hosts//configuration.nix``). + +Then run this command within your cloned github repo (I put mine in /etc/nixos): + +``sudo nixos-rebuild --flake .# switch`` + +This should rebuild the OS with all programs and settings defined as in the configuration. + +## Updating the flake lock + +In order to have updated packages you will have to update the flake.lock file, this can be done by running the following command in the repository: + +``nix flake update`` + +Please note that you should commit and push after you do this. It is therefore advisable to do this not in your deployment directory, but your local dev environment. Not commiting the files will dirty your git history, which can have unintended consequences as nix flakes work via git. + +## Testing the evaluation + +To test if your build succeeds the basic checks and can start building the artifacts, you can run the following command: + +``nix flake check`` + +Note: this does not build the full configuration, and errors might still happen in deployment, especially for dependencies that rely on external services like webservers to be called. For obvious reasons the test building does not actually pull in all the artifacts, and does not make external calls aside from to the package files (You will need a built nix store, or a connection to the git repository that hosts your packages, like an internet connection to github, to make the test run) + +## Technical details + +### Home manager +Home manager is imported as a module within the global configuration, it is therefor not needed to build home-manager packages separately in this configuration. On multi user systems it might be useful to pull the home-manager configurations from separate repos for different users, so you don't have to give your users access to the global configuration. + +### Sops +The secrets are managed in sops files within the hosts folders, there is only one sops file per host, but this can be changed quite easily. The command to edit the sops file is as follows: + +``nix-shell -p sops --run "sops ./nixos/hosts//secrets/sops.yaml"`` + +This requires your system to have the keyfile available for sops to use, by default sops looks in the sops/age folder in your user folder for a keys.txt file with the private key. You can change this behaviour by setting the **$SOPS_AGE_KEY_FILE** environment variable, or setting the **SOPS_AGE_KEY** environment variable to the key itself. \ No newline at end of file From 857caab109c88d7abbe9f678d58992d2773bfc3e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 13:39:13 +0100 Subject: [PATCH 1153/2308] Fix the git repo link --- .sops.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sops.yaml b/.sops.yaml index b7b6799..0bbb971 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,6 +1,6 @@ # This example uses YAML anchors which allows reuse of multiple keys # without having to repeat yourself. -# Also see https://github.com/Mic92/dotfiles/blob/master/nixos/.sops.yaml +# Also see https://github.com/Mic92/dotfiles/blob/main/nixos/.sops.yaml # for a more complex example. keys: - &admin_lillian age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz From 2b33ba485c664926a4061091f332f4614a9f2d85 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 13:39:13 +0100 Subject: [PATCH 1154/2308] Fix the git repo link --- .sops.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sops.yaml b/.sops.yaml index b7b6799..0bbb971 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,6 +1,6 @@ # This example uses YAML anchors which allows reuse of multiple keys # without having to repeat yourself. -# Also see https://github.com/Mic92/dotfiles/blob/master/nixos/.sops.yaml +# Also see https://github.com/Mic92/dotfiles/blob/main/nixos/.sops.yaml # for a more complex example. keys: - &admin_lillian age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz From 5446e5bc9eacdf51d70f63bef13e1eb23ca96fa3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 13:44:18 +0100 Subject: [PATCH 1155/2308] Put a space there --- .sops.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sops.yaml b/.sops.yaml index 0bbb971..e7562a3 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -9,5 +9,5 @@ creation_rules: key_groups: - age: - *admin_lillian -#Run the following command to create EDI-Lillian.yaml in the secrets folder: +# Run the following command to create EDI-Lillian.yaml in the secrets folder: # nix-shell -p sops --run "sops secrets/EDI-Lillian.yaml" \ No newline at end of file From 6c251a600c7f2bd195a70d7a0e096904f01fd094 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 13:44:18 +0100 Subject: [PATCH 1156/2308] Put a space there --- .sops.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sops.yaml b/.sops.yaml index 0bbb971..e7562a3 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -9,5 +9,5 @@ creation_rules: key_groups: - age: - *admin_lillian -#Run the following command to create EDI-Lillian.yaml in the secrets folder: +# Run the following command to create EDI-Lillian.yaml in the secrets folder: # nix-shell -p sops --run "sops secrets/EDI-Lillian.yaml" \ No newline at end of file From 219e2387e2fbad984181c21b156e3e8eb3726699 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 14:09:04 +0100 Subject: [PATCH 1157/2308] Add starship --- home-manager/package-configs/zsh.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 3a4cfd8..e86be66 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -6,6 +6,11 @@ pkgs, ... }: { + # Enable starship + programs.starship = { + enable = true; + }; + programs.zsh = { enable = true; plugins = [ From 3acc9452a6f9fe3fed2f19d56d1d38c8cf84c0f7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 14:09:04 +0100 Subject: [PATCH 1158/2308] Add starship --- home-manager/package-configs/zsh.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 3a4cfd8..e86be66 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -6,6 +6,11 @@ pkgs, ... }: { + # Enable starship + programs.starship = { + enable = true; + }; + programs.zsh = { enable = true; plugins = [ From 5501dbf4e841b4ca5918dd2faec1df6f525625ee Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 16:02:47 +0100 Subject: [PATCH 1159/2308] Add original source --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 57c70b9..415c6ab 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +Original source: https://git.lillianviolet.dev/Lillian-Violet/dev-templates + # NixOS-Config The configuration of different NixOS hosts using flakes and home-manager. It is assumed you have already installed NixOS and git to your system (note: git is not installed by default with the NixOS image, you can grab it with ``nix-shell -p git``), this configuration does not have image artifacts nor can it create them. From ae33b36fe03edc3e37083a0d4866bfae39aeaf16 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Jan 2024 16:02:47 +0100 Subject: [PATCH 1160/2308] Add original source --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 57c70b9..415c6ab 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +Original source: https://git.lillianviolet.dev/Lillian-Violet/dev-templates + # NixOS-Config The configuration of different NixOS hosts using flakes and home-manager. It is assumed you have already installed NixOS and git to your system (note: git is not installed by default with the NixOS image, you can grab it with ``nix-shell -p git``), this configuration does not have image artifacts nor can it create them. From 12df6ba409b39a5ec69ecd98907d3e7feb6d0676 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 11:17:07 +0100 Subject: [PATCH 1161/2308] Little markdown rendering fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 415c6ab..e48951b 100644 --- a/README.md +++ b/README.md @@ -41,4 +41,4 @@ The secrets are managed in sops files within the hosts folders, there is only on ``nix-shell -p sops --run "sops ./nixos/hosts//secrets/sops.yaml"`` -This requires your system to have the keyfile available for sops to use, by default sops looks in the sops/age folder in your user folder for a keys.txt file with the private key. You can change this behaviour by setting the **$SOPS_AGE_KEY_FILE** environment variable, or setting the **SOPS_AGE_KEY** environment variable to the key itself. \ No newline at end of file +This requires your system to have the keyfile available for sops to use, by default sops looks in the sops/age folder in your user folder for a keys.txt file with the private key. You can change this behaviour by setting the **\$SOPS_AGE_KEY_FILE** environment variable, or setting the **\$SOPS_AGE_KEY** environment variable to the key itself. \ No newline at end of file From 1b7a9c69321dbc2fa18970b6d0a65f3989381181 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 11:17:07 +0100 Subject: [PATCH 1162/2308] Little markdown rendering fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 415c6ab..e48951b 100644 --- a/README.md +++ b/README.md @@ -41,4 +41,4 @@ The secrets are managed in sops files within the hosts folders, there is only on ``nix-shell -p sops --run "sops ./nixos/hosts//secrets/sops.yaml"`` -This requires your system to have the keyfile available for sops to use, by default sops looks in the sops/age folder in your user folder for a keys.txt file with the private key. You can change this behaviour by setting the **$SOPS_AGE_KEY_FILE** environment variable, or setting the **SOPS_AGE_KEY** environment variable to the key itself. \ No newline at end of file +This requires your system to have the keyfile available for sops to use, by default sops looks in the sops/age folder in your user folder for a keys.txt file with the private key. You can change this behaviour by setting the **\$SOPS_AGE_KEY_FILE** environment variable, or setting the **\$SOPS_AGE_KEY** environment variable to the key itself. \ No newline at end of file From b1e50f683fde7374853e8d1f0b5bd8683f91ab13 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 11:38:05 +0100 Subject: [PATCH 1163/2308] Add direnv plugin to vscodium --- home-manager/desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index a1862a0..49be5a8 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -104,6 +104,7 @@ github.vscode-pull-request-github jnoortheen.nix-ide kamadorueda.alejandra + mkhl.direnv ms-toolsai.jupyter ms-pyright.pyright ms-python.black-formatter From 42aace2d51e4ae17aef33d01be54bbee2862b7e6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 11:38:05 +0100 Subject: [PATCH 1164/2308] Add direnv plugin to vscodium --- home-manager/desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index a1862a0..49be5a8 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -104,6 +104,7 @@ github.vscode-pull-request-github jnoortheen.nix-ide kamadorueda.alejandra + mkhl.direnv ms-toolsai.jupyter ms-pyright.pyright ms-python.black-formatter From 881c51d3f5e1a05c95d130a7955dea87e4692172 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 12:36:38 +0100 Subject: [PATCH 1165/2308] Oops linked to wrong repo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e48951b..5dfb5df 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Original source: https://git.lillianviolet.dev/Lillian-Violet/dev-templates +Original source: https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config # NixOS-Config From d5707d49dff4cc63efde36c8850876c54e653172 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 12:36:38 +0100 Subject: [PATCH 1166/2308] Oops linked to wrong repo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e48951b..5dfb5df 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Original source: https://git.lillianviolet.dev/Lillian-Violet/dev-templates +Original source: https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config # NixOS-Config From 971e898af3b18889ede2866156e652fddefa57be Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 15:12:10 +0100 Subject: [PATCH 1167/2308] Add ruff python linter --- home-manager/desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 49be5a8..2f76ebe 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -99,6 +99,7 @@ extensions = with pkgs.vscode-extensions; [ arrterian.nix-env-selector #ban.spellright + charliermarsh.ruff dracula-theme.theme-dracula eamodio.gitlens github.vscode-pull-request-github From 57d00dec44ac093f2e40fbdd9fc1ff894a16c2c1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 15:12:10 +0100 Subject: [PATCH 1168/2308] Add ruff python linter --- home-manager/desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 49be5a8..2f76ebe 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -99,6 +99,7 @@ extensions = with pkgs.vscode-extensions; [ arrterian.nix-env-selector #ban.spellright + charliermarsh.ruff dracula-theme.theme-dracula eamodio.gitlens github.vscode-pull-request-github From b737d33467894a0136c6989f3932b777d4e1c6dc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 15:14:44 +0100 Subject: [PATCH 1169/2308] Add ruff to system --- home-manager/desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 2f76ebe..c9dfc54 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -51,6 +51,7 @@ # Coding: direnv git + ruff kate # Chat applications: From b6e714fae3dfd9e3e4125cf1070dac62e2e62a4b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 15:14:44 +0100 Subject: [PATCH 1170/2308] Add ruff to system --- home-manager/desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 2f76ebe..c9dfc54 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -51,6 +51,7 @@ # Coding: direnv git + ruff kate # Chat applications: From 43f7bff8250c89dbae369654026d5e51034435a2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 15:15:18 +0100 Subject: [PATCH 1171/2308] Ruff vscode package is broken --- home-manager/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index c9dfc54..5f3920c 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -100,7 +100,7 @@ extensions = with pkgs.vscode-extensions; [ arrterian.nix-env-selector #ban.spellright - charliermarsh.ruff + #charliermarsh.ruff dracula-theme.theme-dracula eamodio.gitlens github.vscode-pull-request-github From 3512a4e0509bba9c99c585e4a97e9794c720dc91 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Jan 2024 15:15:18 +0100 Subject: [PATCH 1172/2308] Ruff vscode package is broken --- home-manager/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index c9dfc54..5f3920c 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -100,7 +100,7 @@ extensions = with pkgs.vscode-extensions; [ arrterian.nix-env-selector #ban.spellright - charliermarsh.ruff + #charliermarsh.ruff dracula-theme.theme-dracula eamodio.gitlens github.vscode-pull-request-github From d5d671787547d37278f050fab6b6e6e3dd6386b4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 28 Jan 2024 23:07:30 +0100 Subject: [PATCH 1173/2308] Fix for dovecot update (flake lock update should work again hopefully) --- nixos/server/package-configs/mail-server/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/server/package-configs/mail-server/configuration.nix b/nixos/server/package-configs/mail-server/configuration.nix index 144ac7d..cf2c434 100644 --- a/nixos/server/package-configs/mail-server/configuration.nix +++ b/nixos/server/package-configs/mail-server/configuration.nix @@ -9,6 +9,9 @@ sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; + #Fix for the dovecot update + services.dovecot2.sieve.extensions = ["fileinto"]; + mailserver = { enable = true; enableImap = true; From b57cb5a3ecce355001366ba5bc4f90e6748ff6b4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 28 Jan 2024 23:07:30 +0100 Subject: [PATCH 1174/2308] Fix for dovecot update (flake lock update should work again hopefully) --- nixos/server/package-configs/mail-server/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/server/package-configs/mail-server/configuration.nix b/nixos/server/package-configs/mail-server/configuration.nix index 144ac7d..cf2c434 100644 --- a/nixos/server/package-configs/mail-server/configuration.nix +++ b/nixos/server/package-configs/mail-server/configuration.nix @@ -9,6 +9,9 @@ sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; + #Fix for the dovecot update + services.dovecot2.sieve.extensions = ["fileinto"]; + mailserver = { enable = true; enableImap = true; From ab5ad1451766fdad09b1b8fa90a1933d077d35ef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 28 Jan 2024 23:08:30 +0100 Subject: [PATCH 1175/2308] Update the nix flake then --- flake.lock | 118 ++++++++++++++++++++++++++--------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 31906c6..8dcde63 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1701241962, - "narHash": "sha256-zY2MbHEMmGjPObG73aOEGqXxEJTveItYKV8cFL50XnQ=", + "lastModified": 1706332837, + "narHash": "sha256-6jwCjD6hLVRkPHyl/2K+5ZEoQV3C5BgWlDroUx/9ru8=", "owner": "chaorace", "repo": "extest-nix", - "rev": "e0c93df813a594a0cd883f6bdd01ec44149206fa", + "rev": "a9dbc41a7ba6723d8598cd699bbb163630b646b3", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1704980804, - "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", + "lastModified": 1706435589, + "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=", "owner": "nix-community", "repo": "home-manager", - "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", + "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1704665257, - "narHash": "sha256-Cycz00I26e8QZ9sZtCz0uIz6Cad5ld3zM7N2I+5beqI=", + "lastModified": 1705667791, + "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8951673c6c216ddd6bac3db3e88e3f2281b3511a", + "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1706367331, + "narHash": "sha256-AqgkGHRrI6h/8FWuVbnkfFmXr4Bqsr4fV23aISqj/xg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "160b762eda6d139ac10ae081f8f78d640dd523eb", "type": "github" }, "original": { @@ -183,28 +183,13 @@ "type": "github" } }, - "nixpkgs-22_11": { - "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, "nixpkgs-23_05": { "locked": { - "lastModified": 1684782344, - "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -213,13 +198,28 @@ "type": "indirect" } }, - "nixpkgs-stable": { + "nixpkgs-23_11": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1705957679, + "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { @@ -247,11 +247,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1670751203, - "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -294,11 +294,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1706173671, + "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1705257805, - "narHash": "sha256-hx88TjxRWR9hEYrePm2aR/rKAu4VFx4irgN7AofE0Wg=", + "lastModified": 1706365059, + "narHash": "sha256-2+M4vliRmSHQwGb1q1krg5lWKYiX7rF/B9GF4AlzXW4=", "owner": "pjones", "repo": "plasma-manager", - "rev": "87ca0e29c6fccfb7f09be6ff137716db5a7c8d8f", + "rev": "64f31bc95c22b04896111e4c9921d3e1122c0a92", "type": "github" }, "original": { @@ -377,16 +377,16 @@ "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs_4", - "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" }, "locked": { - "lastModified": 1703666786, - "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "lastModified": 1706219574, + "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", + "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", "type": "gitlab" }, "original": { @@ -402,11 +402,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704908274, - "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", + "lastModified": 1706410821, + "narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", + "rev": "73bf36912e31a6b21af6e0f39218e067283c67ef", "type": "github" }, "original": { From e1aa02c4f9bed5ed4f489c5a9b45460f166c2cb2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 28 Jan 2024 23:08:30 +0100 Subject: [PATCH 1176/2308] Update the nix flake then --- flake.lock | 118 ++++++++++++++++++++++++++--------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 31906c6..8dcde63 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1701241962, - "narHash": "sha256-zY2MbHEMmGjPObG73aOEGqXxEJTveItYKV8cFL50XnQ=", + "lastModified": 1706332837, + "narHash": "sha256-6jwCjD6hLVRkPHyl/2K+5ZEoQV3C5BgWlDroUx/9ru8=", "owner": "chaorace", "repo": "extest-nix", - "rev": "e0c93df813a594a0cd883f6bdd01ec44149206fa", + "rev": "a9dbc41a7ba6723d8598cd699bbb163630b646b3", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1704980804, - "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", + "lastModified": 1706435589, + "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=", "owner": "nix-community", "repo": "home-manager", - "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", + "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1704665257, - "narHash": "sha256-Cycz00I26e8QZ9sZtCz0uIz6Cad5ld3zM7N2I+5beqI=", + "lastModified": 1705667791, + "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8951673c6c216ddd6bac3db3e88e3f2281b3511a", + "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1706367331, + "narHash": "sha256-AqgkGHRrI6h/8FWuVbnkfFmXr4Bqsr4fV23aISqj/xg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "160b762eda6d139ac10ae081f8f78d640dd523eb", "type": "github" }, "original": { @@ -183,28 +183,13 @@ "type": "github" } }, - "nixpkgs-22_11": { - "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, "nixpkgs-23_05": { "locked": { - "lastModified": 1684782344, - "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -213,13 +198,28 @@ "type": "indirect" } }, - "nixpkgs-stable": { + "nixpkgs-23_11": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1705957679, + "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { @@ -247,11 +247,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1670751203, - "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -294,11 +294,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1706173671, + "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1705257805, - "narHash": "sha256-hx88TjxRWR9hEYrePm2aR/rKAu4VFx4irgN7AofE0Wg=", + "lastModified": 1706365059, + "narHash": "sha256-2+M4vliRmSHQwGb1q1krg5lWKYiX7rF/B9GF4AlzXW4=", "owner": "pjones", "repo": "plasma-manager", - "rev": "87ca0e29c6fccfb7f09be6ff137716db5a7c8d8f", + "rev": "64f31bc95c22b04896111e4c9921d3e1122c0a92", "type": "github" }, "original": { @@ -377,16 +377,16 @@ "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs_4", - "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" }, "locked": { - "lastModified": 1703666786, - "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "lastModified": 1706219574, + "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", + "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", "type": "gitlab" }, "original": { @@ -402,11 +402,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704908274, - "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", + "lastModified": 1706410821, + "narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", + "rev": "73bf36912e31a6b21af6e0f39218e067283c67ef", "type": "github" }, "original": { From cb8777ef9bfc06ac08d53da44dbdc350d0ec33bd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Jan 2024 17:58:05 +0100 Subject: [PATCH 1177/2308] Install and enable waydroid --- home-manager/desktop/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 5f3920c..f54deee 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -85,6 +85,7 @@ sops virtualbox watchmate + waydroid qbittorrent zsh @@ -94,6 +95,8 @@ ungoogled-chromium ]; + virtualisation.waydroid.enable = true; + programs.vscode = { enable = true; package = pkgs.vscodium; From 96377ea434fe0dce7b540acb51ef981a277726ca Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Jan 2024 17:58:05 +0100 Subject: [PATCH 1178/2308] Install and enable waydroid --- home-manager/desktop/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index 5f3920c..f54deee 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -85,6 +85,7 @@ sops virtualbox watchmate + waydroid qbittorrent zsh @@ -94,6 +95,8 @@ ungoogled-chromium ]; + virtualisation.waydroid.enable = true; + programs.vscode = { enable = true; package = pkgs.vscodium; From 61aff3b9298b2fcf3e084ee11c046dc7d7b64057 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Jan 2024 17:59:34 +0100 Subject: [PATCH 1179/2308] Not in home manager though --- home-manager/desktop/configuration.nix | 3 --- nixos/desktop/configuration.nix | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index f54deee..5f3920c 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -85,7 +85,6 @@ sops virtualbox watchmate - waydroid qbittorrent zsh @@ -95,8 +94,6 @@ ungoogled-chromium ]; - virtualisation.waydroid.enable = true; - programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 3c5d1d8..255888f 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -76,6 +76,7 @@ pciutils rsync wget + waydroid zsh # KDE/QT @@ -99,6 +100,8 @@ noisetorch ]; + virtualisation.waydroid.enable = true; + programs.direnv = { enable = true; }; From 78f9c38b8ff5f7ffc68c8bb9352b11b41ef58396 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Jan 2024 17:59:34 +0100 Subject: [PATCH 1180/2308] Not in home manager though --- home-manager/desktop/configuration.nix | 3 --- nixos/desktop/configuration.nix | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/configuration.nix index f54deee..5f3920c 100644 --- a/home-manager/desktop/configuration.nix +++ b/home-manager/desktop/configuration.nix @@ -85,7 +85,6 @@ sops virtualbox watchmate - waydroid qbittorrent zsh @@ -95,8 +94,6 @@ ungoogled-chromium ]; - virtualisation.waydroid.enable = true; - programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 3c5d1d8..255888f 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -76,6 +76,7 @@ pciutils rsync wget + waydroid zsh # KDE/QT @@ -99,6 +100,8 @@ noisetorch ]; + virtualisation.waydroid.enable = true; + programs.direnv = { enable = true; }; From 8333f0468b69196518de96ebca25d92edc3eb3d4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Jan 2024 18:10:37 +0100 Subject: [PATCH 1181/2308] Add xwaylandvideobridge to enable screen sharing to discord etc. --- nixos/desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 255888f..680b62d 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -77,6 +77,7 @@ rsync wget waydroid + xwaylandvideobridge zsh # KDE/QT From 60225a06e0250b0d4fb7c659b4252f30d1dedbb3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Jan 2024 18:10:37 +0100 Subject: [PATCH 1182/2308] Add xwaylandvideobridge to enable screen sharing to discord etc. --- nixos/desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 255888f..680b62d 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -77,6 +77,7 @@ rsync wget waydroid + xwaylandvideobridge zsh # KDE/QT From 0c1da18e13c9aa3dea282d4d02e24b94723ed360 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Jan 2024 20:23:45 +0100 Subject: [PATCH 1183/2308] Turning waydroid off because my laptop wants to take off --- nixos/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 680b62d..fb74b83 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -101,7 +101,7 @@ noisetorch ]; - virtualisation.waydroid.enable = true; + virtualisation.waydroid.enable = false; programs.direnv = { enable = true; From d11182813187f2b55c1ca7d202d0f873730fa362 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Jan 2024 20:23:45 +0100 Subject: [PATCH 1184/2308] Turning waydroid off because my laptop wants to take off --- nixos/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 680b62d..fb74b83 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -101,7 +101,7 @@ noisetorch ]; - virtualisation.waydroid.enable = true; + virtualisation.waydroid.enable = false; programs.direnv = { enable = true; From 62df0d1cd424c8e739d8d6bce6211d3b9da59386 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Jan 2024 12:03:29 +0100 Subject: [PATCH 1185/2308] Refactor a bit by adding globally shared packages in one file --- nixos/desktop/configuration.nix | 20 ++++------------ nixos/hosts/queen/configuration.nix | 15 +++--------- nixos/hosts/wheatley/configuration.nix | 5 ++++ nixos/shared/packages/configuration.nix | 31 +++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 28 deletions(-) create mode 100644 nixos/shared/packages/configuration.nix diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index fb74b83..ba92d00 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -9,7 +9,11 @@ ... }: { imports = [ + # Import locale settings ../shared/locale/configuration.nix + + # Import shared packages + ../../shared/packages/configuration.nix ]; nixpkgs = { # You can add overlays here @@ -59,23 +63,12 @@ }; environment.systemPackages = with pkgs; [ - # Custom tools - dvd - dvt - # System tools - age - alejandra direnv docker docker-compose git-filter-repo - home-manager - htop - oh-my-zsh pciutils - rsync - wget waydroid xwaylandvideobridge zsh @@ -92,11 +85,6 @@ libsForQt5.packagekit-qt libportal-qt5 - # System libraries - noto-fonts - noto-fonts-emoji-blob-bin - noto-fonts-emoji - # User tools noisetorch ]; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index c328563..bdd26b5 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -21,6 +21,9 @@ # Import locale settings ../../shared/locale/configuration.nix + # Import shared packages + ../../shared/packages/configuration.nix + #../../server/package-configs/akkoma/configuration.nix ../../server/package-configs/forgejo/configuration.nix ../../server/package-configs/gotosocial/configuration.nix @@ -88,12 +91,10 @@ environment.systemPackages = with pkgs; [ akkoma - age fzf matrix-conduit docker docker-compose - git gitea gotosocial alejandra @@ -101,22 +102,14 @@ imagemagick ffmpeg aria2 - git-filter-repo - home-manager - htop jellyfin jellyfin-web jellyfin-ffmpeg nextcloud28 nginx - noto-fonts - noto-fonts-emoji-blob-bin - noto-fonts-emoji - oh-my-zsh onlyoffice-documentserver postgresql_16 python3 - rsync rabbitmq-server roundcube roundcubePlugins.contextmenu @@ -125,8 +118,6 @@ roundcubePlugins.persistent_login roundcubePlugins.thunderbird_labels youtube-dl - wget - zsh ]; # Enable networking diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 047f261..5d26cea 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -14,7 +14,12 @@ ./armv7l.nix ./hardware-configuration.nix + + # Import locale settings ../../shared/locale/configuration.nix + + # Import shared packages + ../../shared/packages/configuration.nix ]; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/configuration.nix new file mode 100644 index 0000000..376e607 --- /dev/null +++ b/nixos/shared/packages/configuration.nix @@ -0,0 +1,31 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + environment.systemPackages = with pkgs; [ + # Custom tools + dvd + dvt + + # System tools + age + git + git-filter-repo + home-manager + htop + neofetch + oh-my-zsh + rsync + wget + zsh + + # System libraries + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + ]; +} From 7e7baef7303ae8a6d32d442e4766329a876a7d4b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Jan 2024 12:03:29 +0100 Subject: [PATCH 1186/2308] Refactor a bit by adding globally shared packages in one file --- nixos/desktop/configuration.nix | 20 ++++------------ nixos/hosts/queen/configuration.nix | 15 +++--------- nixos/hosts/wheatley/configuration.nix | 5 ++++ nixos/shared/packages/configuration.nix | 31 +++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 28 deletions(-) create mode 100644 nixos/shared/packages/configuration.nix diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index fb74b83..ba92d00 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -9,7 +9,11 @@ ... }: { imports = [ + # Import locale settings ../shared/locale/configuration.nix + + # Import shared packages + ../../shared/packages/configuration.nix ]; nixpkgs = { # You can add overlays here @@ -59,23 +63,12 @@ }; environment.systemPackages = with pkgs; [ - # Custom tools - dvd - dvt - # System tools - age - alejandra direnv docker docker-compose git-filter-repo - home-manager - htop - oh-my-zsh pciutils - rsync - wget waydroid xwaylandvideobridge zsh @@ -92,11 +85,6 @@ libsForQt5.packagekit-qt libportal-qt5 - # System libraries - noto-fonts - noto-fonts-emoji-blob-bin - noto-fonts-emoji - # User tools noisetorch ]; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index c328563..bdd26b5 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -21,6 +21,9 @@ # Import locale settings ../../shared/locale/configuration.nix + # Import shared packages + ../../shared/packages/configuration.nix + #../../server/package-configs/akkoma/configuration.nix ../../server/package-configs/forgejo/configuration.nix ../../server/package-configs/gotosocial/configuration.nix @@ -88,12 +91,10 @@ environment.systemPackages = with pkgs; [ akkoma - age fzf matrix-conduit docker docker-compose - git gitea gotosocial alejandra @@ -101,22 +102,14 @@ imagemagick ffmpeg aria2 - git-filter-repo - home-manager - htop jellyfin jellyfin-web jellyfin-ffmpeg nextcloud28 nginx - noto-fonts - noto-fonts-emoji-blob-bin - noto-fonts-emoji - oh-my-zsh onlyoffice-documentserver postgresql_16 python3 - rsync rabbitmq-server roundcube roundcubePlugins.contextmenu @@ -125,8 +118,6 @@ roundcubePlugins.persistent_login roundcubePlugins.thunderbird_labels youtube-dl - wget - zsh ]; # Enable networking diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 047f261..5d26cea 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -14,7 +14,12 @@ ./armv7l.nix ./hardware-configuration.nix + + # Import locale settings ../../shared/locale/configuration.nix + + # Import shared packages + ../../shared/packages/configuration.nix ]; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/configuration.nix new file mode 100644 index 0000000..376e607 --- /dev/null +++ b/nixos/shared/packages/configuration.nix @@ -0,0 +1,31 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + environment.systemPackages = with pkgs; [ + # Custom tools + dvd + dvt + + # System tools + age + git + git-filter-repo + home-manager + htop + neofetch + oh-my-zsh + rsync + wget + zsh + + # System libraries + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji + ]; +} From bc660ef7d20ea5dd8be8c737f5aa140377ab905b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Jan 2024 12:05:25 +0100 Subject: [PATCH 1187/2308] Right location for desktop to import shared --- nixos/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index ba92d00..d92e30c 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -13,7 +13,7 @@ ../shared/locale/configuration.nix # Import shared packages - ../../shared/packages/configuration.nix + ../shared/packages/configuration.nix ]; nixpkgs = { # You can add overlays here From e9cddb0dcfe7224d54c7b05e75173515942d0553 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Jan 2024 12:05:25 +0100 Subject: [PATCH 1188/2308] Right location for desktop to import shared --- nixos/desktop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index ba92d00..d92e30c 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -13,7 +13,7 @@ ../shared/locale/configuration.nix # Import shared packages - ../../shared/packages/configuration.nix + ../shared/packages/configuration.nix ]; nixpkgs = { # You can add overlays here From a0ff903ee14367db7c8fb6469f7da3afbd0a83d3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Jan 2024 12:07:57 +0100 Subject: [PATCH 1189/2308] Let's do it this way instead --- nixos/desktop/configuration.nix | 4 ++++ nixos/shared/packages/configuration.nix | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index d92e30c..b0323b9 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -63,6 +63,10 @@ }; environment.systemPackages = with pkgs; [ + # Custom tools + dvd + dvt + # System tools direnv docker diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/configuration.nix index 376e607..2764301 100644 --- a/nixos/shared/packages/configuration.nix +++ b/nixos/shared/packages/configuration.nix @@ -7,10 +7,6 @@ ... }: { environment.systemPackages = with pkgs; [ - # Custom tools - dvd - dvt - # System tools age git From dda2303cbef54a444bdd40b35c0e0f2c053a4632 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Jan 2024 12:07:57 +0100 Subject: [PATCH 1190/2308] Let's do it this way instead --- nixos/desktop/configuration.nix | 4 ++++ nixos/shared/packages/configuration.nix | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index d92e30c..b0323b9 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -63,6 +63,10 @@ }; environment.systemPackages = with pkgs; [ + # Custom tools + dvd + dvt + # System tools direnv docker diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/configuration.nix index 376e607..2764301 100644 --- a/nixos/shared/packages/configuration.nix +++ b/nixos/shared/packages/configuration.nix @@ -7,10 +7,6 @@ ... }: { environment.systemPackages = with pkgs; [ - # Custom tools - dvd - dvt - # System tools age git From 6d8b789c71704e828e839249e305382a8d9e1322 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Jan 2024 14:10:27 +0100 Subject: [PATCH 1191/2308] Add alejandra to shared packages --- nixos/shared/packages/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/configuration.nix index 2764301..1a18ae2 100644 --- a/nixos/shared/packages/configuration.nix +++ b/nixos/shared/packages/configuration.nix @@ -9,6 +9,7 @@ environment.systemPackages = with pkgs; [ # System tools age + alejandra git git-filter-repo home-manager From 4bf6af1ebc1e08ecfa3232dc5a92229eae43089d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Jan 2024 14:10:27 +0100 Subject: [PATCH 1192/2308] Add alejandra to shared packages --- nixos/shared/packages/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/configuration.nix index 2764301..1a18ae2 100644 --- a/nixos/shared/packages/configuration.nix +++ b/nixos/shared/packages/configuration.nix @@ -9,6 +9,7 @@ environment.systemPackages = with pkgs; [ # System tools age + alejandra git git-filter-repo home-manager From 3da0adad7117021dc6ccc0acae599759f936187f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 1 Feb 2024 11:31:36 +0100 Subject: [PATCH 1193/2308] Added spacevim --- nixos/shared/packages/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/configuration.nix index 1a18ae2..d16f35f 100644 --- a/nixos/shared/packages/configuration.nix +++ b/nixos/shared/packages/configuration.nix @@ -17,6 +17,7 @@ neofetch oh-my-zsh rsync + spacevim wget zsh From 4d64fe36e744b1813ece6a975557e6646631d5ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 1 Feb 2024 11:31:36 +0100 Subject: [PATCH 1194/2308] Added spacevim --- nixos/shared/packages/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/configuration.nix index 1a18ae2..d16f35f 100644 --- a/nixos/shared/packages/configuration.nix +++ b/nixos/shared/packages/configuration.nix @@ -17,6 +17,7 @@ neofetch oh-my-zsh rsync + spacevim wget zsh From 711e24bed2db32d419f484e7cc9231b7cdf69605 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 1 Feb 2024 13:05:09 +0100 Subject: [PATCH 1195/2308] Lanzaboot initial setup --- flake.nix | 6 ++++++ nixos/desktop/configuration.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/flake.nix b/flake.nix index 3b565c4..ea49f6d 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,10 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. + # Lanzaboot (secure boot) + #lanzaboote.url = "github:nix-community/lanzaboote"; + + # Jovian nixos (steam deck) jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; # Home manager @@ -79,6 +83,7 @@ # > Our main nixos configuration file < ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops + #lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager { home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; @@ -95,6 +100,7 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops + #lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager { home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index b0323b9..04a0d3c 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -163,6 +163,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; + boot.bootspec.enable = true; users.users = { lillian = { From ed28548fd9fad3aa2d639a1f88b9b49ea722847e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 1 Feb 2024 13:05:09 +0100 Subject: [PATCH 1196/2308] Lanzaboot initial setup --- flake.nix | 6 ++++++ nixos/desktop/configuration.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/flake.nix b/flake.nix index 3b565c4..ea49f6d 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,10 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. + # Lanzaboot (secure boot) + #lanzaboote.url = "github:nix-community/lanzaboote"; + + # Jovian nixos (steam deck) jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; # Home manager @@ -79,6 +83,7 @@ # > Our main nixos configuration file < ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops + #lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager { home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; @@ -95,6 +100,7 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops + #lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager { home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index b0323b9..04a0d3c 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -163,6 +163,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; + boot.bootspec.enable = true; users.users = { lillian = { From 44d646adc072eced435fe44a2209c04af3705580 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 1 Feb 2024 14:35:46 +0100 Subject: [PATCH 1197/2308] Add bchacefs support, set up the first luks and bcachefs settings, and update plasma-manager config --- disko/EDI/configuration.nix | 66 +++++++++++++++++++ .../plasma-desktop/configuration.nix | 5 +- nixos/desktop/configuration.nix | 4 ++ 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 disko/EDI/configuration.nix diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix new file mode 100644 index 0000000..7c17496 --- /dev/null +++ b/disko/EDI/configuration.nix @@ -0,0 +1,66 @@ +{ + disko.devices = { + disk = { + vdb = { + device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "defaults" + ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + # disable settings.keyFile if you want to use interactive password entry + #passwordFile = "/tmp/secret.key"; # Interactive + settings = { + allowDiscards = true; + keyFile = "/tmp/secret.key"; + }; + #additionalKeyFiles = ["/tmp/additionalSecret.key"]; + content = { + root = { + name = "root"; + end = "-1G"; + content = { + type = "filesystem"; + format = "bcachefs"; + mountpoint = "/"; + }; + }; + encryptedSwap = { + size = "10M"; + content = { + type = "swap"; + randomEncryption = true; + }; + }; + plainSwap = { + size = "100%"; + content = { + type = "swap"; + resumeDevice = true; # resume from hiberation from this device + }; + }; + }; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix index a193e98..d065b77 100644 --- a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix +++ b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix @@ -258,6 +258,7 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."IconsMode"."PreviewSize" = 80; "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; @@ -270,6 +271,7 @@ "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; "kdeglobals"."KDE"."SingleClick" = false; @@ -590,7 +592,7 @@ "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konquerors"; "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; @@ -799,6 +801,7 @@ "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions[$d]" = ""; "khotkeysrc"."General"."BrowserApplication[$d]" = ""; "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; "khotkeysrc"."General"."ColorScheme[$d]" = ""; diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 04a0d3c..ac78897 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -71,10 +71,12 @@ direnv docker docker-compose + gcc-wrapper git-filter-repo pciutils waydroid xwaylandvideobridge + yubikey-personalization zsh # KDE/QT @@ -164,6 +166,8 @@ boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; boot.bootspec.enable = true; + boot.supportedFilesystems = ["bcachefs"]; + boot.kernelPackages = pkgs.linuxPackages_latest; users.users = { lillian = { From 4c592ca72f68dd9a7e95da426afc51b2d95504bc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 1 Feb 2024 14:35:46 +0100 Subject: [PATCH 1198/2308] Add bchacefs support, set up the first luks and bcachefs settings, and update plasma-manager config --- disko/EDI/configuration.nix | 66 +++++++++++++++++++ .../plasma-desktop/configuration.nix | 5 +- nixos/desktop/configuration.nix | 4 ++ 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 disko/EDI/configuration.nix diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix new file mode 100644 index 0000000..7c17496 --- /dev/null +++ b/disko/EDI/configuration.nix @@ -0,0 +1,66 @@ +{ + disko.devices = { + disk = { + vdb = { + device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "defaults" + ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + # disable settings.keyFile if you want to use interactive password entry + #passwordFile = "/tmp/secret.key"; # Interactive + settings = { + allowDiscards = true; + keyFile = "/tmp/secret.key"; + }; + #additionalKeyFiles = ["/tmp/additionalSecret.key"]; + content = { + root = { + name = "root"; + end = "-1G"; + content = { + type = "filesystem"; + format = "bcachefs"; + mountpoint = "/"; + }; + }; + encryptedSwap = { + size = "10M"; + content = { + type = "swap"; + randomEncryption = true; + }; + }; + plainSwap = { + size = "100%"; + content = { + type = "swap"; + resumeDevice = true; # resume from hiberation from this device + }; + }; + }; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix index a193e98..d065b77 100644 --- a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix +++ b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix @@ -258,6 +258,7 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."IconsMode"."PreviewSize" = 80; "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; @@ -270,6 +271,7 @@ "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; "kdeglobals"."KDE"."SingleClick" = false; @@ -590,7 +592,7 @@ "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konquerors"; "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; @@ -799,6 +801,7 @@ "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions[$d]" = ""; "khotkeysrc"."General"."BrowserApplication[$d]" = ""; "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; "khotkeysrc"."General"."ColorScheme[$d]" = ""; diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 04a0d3c..ac78897 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -71,10 +71,12 @@ direnv docker docker-compose + gcc-wrapper git-filter-repo pciutils waydroid xwaylandvideobridge + yubikey-personalization zsh # KDE/QT @@ -164,6 +166,8 @@ boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; boot.bootspec.enable = true; + boot.supportedFilesystems = ["bcachefs"]; + boot.kernelPackages = pkgs.linuxPackages_latest; users.users = { lillian = { From a17a04d5514456a826e6a0362b6568cb616946c5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 1 Feb 2024 14:54:48 +0100 Subject: [PATCH 1199/2308] Increase the swap a bit --- disko/EDI/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix index 7c17496..610edd9 100644 --- a/disko/EDI/configuration.nix +++ b/disko/EDI/configuration.nix @@ -34,7 +34,7 @@ content = { root = { name = "root"; - end = "-1G"; + end = "-2G"; content = { type = "filesystem"; format = "bcachefs"; @@ -42,7 +42,7 @@ }; }; encryptedSwap = { - size = "10M"; + size = "20M"; content = { type = "swap"; randomEncryption = true; From 7d6e6c427ae50d1eef5001b771b94771ec094988 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 1 Feb 2024 14:54:48 +0100 Subject: [PATCH 1200/2308] Increase the swap a bit --- disko/EDI/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix index 7c17496..610edd9 100644 --- a/disko/EDI/configuration.nix +++ b/disko/EDI/configuration.nix @@ -34,7 +34,7 @@ content = { root = { name = "root"; - end = "-1G"; + end = "-2G"; content = { type = "filesystem"; format = "bcachefs"; @@ -42,7 +42,7 @@ }; }; encryptedSwap = { - size = "10M"; + size = "20M"; content = { type = "swap"; randomEncryption = true; From 9744a39bcff0616133b3fa31b100f4a52297d6d5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 14:18:35 +0100 Subject: [PATCH 1201/2308] Renew gladtherescake.eu's mail cert --- nixos/server/package-configs/mail-server/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/mail-server/configuration.nix b/nixos/server/package-configs/mail-server/configuration.nix index cf2c434..e43a5c6 100644 --- a/nixos/server/package-configs/mail-server/configuration.nix +++ b/nixos/server/package-configs/mail-server/configuration.nix @@ -88,6 +88,7 @@ "mail.lillianviolet.dev" "pop3.lillianviolet.dev" "lillianviolet.dev" + "mail.gladtherescake.eu" ]; }; } From 62a03026c8d7fdff3b05c5d3d5d1789166294275 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 14:18:35 +0100 Subject: [PATCH 1202/2308] Renew gladtherescake.eu's mail cert --- nixos/server/package-configs/mail-server/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/mail-server/configuration.nix b/nixos/server/package-configs/mail-server/configuration.nix index cf2c434..e43a5c6 100644 --- a/nixos/server/package-configs/mail-server/configuration.nix +++ b/nixos/server/package-configs/mail-server/configuration.nix @@ -88,6 +88,7 @@ "mail.lillianviolet.dev" "pop3.lillianviolet.dev" "lillianviolet.dev" + "mail.gladtherescake.eu" ]; }; } From 0b70a2976b9baf35048fab49f6b106532a1db03b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 14:21:13 +0100 Subject: [PATCH 1203/2308] remove this not needed dependency --- nixos/desktop/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index ac78897..a2d02b1 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -71,7 +71,6 @@ direnv docker docker-compose - gcc-wrapper git-filter-repo pciutils waydroid From 24f1f2380e7a6b1de3e1dc60e967c4bfe4117430 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 14:21:13 +0100 Subject: [PATCH 1204/2308] remove this not needed dependency --- nixos/desktop/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index ac78897..a2d02b1 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -71,7 +71,6 @@ direnv docker docker-compose - gcc-wrapper git-filter-repo pciutils waydroid From 49ced5acf51d02ac09cc4f0a909557db22887228 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 17:04:30 +0100 Subject: [PATCH 1205/2308] Update nixos/hosts/EDI/hardware-configuration.nix Changed the hardware configuration to the new encrypted disk setup --- nixos/hosts/EDI/hardware-configuration.nix | 46 +++++++++++----------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 2dc46a9..9305d68 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -1,34 +1,33 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.kernel.sysctl."net.ipv4.icmp_echo_ignore_broadcasts" = 1; - boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/f930d7c6-2798-4e25-abc1-81d02e9abf35"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628"; + fsType = "bcachefs"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/42ED-068B"; - fsType = "vfat"; - }; + boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/91da75e7-52bc-4a50-9293-7e5e431040e0"; - swapDevices = []; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/01B2-909E"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/6aa6422f-c724-4c67-851d-030daf5003fb"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -39,6 +38,5 @@ # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } From 34ebb0b8ebddaf368d5e6415853790a612bebb00 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Sat, 3 Feb 2024 17:04:30 +0100 Subject: [PATCH 1206/2308] Update nixos/hosts/EDI/hardware-configuration.nix Changed the hardware configuration to the new encrypted disk setup --- nixos/hosts/EDI/hardware-configuration.nix | 46 +++++++++++----------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 2dc46a9..9305d68 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -1,34 +1,33 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.kernel.sysctl."net.ipv4.icmp_echo_ignore_broadcasts" = 1; - boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/f930d7c6-2798-4e25-abc1-81d02e9abf35"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628"; + fsType = "bcachefs"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/42ED-068B"; - fsType = "vfat"; - }; + boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/91da75e7-52bc-4a50-9293-7e5e431040e0"; - swapDevices = []; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/01B2-909E"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/6aa6422f-c724-4c67-851d-030daf5003fb"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -39,6 +38,5 @@ # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } From c19879ca698f049b0d494c355dff7b281e0acaec Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 17:19:23 +0100 Subject: [PATCH 1207/2308] Make /boot inacessible by default --- nixos/hosts/EDI/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 9305d68..008e857 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -23,6 +23,7 @@ fileSystems."/boot" = { device = "/dev/disk/by-uuid/01B2-909E"; fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" "defaults" ]; }; swapDevices = From b0dbfa4856e288d119174ebfd7859c028b99ea61 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Sat, 3 Feb 2024 17:19:23 +0100 Subject: [PATCH 1208/2308] Make /boot inacessible by default --- nixos/hosts/EDI/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 9305d68..008e857 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -23,6 +23,7 @@ fileSystems."/boot" = { device = "/dev/disk/by-uuid/01B2-909E"; fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" "defaults" ]; }; swapDevices = From 17eca8a3942ba972eff785001c7917c93b7a1abd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 17:50:32 +0100 Subject: [PATCH 1209/2308] Update for secure boot --- disko/EDI/configuration.nix | 36 +++++++++++++------------------ nixos/desktop/configuration.nix | 1 - nixos/hosts/EDI/configuration.nix | 2 ++ 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix index 610edd9..e240d0d 100644 --- a/disko/EDI/configuration.nix +++ b/disko/EDI/configuration.nix @@ -19,6 +19,20 @@ ]; }; }; + encryptedSwap = { + size = "20M"; + content = { + type = "swap"; + randomEncryption = true; + }; + }; + plainSwap = { + size = "4G"; + content = { + type = "swap"; + resumeDevice = true; # resume from hiberation from this device + }; + }; luks = { size = "100%"; content = { @@ -28,33 +42,14 @@ #passwordFile = "/tmp/secret.key"; # Interactive settings = { allowDiscards = true; - keyFile = "/tmp/secret.key"; + #keyFile = "/tmp/secret.key"; }; #additionalKeyFiles = ["/tmp/additionalSecret.key"]; - content = { - root = { - name = "root"; - end = "-2G"; content = { type = "filesystem"; format = "bcachefs"; mountpoint = "/"; }; - }; - encryptedSwap = { - size = "20M"; - content = { - type = "swap"; - randomEncryption = true; - }; - }; - plainSwap = { - size = "100%"; - content = { - type = "swap"; - resumeDevice = true; # resume from hiberation from this device - }; - }; }; }; }; @@ -62,5 +57,4 @@ }; }; }; - }; } diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index ac78897..aeb858b 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -165,7 +165,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; - boot.bootspec.enable = true; boot.supportedFilesystems = ["bcachefs"]; boot.kernelPackages = pkgs.linuxPackages_latest; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 8f8eea4..8bc0b8a 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -38,6 +38,8 @@ networking.hostName = "EDI"; + boot.bootspec.enable = true; + # Enable bluetooth hardware hardware.bluetooth.enable = true; From 719c05402b5cc7ab3c741dbc306647485f5067df Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 17:50:32 +0100 Subject: [PATCH 1210/2308] Update for secure boot --- disko/EDI/configuration.nix | 36 +++++++++++++------------------ nixos/desktop/configuration.nix | 1 - nixos/hosts/EDI/configuration.nix | 2 ++ 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix index 610edd9..e240d0d 100644 --- a/disko/EDI/configuration.nix +++ b/disko/EDI/configuration.nix @@ -19,6 +19,20 @@ ]; }; }; + encryptedSwap = { + size = "20M"; + content = { + type = "swap"; + randomEncryption = true; + }; + }; + plainSwap = { + size = "4G"; + content = { + type = "swap"; + resumeDevice = true; # resume from hiberation from this device + }; + }; luks = { size = "100%"; content = { @@ -28,33 +42,14 @@ #passwordFile = "/tmp/secret.key"; # Interactive settings = { allowDiscards = true; - keyFile = "/tmp/secret.key"; + #keyFile = "/tmp/secret.key"; }; #additionalKeyFiles = ["/tmp/additionalSecret.key"]; - content = { - root = { - name = "root"; - end = "-2G"; content = { type = "filesystem"; format = "bcachefs"; mountpoint = "/"; }; - }; - encryptedSwap = { - size = "20M"; - content = { - type = "swap"; - randomEncryption = true; - }; - }; - plainSwap = { - size = "100%"; - content = { - type = "swap"; - resumeDevice = true; # resume from hiberation from this device - }; - }; }; }; }; @@ -62,5 +57,4 @@ }; }; }; - }; } diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index ac78897..aeb858b 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -165,7 +165,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; - boot.bootspec.enable = true; boot.supportedFilesystems = ["bcachefs"]; boot.kernelPackages = pkgs.linuxPackages_latest; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 8f8eea4..8bc0b8a 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -38,6 +38,8 @@ networking.hostName = "EDI"; + boot.bootspec.enable = true; + # Enable bluetooth hardware hardware.bluetooth.enable = true; From fca55ba34fed0630d0bccc010f977624e537f36a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 18:10:52 +0100 Subject: [PATCH 1211/2308] Update boot for EDI, put the boot for GLaDOS in her own file now --- flake.nix | 4 ++-- nixos/desktop/configuration.nix | 6 ------ nixos/hosts/EDI/configuration.nix | 8 +++++++- nixos/hosts/GLaDOS/configuration.nix | 6 ++++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index ea49f6d..6351a63 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Lanzaboot (secure boot) - #lanzaboote.url = "github:nix-community/lanzaboote"; + lanzaboote.url = "github:nix-community/lanzaboote"; # Jovian nixos (steam deck) jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; @@ -83,7 +83,7 @@ # > Our main nixos configuration file < ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops - #lanzaboote.nixosModules.lanzaboote + lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager { home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index adecf1e..fb02a9d 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -161,12 +161,6 @@ enable = true; }; - boot.loader.systemd-boot.enable = true; - boot.loader.systemd-boot.configurationLimit = 3; - boot.loader.efi.canTouchEfiVariables = true; - boot.supportedFilesystems = ["bcachefs"]; - boot.kernelPackages = pkgs.linuxPackages_latest; - users.users = { lillian = { isNormalUser = true; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 8bc0b8a..1929455 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -39,7 +39,13 @@ networking.hostName = "EDI"; boot.bootspec.enable = true; - + boot = { + loader.systemd-boot.enable = lib.mkForce false; + lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; + }; # Enable bluetooth hardware hardware.bluetooth.enable = true; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 730f894..d42cb1c 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -28,6 +28,12 @@ ./hardware-configuration.nix ]; + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + boot.supportedFilesystems = ["bcachefs"]; + boot.kernelPackages = pkgs.linuxPackages_latest; + home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { From e53b87ced177162bea5941e46bf53981a2e15c65 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 18:10:52 +0100 Subject: [PATCH 1212/2308] Update boot for EDI, put the boot for GLaDOS in her own file now --- flake.nix | 4 ++-- nixos/desktop/configuration.nix | 6 ------ nixos/hosts/EDI/configuration.nix | 8 +++++++- nixos/hosts/GLaDOS/configuration.nix | 6 ++++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index ea49f6d..6351a63 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Lanzaboot (secure boot) - #lanzaboote.url = "github:nix-community/lanzaboote"; + lanzaboote.url = "github:nix-community/lanzaboote"; # Jovian nixos (steam deck) jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; @@ -83,7 +83,7 @@ # > Our main nixos configuration file < ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops - #lanzaboote.nixosModules.lanzaboote + lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager { home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index adecf1e..fb02a9d 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -161,12 +161,6 @@ enable = true; }; - boot.loader.systemd-boot.enable = true; - boot.loader.systemd-boot.configurationLimit = 3; - boot.loader.efi.canTouchEfiVariables = true; - boot.supportedFilesystems = ["bcachefs"]; - boot.kernelPackages = pkgs.linuxPackages_latest; - users.users = { lillian = { isNormalUser = true; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 8bc0b8a..1929455 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -39,7 +39,13 @@ networking.hostName = "EDI"; boot.bootspec.enable = true; - + boot = { + loader.systemd-boot.enable = lib.mkForce false; + lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; + }; # Enable bluetooth hardware hardware.bluetooth.enable = true; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 730f894..d42cb1c 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -28,6 +28,12 @@ ./hardware-configuration.nix ]; + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + boot.supportedFilesystems = ["bcachefs"]; + boot.kernelPackages = pkgs.linuxPackages_latest; + home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { From 36efb47bf43461f5f20c8754e06efc0d3932184c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 18:14:27 +0100 Subject: [PATCH 1213/2308] Needed to add lanzaboot to the outputs (test first!) --- flake.lock | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 1 + 2 files changed, 234 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 8dcde63..eefcd59 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,27 @@ "type": "gitlab" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706473964, + "narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "c798790eabec3e3da48190ae3698ac227aab770c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "extest": { "inputs": { "extest": "extest_2", @@ -52,6 +73,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1668681692, @@ -67,6 +104,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -85,6 +143,46 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "pre-commit-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -125,6 +223,30 @@ "type": "github" } }, + "lanzaboote": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3", + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1706522979, + "narHash": "sha256-2wP2qEFVoZ9q8C9MZdAwXPKDkIIQiEwUzuzCxVKafDc=", + "owner": "nix-community", + "repo": "lanzaboote", + "rev": "c42edac7eb881315bb2a8dfd5190c8c87b91e084", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lanzaboote", + "type": "github" + } + }, "linger": { "inputs": { "flake-utils": [ @@ -214,6 +336,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1705957679, "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", @@ -262,6 +400,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1706370590, + "narHash": "sha256-vq8hTMHsmPkBDaLR2i3m2nSmFObWmo7YwK51KQdI6RY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3fb3707af869e32b0ad0676f589b16cc7711a376", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1706191920, "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", @@ -277,7 +431,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1705856552, "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", @@ -292,7 +446,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1706173671, "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", @@ -357,14 +511,46 @@ "type": "github" } }, + "pre-commit-hooks-nix": { + "inputs": { + "flake-compat": [ + "lanzaboote", + "flake-compat" + ], + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1706424699, + "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "extest": "extest", "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", + "lanzaboote": "lanzaboote", "linger": "linger", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "pihole": "pihole", "plasma-manager": "plasma-manager", @@ -372,11 +558,36 @@ "sops-nix": "sops-nix" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706494265, + "narHash": "sha256-4ilEUJEwNaY9r/8BpL3VmZiaGber0j09lvvx0e/bosA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "246ba7102553851af60e0382f558f6bc5f63fa13", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_4", + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_5", "nixpkgs-23_05": "nixpkgs-23_05", "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" @@ -398,8 +609,8 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs": "nixpkgs_6", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1706410821, @@ -430,6 +641,21 @@ "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" + } + }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/flake.nix b/flake.nix index 6351a63..ed6a712 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ plasma-manager, linger, pihole, + lanzaboote, ... } @ inputs: let inherit (self) outputs; From e8f857149a0de8f1e4d01ce5fb81e796d034ba4a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 18:14:27 +0100 Subject: [PATCH 1214/2308] Needed to add lanzaboot to the outputs (test first!) --- flake.lock | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 1 + 2 files changed, 234 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 8dcde63..eefcd59 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,27 @@ "type": "gitlab" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706473964, + "narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "c798790eabec3e3da48190ae3698ac227aab770c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "extest": { "inputs": { "extest": "extest_2", @@ -52,6 +73,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1668681692, @@ -67,6 +104,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -85,6 +143,46 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "pre-commit-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -125,6 +223,30 @@ "type": "github" } }, + "lanzaboote": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3", + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1706522979, + "narHash": "sha256-2wP2qEFVoZ9q8C9MZdAwXPKDkIIQiEwUzuzCxVKafDc=", + "owner": "nix-community", + "repo": "lanzaboote", + "rev": "c42edac7eb881315bb2a8dfd5190c8c87b91e084", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lanzaboote", + "type": "github" + } + }, "linger": { "inputs": { "flake-utils": [ @@ -214,6 +336,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1705957679, "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", @@ -262,6 +400,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1706370590, + "narHash": "sha256-vq8hTMHsmPkBDaLR2i3m2nSmFObWmo7YwK51KQdI6RY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3fb3707af869e32b0ad0676f589b16cc7711a376", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1706191920, "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", @@ -277,7 +431,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1705856552, "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", @@ -292,7 +446,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1706173671, "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", @@ -357,14 +511,46 @@ "type": "github" } }, + "pre-commit-hooks-nix": { + "inputs": { + "flake-compat": [ + "lanzaboote", + "flake-compat" + ], + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1706424699, + "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "extest": "extest", "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", + "lanzaboote": "lanzaboote", "linger": "linger", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "pihole": "pihole", "plasma-manager": "plasma-manager", @@ -372,11 +558,36 @@ "sops-nix": "sops-nix" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706494265, + "narHash": "sha256-4ilEUJEwNaY9r/8BpL3VmZiaGber0j09lvvx0e/bosA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "246ba7102553851af60e0382f558f6bc5f63fa13", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_4", + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_5", "nixpkgs-23_05": "nixpkgs-23_05", "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" @@ -398,8 +609,8 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs": "nixpkgs_6", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1706410821, @@ -430,6 +641,21 @@ "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" + } + }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/flake.nix b/flake.nix index 6351a63..ed6a712 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ plasma-manager, linger, pihole, + lanzaboote, ... } @ inputs: let inherit (self) outputs; From c57d206aaba8eee2cac97c31e98f568ad8334b22 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 20:41:54 +0100 Subject: [PATCH 1215/2308] I think I somehow forgot bcachefs support for EDI --- nixos/hosts/EDI/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 1929455..1272719 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -39,6 +39,8 @@ networking.hostName = "EDI"; boot.bootspec.enable = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.supportedFilesystems = ["bcachefs"]; boot = { loader.systemd-boot.enable = lib.mkForce false; lanzaboote = { From a9e7603352242f9b14ee9c890374cf671a7f05d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 Feb 2024 20:41:54 +0100 Subject: [PATCH 1216/2308] I think I somehow forgot bcachefs support for EDI --- nixos/hosts/EDI/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 1929455..1272719 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -39,6 +39,8 @@ networking.hostName = "EDI"; boot.bootspec.enable = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.supportedFilesystems = ["bcachefs"]; boot = { loader.systemd-boot.enable = lib.mkForce false; lanzaboote = { From 6ac3db7171c537f89c208f916490514409a3fec9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 Feb 2024 00:05:02 +0100 Subject: [PATCH 1217/2308] Add encrypted swap as well --- nixos/hosts/EDI/hardware-configuration.nix | 47 ++++++++++++---------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 008e857..be659e2 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -1,34 +1,39 @@ # 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") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628"; - fsType = "bcachefs"; - }; + fileSystems."/" = { + device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628"; + fsType = "bcachefs"; + }; boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/91da75e7-52bc-4a50-9293-7e5e431040e0"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/01B2-909E"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" "defaults" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/01B2-909E"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077" "defaults"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/6aa6422f-c724-4c67-851d-030daf5003fb"; } - ]; + swapDevices = [ + {device = "dev/disk/by-uuid/e2156681-e9de-49ca-8ed3-ae83cd696b89";} + {device = "/dev/disk/by-uuid/6aa6422f-c724-4c67-851d-030daf5003fb";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From 7aa8b51ca8cbb0f6ea5f62b01e77f5247f5e554a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 Feb 2024 00:05:02 +0100 Subject: [PATCH 1218/2308] Add encrypted swap as well --- nixos/hosts/EDI/hardware-configuration.nix | 47 ++++++++++++---------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 008e857..be659e2 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -1,34 +1,39 @@ # 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") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628"; - fsType = "bcachefs"; - }; + fileSystems."/" = { + device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628"; + fsType = "bcachefs"; + }; boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/91da75e7-52bc-4a50-9293-7e5e431040e0"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/01B2-909E"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" "defaults" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/01B2-909E"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077" "defaults"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/6aa6422f-c724-4c67-851d-030daf5003fb"; } - ]; + swapDevices = [ + {device = "dev/disk/by-uuid/e2156681-e9de-49ca-8ed3-ae83cd696b89";} + {device = "/dev/disk/by-uuid/6aa6422f-c724-4c67-851d-030daf5003fb";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From 60291499a3d5507303345ce885715cbe71f3e9f5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 Feb 2024 00:22:52 +0100 Subject: [PATCH 1219/2308] This is how we do that maybe? --- nixos/hosts/EDI/hardware-configuration.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index be659e2..c62d408 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -31,8 +31,10 @@ }; swapDevices = [ - {device = "dev/disk/by-uuid/e2156681-e9de-49ca-8ed3-ae83cd696b89";} - {device = "/dev/disk/by-uuid/6aa6422f-c724-4c67-851d-030daf5003fb";} + { + device = "dev/disk/by-uuid/2b4f0e94-65b4-4e98-8744-0c671954e524"; + randomEncryption.enable = true; + } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking From f16368cec463e4a0a6dc9276fbf516b75c24a7a7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 Feb 2024 00:22:52 +0100 Subject: [PATCH 1220/2308] This is how we do that maybe? --- nixos/hosts/EDI/hardware-configuration.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index be659e2..c62d408 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -31,8 +31,10 @@ }; swapDevices = [ - {device = "dev/disk/by-uuid/e2156681-e9de-49ca-8ed3-ae83cd696b89";} - {device = "/dev/disk/by-uuid/6aa6422f-c724-4c67-851d-030daf5003fb";} + { + device = "dev/disk/by-uuid/2b4f0e94-65b4-4e98-8744-0c671954e524"; + randomEncryption.enable = true; + } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking From 8598323c7516f36bf682e6896db414badc65a764 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 Feb 2024 00:36:42 +0100 Subject: [PATCH 1221/2308] That didn't work, maybe now? --- nixos/hosts/EDI/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index c62d408..ad2bffb 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -32,7 +32,7 @@ swapDevices = [ { - device = "dev/disk/by-uuid/2b4f0e94-65b4-4e98-8744-0c671954e524"; + device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1-part2"; randomEncryption.enable = true; } ]; From 2580164d413db26d3b6ee43481d3eaeec0b883b5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 Feb 2024 00:36:42 +0100 Subject: [PATCH 1222/2308] That didn't work, maybe now? --- nixos/hosts/EDI/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index c62d408..ad2bffb 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -32,7 +32,7 @@ swapDevices = [ { - device = "dev/disk/by-uuid/2b4f0e94-65b4-4e98-8744-0c671954e524"; + device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1-part2"; randomEncryption.enable = true; } ]; From 2f2c182b50312f87bbc0e7eec058461837e2503d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 Feb 2024 23:28:13 +0100 Subject: [PATCH 1223/2308] Add r2modman to glados --- home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index bf89721..90e56bb 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -24,6 +24,7 @@ home.packages = with pkgs; [ heroic + r2modman ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From ef0ba26bd81194f1d669c2f74e88f2a6ef295eb5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 Feb 2024 23:28:13 +0100 Subject: [PATCH 1224/2308] Add r2modman to glados --- home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix index bf89721..90e56bb 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix @@ -24,6 +24,7 @@ home.packages = with pkgs; [ heroic + r2modman ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From 613807c83f3186cf479079ba596cb4b4ad8823a7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Feb 2024 17:44:05 +0100 Subject: [PATCH 1225/2308] Update steam deck configs with small tweaks like enabling decky & update flake lock --- flake.lock | 84 ++++++++++++++-------------- nixos/hosts/shodan/configuration.nix | 4 ++ 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index eefcd59..e176ba3 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1706473964, - "narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=", + "lastModified": 1707075082, + "narHash": "sha256-PUplk5F5jlIyofxqn/xEDN9pbjrd0tnkd0pDsZ52db0=", "owner": "ipetkov", "repo": "crane", - "rev": "c798790eabec3e3da48190ae3698ac227aab770c", + "rev": "7d5b46c17d857ee9ddb2e8d88185729a3e5637b6", "type": "github" }, "original": { @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1706435589, - "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=", + "lastModified": 1707114923, + "narHash": "sha256-LDYPWa+BgxHSNEye93SyIPgz5u3RAfh78P9KyO+rQzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e", + "rev": "afcedcf2c8e424d0465e823cf833eb3adebe1db7", "type": "github" }, "original": { @@ -210,11 +210,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705667791, - "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", + "lastModified": 1707082092, + "narHash": "sha256-icyIxbBXl1iG8gvF/gjGI5N4Phpoo1vFcQxmUz2DsNA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", + "rev": "3a9a168c04218418a6321e157b0f7a31a9ca342c", "type": "github" }, "original": { @@ -234,11 +234,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1706522979, - "narHash": "sha256-2wP2qEFVoZ9q8C9MZdAwXPKDkIIQiEwUzuzCxVKafDc=", + "lastModified": 1707121196, + "narHash": "sha256-drevc7MfnMD0Ya811UPDCY5hkCOYXgDYr+oKwWLvF+E=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "c42edac7eb881315bb2a8dfd5190c8c87b91e084", + "rev": "f2bc0af580f0bb6e6a2d0bcf0cfb237b357ffbbf", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706367331, - "narHash": "sha256-AqgkGHRrI6h/8FWuVbnkfFmXr4Bqsr4fV23aISqj/xg=", + "lastModified": 1706925685, + "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "160b762eda6d139ac10ae081f8f78d640dd523eb", + "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1706913249, + "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "e92b6015881907e698782c77641aa49298330223", "type": "github" }, "original": { @@ -401,11 +401,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706370590, - "narHash": "sha256-vq8hTMHsmPkBDaLR2i3m2nSmFObWmo7YwK51KQdI6RY=", + "lastModified": 1707028810, + "narHash": "sha256-/WuTsaljhG9VpXRYnxbxkoxhXy6lotbey99CiBuP2GY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fb3707af869e32b0ad0676f589b16cc7711a376", + "rev": "5d75993fa5feaa333f3eadd83e0a08fc34432acc", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1706913249, + "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "e92b6015881907e698782c77641aa49298330223", "type": "github" }, "original": { @@ -448,11 +448,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1706173671, - "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", + "lastModified": 1706925685, + "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", + "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1706365059, - "narHash": "sha256-2+M4vliRmSHQwGb1q1krg5lWKYiX7rF/B9GF4AlzXW4=", + "lastModified": 1707045317, + "narHash": "sha256-o2NZJcNu2/M3qycZ2Z9sgIESQEBFmihbbA7//sp7yVA=", "owner": "pjones", "repo": "plasma-manager", - "rev": "64f31bc95c22b04896111e4c9921d3e1122c0a92", + "rev": "290cd65b65e2da11ca9fda69781ea9beb8a6f6ac", "type": "github" }, "original": { @@ -570,11 +570,11 @@ ] }, "locked": { - "lastModified": 1706494265, - "narHash": "sha256-4ilEUJEwNaY9r/8BpL3VmZiaGber0j09lvvx0e/bosA=", + "lastModified": 1707099356, + "narHash": "sha256-ph483MDKLi9I/gndYOieVP41es633DOOmPjEI50x5KU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "246ba7102553851af60e0382f558f6bc5f63fa13", + "rev": "61dfa5a8129f7edbe9150253c68f673f87b16fb1", "type": "github" }, "original": { @@ -593,11 +593,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1706219574, - "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", + "lastModified": 1706742486, + "narHash": "sha256-sv/MISTeD0rqeVivpZJpynboMWJp6i62OmrZX1rGl38=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", + "rev": "9e36323ae3dde787f761420465c3ae560f3dbf29", "type": "gitlab" }, "original": { @@ -613,11 +613,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1706410821, - "narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=", + "lastModified": 1707015547, + "narHash": "sha256-YZr0OrqWPdbwBhxpBu69D32ngJZw8AMgZtJeaJn0e94=", "owner": "Mic92", "repo": "sops-nix", - "rev": "73bf36912e31a6b21af6e0f39218e067283c67ef", + "rev": "23f61b897c00b66855074db471ba016e0cda20dd", "type": "github" }, "original": { diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 7e032ea..75fad57 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -131,6 +131,10 @@ #Enable auto updates for the BIOS and controller firmware jovian.devices.steamdeck.autoUpdate = true; + jovian.decky-loader.enable = true; + + jovian.hardware.has.amd.gpu = true; + programs.steam = { enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play From 57712f57db6b929f5aa8378d8fcc87e0b23933bd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Feb 2024 17:44:05 +0100 Subject: [PATCH 1226/2308] Update steam deck configs with small tweaks like enabling decky & update flake lock --- flake.lock | 84 ++++++++++++++-------------- nixos/hosts/shodan/configuration.nix | 4 ++ 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index eefcd59..e176ba3 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1706473964, - "narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=", + "lastModified": 1707075082, + "narHash": "sha256-PUplk5F5jlIyofxqn/xEDN9pbjrd0tnkd0pDsZ52db0=", "owner": "ipetkov", "repo": "crane", - "rev": "c798790eabec3e3da48190ae3698ac227aab770c", + "rev": "7d5b46c17d857ee9ddb2e8d88185729a3e5637b6", "type": "github" }, "original": { @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1706435589, - "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=", + "lastModified": 1707114923, + "narHash": "sha256-LDYPWa+BgxHSNEye93SyIPgz5u3RAfh78P9KyO+rQzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e", + "rev": "afcedcf2c8e424d0465e823cf833eb3adebe1db7", "type": "github" }, "original": { @@ -210,11 +210,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705667791, - "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", + "lastModified": 1707082092, + "narHash": "sha256-icyIxbBXl1iG8gvF/gjGI5N4Phpoo1vFcQxmUz2DsNA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", + "rev": "3a9a168c04218418a6321e157b0f7a31a9ca342c", "type": "github" }, "original": { @@ -234,11 +234,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1706522979, - "narHash": "sha256-2wP2qEFVoZ9q8C9MZdAwXPKDkIIQiEwUzuzCxVKafDc=", + "lastModified": 1707121196, + "narHash": "sha256-drevc7MfnMD0Ya811UPDCY5hkCOYXgDYr+oKwWLvF+E=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "c42edac7eb881315bb2a8dfd5190c8c87b91e084", + "rev": "f2bc0af580f0bb6e6a2d0bcf0cfb237b357ffbbf", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706367331, - "narHash": "sha256-AqgkGHRrI6h/8FWuVbnkfFmXr4Bqsr4fV23aISqj/xg=", + "lastModified": 1706925685, + "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "160b762eda6d139ac10ae081f8f78d640dd523eb", + "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1706913249, + "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "e92b6015881907e698782c77641aa49298330223", "type": "github" }, "original": { @@ -401,11 +401,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706370590, - "narHash": "sha256-vq8hTMHsmPkBDaLR2i3m2nSmFObWmo7YwK51KQdI6RY=", + "lastModified": 1707028810, + "narHash": "sha256-/WuTsaljhG9VpXRYnxbxkoxhXy6lotbey99CiBuP2GY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fb3707af869e32b0ad0676f589b16cc7711a376", + "rev": "5d75993fa5feaa333f3eadd83e0a08fc34432acc", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1706913249, + "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "e92b6015881907e698782c77641aa49298330223", "type": "github" }, "original": { @@ -448,11 +448,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1706173671, - "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", + "lastModified": 1706925685, + "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", + "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1706365059, - "narHash": "sha256-2+M4vliRmSHQwGb1q1krg5lWKYiX7rF/B9GF4AlzXW4=", + "lastModified": 1707045317, + "narHash": "sha256-o2NZJcNu2/M3qycZ2Z9sgIESQEBFmihbbA7//sp7yVA=", "owner": "pjones", "repo": "plasma-manager", - "rev": "64f31bc95c22b04896111e4c9921d3e1122c0a92", + "rev": "290cd65b65e2da11ca9fda69781ea9beb8a6f6ac", "type": "github" }, "original": { @@ -570,11 +570,11 @@ ] }, "locked": { - "lastModified": 1706494265, - "narHash": "sha256-4ilEUJEwNaY9r/8BpL3VmZiaGber0j09lvvx0e/bosA=", + "lastModified": 1707099356, + "narHash": "sha256-ph483MDKLi9I/gndYOieVP41es633DOOmPjEI50x5KU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "246ba7102553851af60e0382f558f6bc5f63fa13", + "rev": "61dfa5a8129f7edbe9150253c68f673f87b16fb1", "type": "github" }, "original": { @@ -593,11 +593,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1706219574, - "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", + "lastModified": 1706742486, + "narHash": "sha256-sv/MISTeD0rqeVivpZJpynboMWJp6i62OmrZX1rGl38=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", + "rev": "9e36323ae3dde787f761420465c3ae560f3dbf29", "type": "gitlab" }, "original": { @@ -613,11 +613,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1706410821, - "narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=", + "lastModified": 1707015547, + "narHash": "sha256-YZr0OrqWPdbwBhxpBu69D32ngJZw8AMgZtJeaJn0e94=", "owner": "Mic92", "repo": "sops-nix", - "rev": "73bf36912e31a6b21af6e0f39218e067283c67ef", + "rev": "23f61b897c00b66855074db471ba016e0cda20dd", "type": "github" }, "original": { diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 7e032ea..75fad57 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -131,6 +131,10 @@ #Enable auto updates for the BIOS and controller firmware jovian.devices.steamdeck.autoUpdate = true; + jovian.decky-loader.enable = true; + + jovian.hardware.has.amd.gpu = true; + programs.steam = { enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play From 5fb3e5ed7a74e4dcdf40deca8ec17eea96cdc03a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Feb 2024 18:23:09 +0100 Subject: [PATCH 1227/2308] Update configs to fix updates, and some minor tweaks --- nixos/hosts/shodan/configuration.nix | 4 ++-- nixos/server/package-configs/aria2/configuration.nix | 6 ++++++ nixos/server/package-configs/nextcloud/configuration.nix | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 75fad57..82d82c1 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -158,8 +158,8 @@ # Configure keymap in X11 services.xserver = { - layout = "us"; - xkbVariant = ""; + xkb.layout = "us"; + xkb.variant = ""; }; # Enable networking diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 6cf7791..f2a075c 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -1,4 +1,6 @@ { + inputs, + outputs, config, pkgs, ... @@ -7,9 +9,13 @@ users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; + sops.secrets."rpcSecret".mode = "0440"; + sops.secrets."rpcSecret".owner = config.users.users.aria2.name; + services.aria2 = { enable = true; downloadDir = "/var/lib/media"; rpcListenPort = 6969; + rpcSecretFile = config.sops.secrets."rpcSecret".path; }; } diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix index 4767bd5..2485eca 100644 --- a/nixos/server/package-configs/nextcloud/configuration.nix +++ b/nixos/server/package-configs/nextcloud/configuration.nix @@ -64,7 +64,7 @@ #Increase opcache string buffer phpOptions."opcache.interned_strings_buffer" = "23"; # Further forces Nextcloud to use HTTPS - extraOptions = { + settings = { overwriteprotocol = "https"; default_phone_region = "NL"; }; From df123f8f1f9ac2307b5bcc7efcfbc13a0cd63b5b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Feb 2024 18:23:09 +0100 Subject: [PATCH 1228/2308] Update configs to fix updates, and some minor tweaks --- nixos/hosts/shodan/configuration.nix | 4 ++-- nixos/server/package-configs/aria2/configuration.nix | 6 ++++++ nixos/server/package-configs/nextcloud/configuration.nix | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 75fad57..82d82c1 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -158,8 +158,8 @@ # Configure keymap in X11 services.xserver = { - layout = "us"; - xkbVariant = ""; + xkb.layout = "us"; + xkb.variant = ""; }; # Enable networking diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix index 6cf7791..f2a075c 100644 --- a/nixos/server/package-configs/aria2/configuration.nix +++ b/nixos/server/package-configs/aria2/configuration.nix @@ -1,4 +1,6 @@ { + inputs, + outputs, config, pkgs, ... @@ -7,9 +9,13 @@ users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; + sops.secrets."rpcSecret".mode = "0440"; + sops.secrets."rpcSecret".owner = config.users.users.aria2.name; + services.aria2 = { enable = true; downloadDir = "/var/lib/media"; rpcListenPort = 6969; + rpcSecretFile = config.sops.secrets."rpcSecret".path; }; } diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix index 4767bd5..2485eca 100644 --- a/nixos/server/package-configs/nextcloud/configuration.nix +++ b/nixos/server/package-configs/nextcloud/configuration.nix @@ -64,7 +64,7 @@ #Increase opcache string buffer phpOptions."opcache.interned_strings_buffer" = "23"; # Further forces Nextcloud to use HTTPS - extraOptions = { + settings = { overwriteprotocol = "https"; default_phone_region = "NL"; }; From ba8275abc5ec54d715cf4116e85bd2517004b5d8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Feb 2024 18:43:19 +0100 Subject: [PATCH 1229/2308] Add r2modman to shodan as well --- home-manager/hosts/shodan/shodan-Lillian.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 720cf2b..4675608 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -51,6 +51,7 @@ #Gaming: prismlauncher + r2modman # Multimedia: freetube From 8a051f20727faa5f033ee20fa67697a23b822ac6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Feb 2024 18:43:19 +0100 Subject: [PATCH 1230/2308] Add r2modman to shodan as well --- home-manager/hosts/shodan/shodan-Lillian.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/shodan-Lillian.nix index 720cf2b..4675608 100644 --- a/home-manager/hosts/shodan/shodan-Lillian.nix +++ b/home-manager/hosts/shodan/shodan-Lillian.nix @@ -51,6 +51,7 @@ #Gaming: prismlauncher + r2modman # Multimedia: freetube From 31e2300c5872611cba574b633d9179009c7cd9be Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 10:13:06 +0100 Subject: [PATCH 1231/2308] Add empty package config to EDI --- home-manager/hosts/EDI/EDI-Lillian.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/hosts/EDI/EDI-Lillian.nix b/home-manager/hosts/EDI/EDI-Lillian.nix index 613434a..fa92fc5 100644 --- a/home-manager/hosts/EDI/EDI-Lillian.nix +++ b/home-manager/hosts/EDI/EDI-Lillian.nix @@ -22,6 +22,9 @@ ./package-configs/plasma-desktop/configuration.nix ]; + home.packages = with pkgs; [ + ]; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "24.05"; } From 7e900a648453d338da7ffbe1bc088deab7fbb14f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 10:13:06 +0100 Subject: [PATCH 1232/2308] Add empty package config to EDI --- home-manager/hosts/EDI/EDI-Lillian.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/hosts/EDI/EDI-Lillian.nix b/home-manager/hosts/EDI/EDI-Lillian.nix index 613434a..fa92fc5 100644 --- a/home-manager/hosts/EDI/EDI-Lillian.nix +++ b/home-manager/hosts/EDI/EDI-Lillian.nix @@ -22,6 +22,9 @@ ./package-configs/plasma-desktop/configuration.nix ]; + home.packages = with pkgs; [ + ]; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "24.05"; } From b593b07ab8b3b65949d8e86a020b6b197982089d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 10:34:58 +0100 Subject: [PATCH 1233/2308] Remove podman and docker --- nixos/desktop/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index fb02a9d..60c232a 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -69,8 +69,6 @@ # System tools direnv - docker - docker-compose git-filter-repo pciutils waydroid From 5e4e4cc7eabebe01a16540ae6bb2c26d0424a85b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 10:34:58 +0100 Subject: [PATCH 1234/2308] Remove podman and docker --- nixos/desktop/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index fb02a9d..60c232a 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -69,8 +69,6 @@ # System tools direnv - docker - docker-compose git-filter-repo pciutils waydroid From bd83e851f48c961529e8359ead55918eeb3bb92c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 10:39:24 +0100 Subject: [PATCH 1235/2308] Remove docker group too --- nixos/desktop/configuration.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 60c232a..be24784 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -92,8 +92,6 @@ noisetorch ]; - virtualisation.waydroid.enable = false; - programs.direnv = { enable = true; }; @@ -162,7 +160,7 @@ users.users = { lillian = { isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; }; From 13a11897e1020a4420658b2fe984f6b7c98c2e5f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 10:39:24 +0100 Subject: [PATCH 1236/2308] Remove docker group too --- nixos/desktop/configuration.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 60c232a..be24784 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -92,8 +92,6 @@ noisetorch ]; - virtualisation.waydroid.enable = false; - programs.direnv = { enable = true; }; @@ -162,7 +160,7 @@ users.users = { lillian = { isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; shell = pkgs.zsh; }; }; From 0e0e64d1af174f5df4730bf33ce32d94673c8888 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 10:52:49 +0100 Subject: [PATCH 1237/2308] Flake lock update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e176ba3..74009f3 100644 --- a/flake.lock +++ b/flake.lock @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1707114923, - "narHash": "sha256-LDYPWa+BgxHSNEye93SyIPgz5u3RAfh78P9KyO+rQzI=", + "lastModified": 1707175763, + "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", "owner": "nix-community", "repo": "home-manager", - "rev": "afcedcf2c8e424d0465e823cf833eb3adebe1db7", + "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706925685, - "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "lastModified": 1707171055, + "narHash": "sha256-7ZiKRdhrScsDfhDkGy8yJWAT6BfHqa8PYMX04roU03k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", + "rev": "4b1aab22192b787355733c9495d47f4c66af084c", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1706913249, - "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e92b6015881907e698782c77641aa49298330223", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706913249, - "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e92b6015881907e698782c77641aa49298330223", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { From f486ef3125c7cc44ff4736258b9ba9d04de7de8f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 10:52:49 +0100 Subject: [PATCH 1238/2308] Flake lock update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e176ba3..74009f3 100644 --- a/flake.lock +++ b/flake.lock @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1707114923, - "narHash": "sha256-LDYPWa+BgxHSNEye93SyIPgz5u3RAfh78P9KyO+rQzI=", + "lastModified": 1707175763, + "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", "owner": "nix-community", "repo": "home-manager", - "rev": "afcedcf2c8e424d0465e823cf833eb3adebe1db7", + "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706925685, - "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "lastModified": 1707171055, + "narHash": "sha256-7ZiKRdhrScsDfhDkGy8yJWAT6BfHqa8PYMX04roU03k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", + "rev": "4b1aab22192b787355733c9495d47f4c66af084c", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1706913249, - "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e92b6015881907e698782c77641aa49298330223", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706913249, - "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e92b6015881907e698782c77641aa49298330223", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { From 428f2cd7ee78079901cf5ba0b3f4d4a7785a85b5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 12:45:33 +0100 Subject: [PATCH 1239/2308] Little format --- disko/EDI/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix index e240d0d..7af587c 100644 --- a/disko/EDI/configuration.nix +++ b/disko/EDI/configuration.nix @@ -45,11 +45,10 @@ #keyFile = "/tmp/secret.key"; }; #additionalKeyFiles = ["/tmp/additionalSecret.key"]; - content = { - type = "filesystem"; - format = "bcachefs"; - mountpoint = "/"; - }; + content = { + type = "filesystem"; + format = "bcachefs"; + mountpoint = "/"; }; }; }; @@ -57,4 +56,5 @@ }; }; }; + }; } From bc9f22977921f8c7a08884cc54fbd0ca779784a8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 12:45:33 +0100 Subject: [PATCH 1240/2308] Little format --- disko/EDI/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix index e240d0d..7af587c 100644 --- a/disko/EDI/configuration.nix +++ b/disko/EDI/configuration.nix @@ -45,11 +45,10 @@ #keyFile = "/tmp/secret.key"; }; #additionalKeyFiles = ["/tmp/additionalSecret.key"]; - content = { - type = "filesystem"; - format = "bcachefs"; - mountpoint = "/"; - }; + content = { + type = "filesystem"; + format = "bcachefs"; + mountpoint = "/"; }; }; }; @@ -57,4 +56,5 @@ }; }; }; + }; } From 2a73851e2a301bedf6564d6a7046b1b4f2691943 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 13:31:04 +0100 Subject: [PATCH 1241/2308] Let's just add a rootless docker --- nixos/hosts/EDI/configuration.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 1272719..43f8eef 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -36,6 +36,16 @@ }; }; + environment.systemPackages = with pkgs; [ + docker + docker-compose + ]; + + virtualisation.docker = { + enable = true; + rootless.enable = true; + }; + networking.hostName = "EDI"; boot.bootspec.enable = true; From 2be00d0fff62fb7ef425753e31b01d9a6bb4f015 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 13:31:04 +0100 Subject: [PATCH 1242/2308] Let's just add a rootless docker --- nixos/hosts/EDI/configuration.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 1272719..43f8eef 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -36,6 +36,16 @@ }; }; + environment.systemPackages = with pkgs; [ + docker + docker-compose + ]; + + virtualisation.docker = { + enable = true; + rootless.enable = true; + }; + networking.hostName = "EDI"; boot.bootspec.enable = true; From 80d59778cba32742ab634878e1b14c9e8b5f6119 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 14:29:39 +0100 Subject: [PATCH 1243/2308] Add lillian to docker group --- nixos/hosts/EDI/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 43f8eef..077051f 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -61,6 +61,8 @@ # Enable bluetooth hardware hardware.bluetooth.enable = true; + users.users.lillian.extraGroups = ["docker"]; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } From ca91474fa2dc4c947f6d222d9c00297e8221aa4a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 14:29:39 +0100 Subject: [PATCH 1244/2308] Add lillian to docker group --- nixos/hosts/EDI/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 43f8eef..077051f 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -61,6 +61,8 @@ # Enable bluetooth hardware hardware.bluetooth.enable = true; + users.users.lillian.extraGroups = ["docker"]; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } From 34a0d0609d349c4fb7150975f725f953f7fabc06 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 14:31:35 +0100 Subject: [PATCH 1245/2308] Set socket variable too --- nixos/hosts/EDI/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 077051f..b3453ec 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -43,7 +43,10 @@ virtualisation.docker = { enable = true; - rootless.enable = true; + rootless = { + enable = true; + setSocketVariable = true; + }; }; networking.hostName = "EDI"; From 02842cdace8ff224b8967de3f443a8072ebb0c20 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 14:31:35 +0100 Subject: [PATCH 1246/2308] Set socket variable too --- nixos/hosts/EDI/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 077051f..b3453ec 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -43,7 +43,10 @@ virtualisation.docker = { enable = true; - rootless.enable = true; + rootless = { + enable = true; + setSocketVariable = true; + }; }; networking.hostName = "EDI"; From 43928ac5557bc588fcad7ce31472078076dda7c0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 14:47:32 +0100 Subject: [PATCH 1247/2308] Replace docker with podman --- nixos/hosts/EDI/configuration.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index b3453ec..c7fd076 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -37,16 +37,13 @@ }; environment.systemPackages = with pkgs; [ - docker - docker-compose + podman + podman-compose ]; - virtualisation.docker = { + virtualisation.podman = { enable = true; - rootless = { - enable = true; - setSocketVariable = true; - }; + dockerCompat = true; }; networking.hostName = "EDI"; From a4139d6c9e567bf6150538c7d23f2e9801da8505 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 14:47:32 +0100 Subject: [PATCH 1248/2308] Replace docker with podman --- nixos/hosts/EDI/configuration.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index b3453ec..c7fd076 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -37,16 +37,13 @@ }; environment.systemPackages = with pkgs; [ - docker - docker-compose + podman + podman-compose ]; - virtualisation.docker = { + virtualisation.podman = { enable = true; - rootless = { - enable = true; - setSocketVariable = true; - }; + dockerCompat = true; }; networking.hostName = "EDI"; From 4216c059196cd173e8a66ac38946f0206c2ddb79 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 14:59:49 +0100 Subject: [PATCH 1249/2308] Test removing podman and using devshell --- nixos/hosts/EDI/configuration.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index c7fd076..9265174 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -37,15 +37,8 @@ }; environment.systemPackages = with pkgs; [ - podman - podman-compose ]; - virtualisation.podman = { - enable = true; - dockerCompat = true; - }; - networking.hostName = "EDI"; boot.bootspec.enable = true; From 3c54f2c96245732df0caf934764ad14917326c43 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 14:59:49 +0100 Subject: [PATCH 1250/2308] Test removing podman and using devshell --- nixos/hosts/EDI/configuration.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index c7fd076..9265174 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -37,15 +37,8 @@ }; environment.systemPackages = with pkgs; [ - podman - podman-compose ]; - virtualisation.podman = { - enable = true; - dockerCompat = true; - }; - networking.hostName = "EDI"; boot.bootspec.enable = true; From db404115293681cc79de6894677c13656d1fdee3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 15:13:04 +0100 Subject: [PATCH 1251/2308] Never mind that --- nixos/hosts/EDI/configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 9265174..c7fd076 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -37,8 +37,15 @@ }; environment.systemPackages = with pkgs; [ + podman + podman-compose ]; + virtualisation.podman = { + enable = true; + dockerCompat = true; + }; + networking.hostName = "EDI"; boot.bootspec.enable = true; From ece66466d60d8178e10160a76a259a326fb14156 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 15:13:04 +0100 Subject: [PATCH 1252/2308] Never mind that --- nixos/hosts/EDI/configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 9265174..c7fd076 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -37,8 +37,15 @@ }; environment.systemPackages = with pkgs; [ + podman + podman-compose ]; + virtualisation.podman = { + enable = true; + dockerCompat = true; + }; + networking.hostName = "EDI"; boot.bootspec.enable = true; From 4e2199b8ebe1a620392e821ab984eee6a6fbd847 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 20:21:41 +0100 Subject: [PATCH 1253/2308] try this autologin on shodan for sddm --- nixos/hosts/shodan/configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 82d82c1..34382fb 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -152,6 +152,13 @@ services.xserver.desktopManager.plasma5.enable = true; programs.kdeconnect.enable = true; + services.xserver.displayManager.sddm.settings = { + Autologin = { + Session = "plasma.desktop"; + User = "lillian"; + }; + }; + # Enable flatpak support services.flatpak.enable = true; services.packagekit.enable = true; From 68980819f37392ee3674a7d007651ad7501691c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 20:21:41 +0100 Subject: [PATCH 1254/2308] try this autologin on shodan for sddm --- nixos/hosts/shodan/configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 82d82c1..34382fb 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -152,6 +152,13 @@ services.xserver.desktopManager.plasma5.enable = true; programs.kdeconnect.enable = true; + services.xserver.displayManager.sddm.settings = { + Autologin = { + Session = "plasma.desktop"; + User = "lillian"; + }; + }; + # Enable flatpak support services.flatpak.enable = true; services.packagekit.enable = true; From fa6a06c51ea3bf0564f1add90c91b94c451ae5ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 7 Feb 2024 11:32:43 +0100 Subject: [PATCH 1255/2308] Update public key from rsa to ed25519 --- nixos/hosts/queen/configuration.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index bdd26b5..2a20f4f 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -151,7 +151,7 @@ users.users = { lillian = { openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" ]; isNormalUser = true; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 5d26cea..4e07297 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -120,7 +120,7 @@ users.users = { lillian = { openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" ]; isNormalUser = true; From 67c199ae8190135ec37b2bbe39d78ed57bfd0f5b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 7 Feb 2024 11:32:43 +0100 Subject: [PATCH 1256/2308] Update public key from rsa to ed25519 --- nixos/hosts/queen/configuration.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index bdd26b5..2a20f4f 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -151,7 +151,7 @@ users.users = { lillian = { openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" ]; isNormalUser = true; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 5d26cea..4e07297 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -120,7 +120,7 @@ users.users = { lillian = { openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" ]; isNormalUser = true; From f7b36ba22497c9a5b33a4835ebb9241c77b133d3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 7 Feb 2024 13:50:03 +0100 Subject: [PATCH 1257/2308] Big refactor, test first --- .../{configuration.nix => default.nix} | 0 home-manager/hosts/EDI/default.nix | 13 +++++++++++ .../EDI/{EDI-Lillian.nix => lillian.nix} | 4 ++-- .../{configuration.nix => default.nix} | 0 home-manager/hosts/GLaDOS/default.nix | 13 +++++++++++ .../{GLaDOS-Lillian.nix => lillian.nix} | 4 ++-- .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 5 +---- nixos/hosts/EDI/configuration.nix | 4 ++-- nixos/hosts/GLaDOS/configuration.nix | 2 +- nixos/hosts/queen/configuration.nix | 19 +++------------- nixos/hosts/shodan/configuration.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 4 ++-- .../akkoma/{configuration.nix => default.nix} | 0 .../aria2/{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 nixos/server/package-configs/default.nix | 22 +++++++++++++++++++ .../dex/{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../ombi/{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 0 nixos/shared/default.nix | 13 +++++++++++ .../locale/{configuration.nix => default.nix} | 0 .../{configuration.nix => default.nix} | 1 + 30 files changed, 76 insertions(+), 30 deletions(-) rename home-manager/desktop/{configuration.nix => default.nix} (100%) create mode 100644 home-manager/hosts/EDI/default.nix rename home-manager/hosts/EDI/{EDI-Lillian.nix => lillian.nix} (88%) rename home-manager/hosts/EDI/package-configs/plasma-desktop/{configuration.nix => default.nix} (100%) create mode 100644 home-manager/hosts/GLaDOS/default.nix rename home-manager/hosts/GLaDOS/{GLaDOS-Lillian.nix => lillian.nix} (89%) rename home-manager/hosts/GLaDOS/package-configs/plasma-desktop/{configuration.nix => default.nix} (100%) rename nixos/board/package-configs/pi-hole/{configuration.nix => default.nix} (100%) rename nixos/desktop/{configuration.nix => default.nix} (97%) rename nixos/server/package-configs/akkoma/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/aria2/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/conduit/{configuration.nix => default.nix} (100%) create mode 100644 nixos/server/package-configs/default.nix rename nixos/server/package-configs/dex/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/forgejo/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/gotosocial/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/jellyfin/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/mail-server/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/nextcloud/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/ombi/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/postgres/{configuration.nix => default.nix} (100%) rename nixos/server/package-configs/roundcube/{configuration.nix => default.nix} (100%) create mode 100644 nixos/shared/default.nix rename nixos/shared/locale/{configuration.nix => default.nix} (100%) rename nixos/shared/packages/{configuration.nix => default.nix} (97%) diff --git a/home-manager/desktop/configuration.nix b/home-manager/desktop/default.nix similarity index 100% rename from home-manager/desktop/configuration.nix rename to home-manager/desktop/default.nix diff --git a/home-manager/hosts/EDI/default.nix b/home-manager/hosts/EDI/default.nix new file mode 100644 index 0000000..c17b81a --- /dev/null +++ b/home-manager/hosts/EDI/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + ./lillian.nix + ]; +} diff --git a/home-manager/hosts/EDI/EDI-Lillian.nix b/home-manager/hosts/EDI/lillian.nix similarity index 88% rename from home-manager/hosts/EDI/EDI-Lillian.nix rename to home-manager/hosts/EDI/lillian.nix index fa92fc5..56283bb 100644 --- a/home-manager/hosts/EDI/EDI-Lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -18,8 +18,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../../desktop/configuration.nix - ./package-configs/plasma-desktop/configuration.nix + ../../desktop + ./package-configs/plasma-desktop ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix similarity index 100% rename from home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix rename to home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix diff --git a/home-manager/hosts/GLaDOS/default.nix b/home-manager/hosts/GLaDOS/default.nix new file mode 100644 index 0000000..c17b81a --- /dev/null +++ b/home-manager/hosts/GLaDOS/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + ./lillian.nix + ]; +} diff --git a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix similarity index 89% rename from home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix rename to home-manager/hosts/GLaDOS/lillian.nix index 90e56bb..8558582 100644 --- a/home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -18,8 +18,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../../desktop/configuration.nix - ./package-configs/plasma-desktop/configuration.nix + ../../desktop + ./package-configs/plasma-desktop ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/default.nix similarity index 100% rename from home-manager/hosts/GLaDOS/package-configs/plasma-desktop/configuration.nix rename to home-manager/hosts/GLaDOS/package-configs/plasma-desktop/default.nix diff --git a/nixos/board/package-configs/pi-hole/configuration.nix b/nixos/board/package-configs/pi-hole/default.nix similarity index 100% rename from nixos/board/package-configs/pi-hole/configuration.nix rename to nixos/board/package-configs/pi-hole/default.nix diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/default.nix similarity index 97% rename from nixos/desktop/configuration.nix rename to nixos/desktop/default.nix index be24784..905cd38 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/default.nix @@ -9,11 +9,8 @@ ... }: { imports = [ - # Import locale settings - ../shared/locale/configuration.nix - # Import shared packages - ../shared/packages/configuration.nix + ../shared ]; nixpkgs = { # You can add overlays here diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index c7fd076..de5b0d9 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - ../../desktop/configuration.nix + ../../desktop # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix @@ -32,7 +32,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../../home-manager/hosts/EDI/EDI-Lillian.nix; + lillian = import ../../../home-manager/hosts/EDI; }; }; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index d42cb1c..7026ff6 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -22,7 +22,7 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - ../../desktop/configuration.nix + ../../desktop # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 2a20f4f..35610d2 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -18,24 +18,11 @@ # ./nvim.nix ./hardware-configuration.nix - # Import locale settings - ../../shared/locale/configuration.nix - - # Import shared packages - ../../shared/packages/configuration.nix + # Import shared settings + ../../shared #../../server/package-configs/akkoma/configuration.nix - ../../server/package-configs/forgejo/configuration.nix - ../../server/package-configs/gotosocial/configuration.nix - ../../server/package-configs/mail-server/configuration.nix - ../../server/package-configs/nextcloud/configuration.nix - ../../server/package-configs/postgres/configuration.nix - ../../server/package-configs/postgres/upgrade.nix - ../../server/package-configs/roundcube/configuration.nix - ../../server/package-configs/jellyfin/configuration.nix - ../../server/package-configs/ombi/configuration.nix - ../../server/package-configs/aria2/configuration.nix - ../../server/package-configs/conduit/configuration.nix + ../../server ]; boot.tmp.cleanOnBoot = true; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 34382fb..50a7f73 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -16,7 +16,7 @@ # inputs.nix-colors.homeManagerModules.default # Import the locale settings - ../../shared/locale/configuration.nix + ../../shared # You can also split up your configuration and import pieces of it here: # ./nvim.nix diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 4e07297..fe691ae 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -16,10 +16,10 @@ ./hardware-configuration.nix # Import locale settings - ../../shared/locale/configuration.nix + ../../shared/locale # Import shared packages - ../../shared/packages/configuration.nix + ../../shared/packages ]; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/server/package-configs/akkoma/configuration.nix b/nixos/server/package-configs/akkoma/default.nix similarity index 100% rename from nixos/server/package-configs/akkoma/configuration.nix rename to nixos/server/package-configs/akkoma/default.nix diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/default.nix similarity index 100% rename from nixos/server/package-configs/aria2/configuration.nix rename to nixos/server/package-configs/aria2/default.nix diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/default.nix similarity index 100% rename from nixos/server/package-configs/conduit/configuration.nix rename to nixos/server/package-configs/conduit/default.nix diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix new file mode 100644 index 0000000..6fef896 --- /dev/null +++ b/nixos/server/package-configs/default.nix @@ -0,0 +1,22 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + ./aria2 + ./conduit + ./dex + ./forgejo + ./gotosocial + ./jellyfin + ./mail-server + ./nextcloud + ./ombi + ./postgres + ./roundcube + ]; +} diff --git a/nixos/server/package-configs/dex/configuration.nix b/nixos/server/package-configs/dex/default.nix similarity index 100% rename from nixos/server/package-configs/dex/configuration.nix rename to nixos/server/package-configs/dex/default.nix diff --git a/nixos/server/package-configs/forgejo/configuration.nix b/nixos/server/package-configs/forgejo/default.nix similarity index 100% rename from nixos/server/package-configs/forgejo/configuration.nix rename to nixos/server/package-configs/forgejo/default.nix diff --git a/nixos/server/package-configs/gotosocial/configuration.nix b/nixos/server/package-configs/gotosocial/default.nix similarity index 100% rename from nixos/server/package-configs/gotosocial/configuration.nix rename to nixos/server/package-configs/gotosocial/default.nix diff --git a/nixos/server/package-configs/jellyfin/configuration.nix b/nixos/server/package-configs/jellyfin/default.nix similarity index 100% rename from nixos/server/package-configs/jellyfin/configuration.nix rename to nixos/server/package-configs/jellyfin/default.nix diff --git a/nixos/server/package-configs/mail-server/configuration.nix b/nixos/server/package-configs/mail-server/default.nix similarity index 100% rename from nixos/server/package-configs/mail-server/configuration.nix rename to nixos/server/package-configs/mail-server/default.nix diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/default.nix similarity index 100% rename from nixos/server/package-configs/nextcloud/configuration.nix rename to nixos/server/package-configs/nextcloud/default.nix diff --git a/nixos/server/package-configs/ombi/configuration.nix b/nixos/server/package-configs/ombi/default.nix similarity index 100% rename from nixos/server/package-configs/ombi/configuration.nix rename to nixos/server/package-configs/ombi/default.nix diff --git a/nixos/server/package-configs/postgres/configuration.nix b/nixos/server/package-configs/postgres/default.nix similarity index 100% rename from nixos/server/package-configs/postgres/configuration.nix rename to nixos/server/package-configs/postgres/default.nix diff --git a/nixos/server/package-configs/roundcube/configuration.nix b/nixos/server/package-configs/roundcube/default.nix similarity index 100% rename from nixos/server/package-configs/roundcube/configuration.nix rename to nixos/server/package-configs/roundcube/default.nix diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix new file mode 100644 index 0000000..281b3e1 --- /dev/null +++ b/nixos/shared/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + ./locale + ./packages + ]; +} diff --git a/nixos/shared/locale/configuration.nix b/nixos/shared/locale/default.nix similarity index 100% rename from nixos/shared/locale/configuration.nix rename to nixos/shared/locale/default.nix diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/default.nix similarity index 97% rename from nixos/shared/packages/configuration.nix rename to nixos/shared/packages/default.nix index d16f35f..f262768 100644 --- a/nixos/shared/packages/configuration.nix +++ b/nixos/shared/packages/default.nix @@ -20,6 +20,7 @@ spacevim wget zsh + tldr # System libraries noto-fonts From 9212baeb301aedd5b790538350c135ddb8e432fb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 7 Feb 2024 13:52:23 +0100 Subject: [PATCH 1258/2308] Some more things I missed, let's test again --- nixos/hosts/GLaDOS/configuration.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 7026ff6..71ba601 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -38,7 +38,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../../home-manager/hosts/GLaDOS/GLaDOS-Lillian.nix; + lillian = import ../../../home-manager/hosts/GLaDOS; }; }; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 35610d2..ac30503 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -154,7 +154,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../../home-manager/hosts/queen/queen-Lillian.nix; + lillian = import ../../../home-manager/hosts/queen; }; }; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 50a7f73..0eb3bed 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -230,7 +230,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../../home-manager/hosts/shodan/shodan-Lillian.nix; + lillian = import ../../../home-manager/hosts/shodan; }; }; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index fe691ae..a463516 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -133,7 +133,7 @@ extraSpecialArgs = {inherit inputs outputs;}; users = { # Import your home-manager configuration - lillian = import ../../../home-manager/hosts/wheatley/wheatley-Lillian.nix; + lillian = import ../../../home-manager/hosts/wheatley; }; }; From ecd0c71f3faec498c25d0a93b862aa1b7603d111 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 7 Feb 2024 13:54:34 +0100 Subject: [PATCH 1259/2308] Let's make a default for the server config too --- nixos/server/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 nixos/server/default.nix diff --git a/nixos/server/default.nix b/nixos/server/default.nix new file mode 100644 index 0000000..75e56d1 --- /dev/null +++ b/nixos/server/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + ./package-configs + ]; +} From 0656d12fa3d50a08cd2af3afd360d1c7da27b291 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 7 Feb 2024 13:57:20 +0100 Subject: [PATCH 1260/2308] Rename and refactor the users too --- home-manager/hosts/queen/default.nix | 13 +++++++++++++ .../hosts/queen/{queen-Lillian.nix => lillian.nix} | 0 home-manager/hosts/shodan/default.nix | 13 +++++++++++++ .../shodan/{shodan-Lillian.nix => lillian.nix} | 0 4 files changed, 26 insertions(+) create mode 100644 home-manager/hosts/queen/default.nix rename home-manager/hosts/queen/{queen-Lillian.nix => lillian.nix} (100%) create mode 100644 home-manager/hosts/shodan/default.nix rename home-manager/hosts/shodan/{shodan-Lillian.nix => lillian.nix} (100%) diff --git a/home-manager/hosts/queen/default.nix b/home-manager/hosts/queen/default.nix new file mode 100644 index 0000000..c17b81a --- /dev/null +++ b/home-manager/hosts/queen/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + ./lillian.nix + ]; +} diff --git a/home-manager/hosts/queen/queen-Lillian.nix b/home-manager/hosts/queen/lillian.nix similarity index 100% rename from home-manager/hosts/queen/queen-Lillian.nix rename to home-manager/hosts/queen/lillian.nix diff --git a/home-manager/hosts/shodan/default.nix b/home-manager/hosts/shodan/default.nix new file mode 100644 index 0000000..c17b81a --- /dev/null +++ b/home-manager/hosts/shodan/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + ./lillian.nix + ]; +} diff --git a/home-manager/hosts/shodan/shodan-Lillian.nix b/home-manager/hosts/shodan/lillian.nix similarity index 100% rename from home-manager/hosts/shodan/shodan-Lillian.nix rename to home-manager/hosts/shodan/lillian.nix From e105ac45a847e18255c40be6a576965cc07a8a93 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 7 Feb 2024 14:00:24 +0100 Subject: [PATCH 1261/2308] And for wheatley finally as well --- home-manager/hosts/wheatley/default.nix | 13 +++++++++++++ .../wheatley/{wheatley-Lillian.nix => lillian.nix} | 0 2 files changed, 13 insertions(+) create mode 100644 home-manager/hosts/wheatley/default.nix rename home-manager/hosts/wheatley/{wheatley-Lillian.nix => lillian.nix} (100%) diff --git a/home-manager/hosts/wheatley/default.nix b/home-manager/hosts/wheatley/default.nix new file mode 100644 index 0000000..c17b81a --- /dev/null +++ b/home-manager/hosts/wheatley/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + ./lillian.nix + ]; +} diff --git a/home-manager/hosts/wheatley/wheatley-Lillian.nix b/home-manager/hosts/wheatley/lillian.nix similarity index 100% rename from home-manager/hosts/wheatley/wheatley-Lillian.nix rename to home-manager/hosts/wheatley/lillian.nix From c13c687215d4275d0b2ee797edfba37c44e37de7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 7 Feb 2024 14:39:27 +0100 Subject: [PATCH 1262/2308] Add gpg fingerprint to gpg config --- home-manager/desktop/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 5f3920c..12093bb 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -137,6 +137,17 @@ ]; }; + programs.gpg.settings = { + default-key = "0d43 5407 034c 2ad9 2d42 799d 280e 061d ff60 0f0d"; + default-recipient-self = true; + auto-key-locate = "local,wkd,keyserver"; + keyserver = "hkps://keys.openpgp.org"; + auto-key-retrieve = true; + auto-key-import = true; + keyserver-options = "honor-keyserver-url"; + no-autostart = true; + }; + # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; } From 4ca5a724f2d33a55d0177b220efb1e66340004fb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 7 Feb 2024 14:40:25 +0100 Subject: [PATCH 1263/2308] Enable gpg as well --- home-manager/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 12093bb..dc3301e 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -137,6 +137,7 @@ ]; }; + programs.gpg.enable = true; programs.gpg.settings = { default-key = "0d43 5407 034c 2ad9 2d42 799d 280e 061d ff60 0f0d"; default-recipient-self = true; From 4ade64ac06e89a2886395bfb481544fb661c871c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Feb 2024 10:36:52 +0100 Subject: [PATCH 1264/2308] Add gnupg to desktops --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 905cd38..ddd08a1 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -67,6 +67,7 @@ # System tools direnv git-filter-repo + gnupg pciutils waydroid xwaylandvideobridge From a83f77e9d57868c0ad78cb0df89527266f9562c1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Feb 2024 12:55:17 +0100 Subject: [PATCH 1265/2308] added .envrc to global gitignore --- home-manager/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index dc3301e..4eab3e0 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -134,6 +134,7 @@ ignores = [ "*.direnv" "*.vscode" + ".envrc" ]; }; From e68bf2bd97d85bd73066a7eada4a72561116d2f4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Feb 2024 21:38:07 +0100 Subject: [PATCH 1266/2308] Add maintanance times to nextcloud and update flake lock --- flake.lock | 44 +++++++++---------- .../package-configs/nextcloud/default.nix | 1 + 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 74009f3..4c58b77 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707082092, - "narHash": "sha256-icyIxbBXl1iG8gvF/gjGI5N4Phpoo1vFcQxmUz2DsNA=", + "lastModified": 1707226874, + "narHash": "sha256-uo3oGHc/oLbcS6tDlm+Z130tQNRX2ufs9r+kGRTx0Ng=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3a9a168c04218418a6321e157b0f7a31a9ca342c", + "rev": "8f355736d9449a6650418f8e70f8dacf652401a7", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707171055, - "narHash": "sha256-7ZiKRdhrScsDfhDkGy8yJWAT6BfHqa8PYMX04roU03k=", + "lastModified": 1707393347, + "narHash": "sha256-xmHgBMyF+Glxs3f8r+AMxJDTNUS01Q5kMjQdgAyw+B8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4b1aab22192b787355733c9495d47f4c66af084c", + "rev": "c0b7a892fb042ede583bdaecbbdc804acb85eabe", "type": "github" }, "original": { @@ -353,27 +353,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", + "lastModified": 1707391491, + "narHash": "sha256-TyDXcq8Z3slMNeyeF+ke0BzISWuM6NrBklr7XyiRbZA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", + "rev": "bc6cb3d59b7aab88e967264254f8c1aa4c0284e9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -448,11 +448,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1706925685, - "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -613,11 +613,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1707015547, - "narHash": "sha256-YZr0OrqWPdbwBhxpBu69D32ngJZw8AMgZtJeaJn0e94=", + "lastModified": 1707397511, + "narHash": "sha256-pYqXcTjcPC/go3FzT1dYtYsbmzAjO1MHhT/xgiI6J7o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "23f61b897c00b66855074db471ba016e0cda20dd", + "rev": "2168851d58595431ee11ebfc3a49d60d318b7312", "type": "github" }, "original": { diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 2485eca..7310860 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -67,6 +67,7 @@ settings = { overwriteprotocol = "https"; default_phone_region = "NL"; + maintainance_window_start = 3; }; appstoreEnable = true; extraAppsEnable = true; From de279dc3d7bbe10226ea1419188ee7944924f136 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Feb 2024 21:46:24 +0100 Subject: [PATCH 1267/2308] Typo, fixed it --- nixos/server/package-configs/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 7310860..d6322e5 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -67,7 +67,7 @@ settings = { overwriteprotocol = "https"; default_phone_region = "NL"; - maintainance_window_start = 3; + maintenance_window_start = 3; }; appstoreEnable = true; extraAppsEnable = true; From e4fca29931a5c382705325994b8b78c493547851 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Feb 2024 21:46:54 +0100 Subject: [PATCH 1268/2308] remove dex --- nixos/server/package-configs/default.nix | 1 - nixos/server/package-configs/dex/default.nix | 31 -------------------- 2 files changed, 32 deletions(-) delete mode 100644 nixos/server/package-configs/dex/default.nix diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 6fef896..44bc602 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -9,7 +9,6 @@ imports = [ ./aria2 ./conduit - ./dex ./forgejo ./gotosocial ./jellyfin diff --git a/nixos/server/package-configs/dex/default.nix b/nixos/server/package-configs/dex/default.nix deleted file mode 100644 index 7779479..0000000 --- a/nixos/server/package-configs/dex/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - pkgs, - ... -}: { - services.dex = { - enable = true; - # You can add secret files here - environmentFile = null; - settings = { - # External url - issuer = "http://127.0.0.1:5556/dex"; - storage = { - type = "postgres"; - config.host = "/var/run/postgres"; - }; - web = { - http = "127.0.0.1:5556"; - }; - enablePasswordDB = true; - staticClients = [ - { - id = "oidcclient"; - name = "Client"; - redirectURIs = ["https://example.com/callback"]; - secretFile = "/etc/dex/oidcclient"; # The content of `secretFile` will be written into to the config as `secret`. - } - ]; - }; - }; -} From 14c2f4fcb7ef5c86a9fbc0cc13214a5746af2f65 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 9 Feb 2024 21:52:23 +0100 Subject: [PATCH 1269/2308] Disable this to comply to CnD --- nixos/server/package-configs/aria2/default.nix | 2 +- nixos/server/package-configs/ombi/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/aria2/default.nix b/nixos/server/package-configs/aria2/default.nix index f2a075c..f614747 100644 --- a/nixos/server/package-configs/aria2/default.nix +++ b/nixos/server/package-configs/aria2/default.nix @@ -13,7 +13,7 @@ sops.secrets."rpcSecret".owner = config.users.users.aria2.name; services.aria2 = { - enable = true; + enable = false; downloadDir = "/var/lib/media"; rpcListenPort = 6969; rpcSecretFile = config.sops.secrets."rpcSecret".path; diff --git a/nixos/server/package-configs/ombi/default.nix b/nixos/server/package-configs/ombi/default.nix index 7065ae5..b3a019c 100644 --- a/nixos/server/package-configs/ombi/default.nix +++ b/nixos/server/package-configs/ombi/default.nix @@ -7,7 +7,7 @@ ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"]; }; services.ombi = { - enable = true; + enable = false; port = 2368; }; From cbcccc11ca4f05d4a8ad5a194de049263941eb2d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 9 Feb 2024 21:53:50 +0100 Subject: [PATCH 1270/2308] Should probably do that this way --- nixos/server/package-configs/aria2/default.nix | 2 +- nixos/server/package-configs/default.nix | 2 -- nixos/server/package-configs/ombi/default.nix | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/server/package-configs/aria2/default.nix b/nixos/server/package-configs/aria2/default.nix index f614747..f2a075c 100644 --- a/nixos/server/package-configs/aria2/default.nix +++ b/nixos/server/package-configs/aria2/default.nix @@ -13,7 +13,7 @@ sops.secrets."rpcSecret".owner = config.users.users.aria2.name; services.aria2 = { - enable = false; + enable = true; downloadDir = "/var/lib/media"; rpcListenPort = 6969; rpcSecretFile = config.sops.secrets."rpcSecret".path; diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 44bc602..0f0f339 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -7,14 +7,12 @@ ... }: { imports = [ - ./aria2 ./conduit ./forgejo ./gotosocial ./jellyfin ./mail-server ./nextcloud - ./ombi ./postgres ./roundcube ]; diff --git a/nixos/server/package-configs/ombi/default.nix b/nixos/server/package-configs/ombi/default.nix index b3a019c..7065ae5 100644 --- a/nixos/server/package-configs/ombi/default.nix +++ b/nixos/server/package-configs/ombi/default.nix @@ -7,7 +7,7 @@ ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"]; }; services.ombi = { - enable = false; + enable = true; port = 2368; }; From 979d86a858784cf327f5a2d0660029250dbbbe4b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 9 Feb 2024 21:55:58 +0100 Subject: [PATCH 1271/2308] This as well --- nixos/server/package-configs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 0f0f339..3b2ddc4 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -10,7 +10,6 @@ ./conduit ./forgejo ./gotosocial - ./jellyfin ./mail-server ./nextcloud ./postgres From e622fd44645ad16bb16dffa92bbc93adce2bf067 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 9 Feb 2024 21:58:07 +0100 Subject: [PATCH 1272/2308] Remove that from here too --- nixos/server/package-configs/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index d6322e5..e8b34c6 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -11,7 +11,7 @@ sops.secrets."local.json".owner = config.users.users.onlyoffice.name; users.users = { - nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"]; + nextcloud.extraGroups = [config.users.groups.keys.name "onlyoffice"]; aria2.extraGroups = ["nextcloud"]; onlyoffice.extraGroups = ["nextcloud"]; }; From 6cf73a77a3eb658691d01bdb97af3b5d494bebd5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 9 Feb 2024 22:00:23 +0100 Subject: [PATCH 1273/2308] And this? --- nixos/hosts/queen/configuration.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index ac30503..87201be 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -88,10 +88,10 @@ exiftool imagemagick ffmpeg - aria2 - jellyfin - jellyfin-web - jellyfin-ffmpeg + #aria2 + #jellyfin + #jellyfin-web + #jellyfin-ffmpeg nextcloud28 nginx onlyoffice-documentserver From 4fe37bf1e11be20f3202a0b6c89f962985d1c934 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 9 Feb 2024 22:01:15 +0100 Subject: [PATCH 1274/2308] The thing it probably errors on here too --- nixos/server/package-configs/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index e8b34c6..47885b1 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -12,7 +12,7 @@ users.users = { nextcloud.extraGroups = [config.users.groups.keys.name "onlyoffice"]; - aria2.extraGroups = ["nextcloud"]; + #aria2.extraGroups = ["nextcloud"]; onlyoffice.extraGroups = ["nextcloud"]; }; From ff1a6f6e28610a1016c51ce8aa12d09851d98079 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 11 Feb 2024 23:23:54 +0100 Subject: [PATCH 1275/2308] nix flake update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 4c58b77..1b810f0 100644 --- a/flake.lock +++ b/flake.lock @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1707683400, + "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "21b078306a2ab68748abf72650db313d646cf2ca", "type": "github" }, "original": { @@ -210,11 +210,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707226874, - "narHash": "sha256-uo3oGHc/oLbcS6tDlm+Z130tQNRX2ufs9r+kGRTx0Ng=", + "lastModified": 1707567487, + "narHash": "sha256-4VyGscBVW9HX5h0UULi1blX1zSvN20hda/AeZkW40ZI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8f355736d9449a6650418f8e70f8dacf652401a7", + "rev": "f02d975f23e83306ff1ab7ef2920e5da147b2d96", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707393347, - "narHash": "sha256-xmHgBMyF+Glxs3f8r+AMxJDTNUS01Q5kMjQdgAyw+B8=", + "lastModified": 1707588924, + "narHash": "sha256-0e1ce6X5ghapv6cAF9rxLZKeNyFHHXsLbGxN2cQQE8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b7a892fb042ede583bdaecbbdc804acb85eabe", + "rev": "10b813040df67c4039086db0f6eaf65c536886c6", "type": "github" }, "original": { @@ -353,11 +353,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1707391491, - "narHash": "sha256-TyDXcq8Z3slMNeyeF+ke0BzISWuM6NrBklr7XyiRbZA=", + "lastModified": 1707603439, + "narHash": "sha256-LodBVZ3+ehJP2azM5oj+JrhfNAAzmTJ/OwAIOn0RfZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc6cb3d59b7aab88e967264254f8c1aa4c0284e9", + "rev": "d8cd80616c8800feec0cab64331d7c3d5a1a6d98", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1707546158, + "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "type": "github" }, "original": { @@ -385,11 +385,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1707546158, + "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "type": "github" }, "original": { @@ -448,11 +448,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1707451808, + "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "442d407992384ed9c0e6d352de75b69079904e4e", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1707045317, - "narHash": "sha256-o2NZJcNu2/M3qycZ2Z9sgIESQEBFmihbbA7//sp7yVA=", + "lastModified": 1707590627, + "narHash": "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw=", "owner": "pjones", "repo": "plasma-manager", - "rev": "290cd65b65e2da11ca9fda69781ea9beb8a6f6ac", + "rev": "4e56cfeb95081a43cb49487d0996dc936d6201e5", "type": "github" }, "original": { @@ -613,11 +613,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1707397511, - "narHash": "sha256-pYqXcTjcPC/go3FzT1dYtYsbmzAjO1MHhT/xgiI6J7o=", + "lastModified": 1707620614, + "narHash": "sha256-gfAoB9dGzBu62NoAoM945aok7+6M+LFu+nvnGwAsTp4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2168851d58595431ee11ebfc3a49d60d318b7312", + "rev": "2eb7c4ba3aa75e2660fd217eb1ab64d5b793608e", "type": "github" }, "original": { From c1c4641509c659e98194bf1f7dd77523a47dea8b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 12 Feb 2024 01:20:19 +0100 Subject: [PATCH 1276/2308] Update EDI layout on disk to put swap in LUKS --- disko/EDI/configuration.nix | 42 ++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix index 7af587c..592e690 100644 --- a/disko/EDI/configuration.nix +++ b/disko/EDI/configuration.nix @@ -19,35 +19,29 @@ ]; }; }; - encryptedSwap = { - size = "20M"; - content = { - type = "swap"; - randomEncryption = true; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + # disable settings.keyFile if you want to use interactive password entry + #passwordFile = "/tmp/secret.key"; # Interactive + settings = { + allowDiscards = true; + #keyFile = "/tmp/secret.key"; }; - }; - plainSwap = { - size = "4G"; + #additionalKeyFiles = ["/tmp/additionalSecret.key"]; content = { - type = "swap"; - resumeDevice = true; # resume from hiberation from this device - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - # disable settings.keyFile if you want to use interactive password entry - #passwordFile = "/tmp/secret.key"; # Interactive - settings = { - allowDiscards = true; - #keyFile = "/tmp/secret.key"; + swap = { + type = "swap"; + size = "4G"; + resumeDevice = true; # resume from hiberation from this device }; - #additionalKeyFiles = ["/tmp/additionalSecret.key"]; - content = { + root = { type = "filesystem"; format = "bcachefs"; + size = "100%"; mountpoint = "/"; }; }; From d9ff4d8de77474fc936a91f63b0d9dfaf96b1d1e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 12 Feb 2024 16:36:27 +0100 Subject: [PATCH 1277/2308] Add disko configuration (disable for the moment to not have EDI overwrite its disk) --- disko/EDI/{configuration.nix => default.nix} | 0 flake.nix | 20 +++++++++++++++++++- nixos/hosts/EDI/configuration.nix | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) rename disko/EDI/{configuration.nix => default.nix} (100%) diff --git a/disko/EDI/configuration.nix b/disko/EDI/default.nix similarity index 100% rename from disko/EDI/configuration.nix rename to disko/EDI/default.nix diff --git a/flake.nix b/flake.nix index ed6a712..0330ec0 100644 --- a/flake.nix +++ b/flake.nix @@ -4,12 +4,24 @@ inputs = { # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + # Disko for declaratively setting disk formatting + inputs.disko.url = "github:nix-community/disko"; + + # Secret management with sops sops-nix.url = "github:Mic92/sops-nix"; + + # Simple mail server simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + + # Extra utils for flakes flake-utils.url = "github:numtide/flake-utils"; + + # Manage KDE plasma desktop configuration plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.inputs.home-manager.follows = "home-manager"; + # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -24,7 +36,10 @@ # Home manager home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + + # Fix for steam cursor not being visible under wayland extest.url = "github:chaorace/extest-nix"; + # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; @@ -85,6 +100,7 @@ ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops lanzaboote.nixosModules.lanzaboote + disko.nixosModules.disko home-manager.nixosModules.home-manager { home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; @@ -102,6 +118,7 @@ ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops #lanzaboote.nixosModules.lanzaboote + disko.nixosModules.disko home-manager.nixosModules.home-manager { home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; @@ -118,6 +135,7 @@ # > Our main nixos configuration file < ./nixos/hosts/queen/configuration.nix sops-nix.nixosModules.sops + disko.nixosModules.disko simple-nixos-mailserver.nixosModule ]; }; @@ -142,7 +160,7 @@ # make the module declared by the linger flake available to our config #linger.nixosModules."armv7l-linux".default #pihole.nixosModules."armv7l-linux".default - + disko.nixosModules.disko # > Our main nixos configuration file < ./nixos/hosts/wheatley/configuration.nix sops-nix.nixosModules.sops diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index de5b0d9..6a10035 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -24,6 +24,8 @@ ../../desktop + #../../../disko/EDI + # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix ]; From 68abe668d35c8ea5451c08a3cc5e09dd9301f0c5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 12 Feb 2024 17:03:30 +0100 Subject: [PATCH 1278/2308] Add nixos-generators --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index ddd08a1..09c442c 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -88,6 +88,7 @@ # User tools noisetorch + nixos-generators ]; programs.direnv = { From a59b6c5986f37d03534f3482e2a91733d7d4ece9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 12 Feb 2024 17:16:32 +0100 Subject: [PATCH 1279/2308] Add output to flake, EDI ISO for now --- flake.nix | 23 +++++++++++++++++++++++ nixos/desktop/default.nix | 1 - 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 0330ec0..238894f 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,12 @@ # Disko for declaratively setting disk formatting inputs.disko.url = "github:nix-community/disko"; + # Nixos generators for creating ISOs + nixos-generators = { + url = "github:nix-community/nixos-generators"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Secret management with sops sops-nix.url = "github:Mic92/sops-nix"; @@ -60,6 +66,7 @@ outputs = { self, nixpkgs, + nixos-generators, home-manager, sops-nix, simple-nixos-mailserver, @@ -109,6 +116,22 @@ }; }; + # ISO for EDI, can be built using nix build .#EDIISO + EDIISO = nixos-generators.nixosGenerate { + system = "x86_64-linux"; + modules = [ + ./nixos/hosts/EDI/configuration.nix + sops-nix.nixosModules.sops + lanzaboote.nixosModules.lanzaboote + disko.nixosModules.disko + home-manager.nixosModules.home-manager + { + home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; + } + ]; + format = "iso"; + }; + nixosConfigurations = { GLaDOS = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 09c442c..ddd08a1 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -88,7 +88,6 @@ # User tools noisetorch - nixos-generators ]; programs.direnv = { From d38068027603f54abaa68836c47c2dfbe410695f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 12 Feb 2024 17:17:45 +0100 Subject: [PATCH 1280/2308] Add disko to outputs --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 238894f..bfa9d0d 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,7 @@ self, nixpkgs, nixos-generators, + disko, home-manager, sops-nix, simple-nixos-mailserver, From 9a1638dce450a85e22dd5dfe74181c6fb1e58971 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 12 Feb 2024 17:19:09 +0100 Subject: [PATCH 1281/2308] Follow the disko example more closely --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index bfa9d0d..0a4c91b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ # Disko for declaratively setting disk formatting inputs.disko.url = "github:nix-community/disko"; + inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; # Nixos generators for creating ISOs nixos-generators = { From b6f0552c9a3489e83fbd49cf810eb7144820a8d2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 12 Feb 2024 17:19:44 +0100 Subject: [PATCH 1282/2308] Ah yeah I define inputs up there, I see the issue --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 0a4c91b..d7a0936 100644 --- a/flake.nix +++ b/flake.nix @@ -6,8 +6,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Disko for declaratively setting disk formatting - inputs.disko.url = "github:nix-community/disko"; - inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; + disko.url = "github:nix-community/disko"; + disko.inputs.nixpkgs.follows = "nixpkgs"; # Nixos generators for creating ISOs nixos-generators = { From 937f5a083f2dd16dfcd39c553dd8c6e2719cfe91 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 12 Feb 2024 17:20:18 +0100 Subject: [PATCH 1283/2308] Updating flake lock before trying this iso --- flake.lock | 100 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 79 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 1b810f0..1dc8276 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1707075082, - "narHash": "sha256-PUplk5F5jlIyofxqn/xEDN9pbjrd0tnkd0pDsZ52db0=", + "lastModified": 1707685877, + "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", "owner": "ipetkov", "repo": "crane", - "rev": "7d5b46c17d857ee9ddb2e8d88185729a3e5637b6", + "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", "type": "github" }, "original": { @@ -37,6 +37,26 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707524024, + "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=", + "owner": "nix-community", + "repo": "disko", + "rev": "d07de570ba05cec2807d058daaa044f6955720c7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "extest": { "inputs": { "extest": "extest_2", @@ -234,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1707121196, - "narHash": "sha256-drevc7MfnMD0Ya811UPDCY5hkCOYXgDYr+oKwWLvF+E=", + "lastModified": 1707742806, + "narHash": "sha256-rYDoODYqYphsYJBs2EOkDNfLxe6Boq9BGtaCE4tVAI0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f2bc0af580f0bb6e6a2d0bcf0cfb237b357ffbbf", + "rev": "71fb51225c124a84847a01300d605b91ab318621", "type": "github" }, "original": { @@ -289,13 +309,49 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1693701915, + "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707725560, + "narHash": "sha256-RVdsjx/EoaHzmS0st91xnIFukb6BzFq4edbp6Ld38Us=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "3b6bde6b879a7b74d00f6870c07fc0b1067fcb8d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1707588924, - "narHash": "sha256-0e1ce6X5ghapv6cAF9rxLZKeNyFHHXsLbGxN2cQQE8U=", + "lastModified": 1707711327, + "narHash": "sha256-JaiR0Er0Bx80CT5POOYR1I1tLM7VvC2/ny6mOmkoRQw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10b813040df67c4039086db0f6eaf65c536886c6", + "rev": "01737456dfe4907fb5bdc8af39ac8c6d6b1fb551", "type": "github" }, "original": { @@ -401,11 +457,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707028810, - "narHash": "sha256-/WuTsaljhG9VpXRYnxbxkoxhXy6lotbey99CiBuP2GY=", + "lastModified": 1707639604, + "narHash": "sha256-J5ipSdfkbYcYaH3Js2dUf3Of94BWStapdmxpW5wwH1U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d75993fa5feaa333f3eadd83e0a08fc34432acc", + "rev": "bdc57436da855500d44e9c1ce7450c0772e1cfa1", "type": "github" }, "original": { @@ -529,11 +585,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1706424699, - "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", + "lastModified": 1707297608, + "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", + "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", "type": "github" }, "original": { @@ -544,12 +600,14 @@ }, "root": { "inputs": { + "disko": "disko", "extest": "extest", "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "linger": "linger", + "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "pihole": "pihole", @@ -570,11 +628,11 @@ ] }, "locked": { - "lastModified": 1707099356, - "narHash": "sha256-ph483MDKLi9I/gndYOieVP41es633DOOmPjEI50x5KU=", + "lastModified": 1707617562, + "narHash": "sha256-Kk2vv5e4MqKPjelKoYsa6YaUyv3pvjWY9nJSnP2QU9w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "61dfa5a8129f7edbe9150253c68f673f87b16fb1", + "rev": "a22bbbee9b479c6d95b4819135e856a6d447b3ba", "type": "github" }, "original": { @@ -613,11 +671,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1707620614, - "narHash": "sha256-gfAoB9dGzBu62NoAoM945aok7+6M+LFu+nvnGwAsTp4=", + "lastModified": 1707748232, + "narHash": "sha256-o9L8jrOemQl/5cYp++0cWdfMLzVljCdHwPFF4N0KZeQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2eb7c4ba3aa75e2660fd217eb1ab64d5b793608e", + "rev": "695275c349bb27f91b2b06cb742510899c887b81", "type": "github" }, "original": { From c29b0d1d6add244941ab91b2641041c6f3af683a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 12 Feb 2024 17:22:25 +0100 Subject: [PATCH 1284/2308] Try adding special args? --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index d7a0936..937b5f3 100644 --- a/flake.nix +++ b/flake.nix @@ -121,6 +121,7 @@ # ISO for EDI, can be built using nix build .#EDIISO EDIISO = nixos-generators.nixosGenerate { system = "x86_64-linux"; + specialArgs = {inherit inputs outputs;}; modules = [ ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops From a0966aad40f541ca0fe3e30f601ead6a6741e4c3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 13 Feb 2024 13:53:41 +0100 Subject: [PATCH 1285/2308] add lvm test --- disko/EDI/lvm.nix | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 disko/EDI/lvm.nix diff --git a/disko/EDI/lvm.nix b/disko/EDI/lvm.nix new file mode 100644 index 0000000..e5477dd --- /dev/null +++ b/disko/EDI/lvm.nix @@ -0,0 +1,70 @@ +{ + disko.devices = { + disk = { + nvme0n1 = { + type = "disk"; + device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "defaults" + ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + extraOpenArgs = []; + settings = { + # if you want to use the key for interactive login be sure there is no trailing newline + # for example use `echo -n "password" > /tmp/secret.key` + #keyFile = "/tmp/secret.key"; + allowDiscards = true; + }; + #additionalKeyFiles = ["/tmp/additionalSecret.key"]; + content = { + type = "lvm_pv"; + vg = "pool"; + }; + }; + }; + }; + }; + }; + }; + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + swap = { + size = "4G"; + content = { + type = "swap"; + }; + }; + root = { + size = "100%"; + content = { + type = "filesystem"; + format = "bcachefs"; + mountpoint = "/"; + mountOptions = [ + "defaults" + ]; + }; + }; + }; + }; + }; + }; +} From e39fe5214bc9073d421182a4f4620f2828be9092 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 13 Feb 2024 15:41:05 +0100 Subject: [PATCH 1286/2308] Use disko for configuration of the disk, built the ISO with lvm, put the default to the current setup for EDI. Make sure to update after flashing. --- disko/EDI/default.nix | 41 +++++++++++----------- nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/EDI/hardware-configuration.nix | 32 ++++++++--------- 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/disko/EDI/default.nix b/disko/EDI/default.nix index 592e690..30d9181 100644 --- a/disko/EDI/default.nix +++ b/disko/EDI/default.nix @@ -1,9 +1,9 @@ { disko.devices = { disk = { - vdb = { - device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1"; + nvme0n1 = { type = "disk"; + device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1"; content = { type = "gpt"; partitions = { @@ -19,29 +19,28 @@ ]; }; }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - # disable settings.keyFile if you want to use interactive password entry - #passwordFile = "/tmp/secret.key"; # Interactive - settings = { - allowDiscards = true; - #keyFile = "/tmp/secret.key"; - }; - #additionalKeyFiles = ["/tmp/additionalSecret.key"]; + encryptedSwap = { + size = "4G"; content = { - swap = { - type = "swap"; - size = "4G"; - resumeDevice = true; # resume from hiberation from this device + type = "swap"; + randomEncryption = true; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + # disable settings.keyFile if you want to use interactive password entry + #passwordFile = "/tmp/secret.key"; # Interactive + settings = { + allowDiscards = true; + #keyFile = "/tmp/secret.key"; }; - root = { + #additionalKeyFiles = ["/tmp/additionalSecret.key"]; + content = { type = "filesystem"; format = "bcachefs"; - size = "100%"; mountpoint = "/"; }; }; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 6a10035..7788910 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -24,7 +24,7 @@ ../../desktop - #../../../disko/EDI + ../../../disko/EDI # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index ad2bffb..6e02f8d 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -17,25 +17,25 @@ boot.kernelModules = ["kvm-intel"]; boot.extraModulePackages = []; - fileSystems."/" = { - device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628"; - fsType = "bcachefs"; - }; + # fileSystems."/" = { + # device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628"; + # fsType = "bcachefs"; + # }; - boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/91da75e7-52bc-4a50-9293-7e5e431040e0"; + #boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/91da75e7-52bc-4a50-9293-7e5e431040e0"; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/01B2-909E"; - fsType = "vfat"; - options = ["fmask=0077" "dmask=0077" "defaults"]; - }; + # fileSystems."/boot" = { + # device = "/dev/disk/by-uuid/01B2-909E"; + # fsType = "vfat"; + # options = ["fmask=0077" "dmask=0077" "defaults"]; + # }; - swapDevices = [ - { - device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1-part2"; - randomEncryption.enable = true; - } - ]; + # swapDevices = [ + # { + # device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1-part2"; + # randomEncryption.enable = true; + # } + # ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From 5b353828ff1c548fac9e11ac2c8f40cab3e4f409 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 14 Feb 2024 10:50:19 +0100 Subject: [PATCH 1287/2308] Add servo --- nixos/desktop/default.nix | 1 + pkgs/default.nix | 1 + pkgs/servo/default.nix | 79 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 pkgs/servo/default.nix diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index ddd08a1..23cc32c 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -63,6 +63,7 @@ # Custom tools dvd dvt + servo # System tools direnv diff --git a/pkgs/default.nix b/pkgs/default.nix index 819fb05..998cdfa 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,4 +3,5 @@ pkgs: { dvd = pkgs.callPackage ./dvd {}; dvt = pkgs.callPackage ./dvt {}; + servo = pkgs.callPackage ./servo {}; } diff --git a/pkgs/servo/default.nix b/pkgs/servo/default.nix new file mode 100644 index 0000000..3c948fc --- /dev/null +++ b/pkgs/servo/default.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + zlib, + glib, + harfbuzz, + fontconfig, + freetype, + dbus, + libunwind, + gst_all_1, + xorg, + libxkbcommon, + vulkan-loader, +}: +stdenv.mkDerivation rec { + pname = "servo"; + version = "2024-01-05"; + + src = fetchurl { + url = "https://github.com/servo/servo-nightly-builds/releases/download/${version}/servo-latest.tar.gz"; + hash = "sha256-IlmoYIFk0QO0CieJ49m8PnEou1Q3w+Tk9rypI0ya2WQ="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = + [ + stdenv.cc.cc.lib + zlib + glib + harfbuzz + fontconfig + freetype + dbus + libunwind + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + ]) + ++ (with xorg; [ + libxcb + libX11 + ]); + + runtimeDependencies = + [ + libxkbcommon + vulkan-loader + ] + ++ (with xorg; [ + libXcursor + libXrandr + libXi + ]); + + sourceRoot = "servo"; + + installPhase = '' + runHook preInstall + install -m755 -D servo $out/bin/._servo + echo "WINIT_UNIX_BACKEND=x11 $out/bin/._servo" > $out/bin/servo + chmod +x $out/bin/servo + cp -r ./resources $out/bin/ + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://servo.org"; + description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine"; + platforms = platforms.linux; + }; +} From e37d49f05f1dc96378e7b71bbd0efd39cb8b7fa8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 15 Feb 2024 09:15:52 +0100 Subject: [PATCH 1288/2308] 100% free might fix it? --- disko/EDI/lvm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disko/EDI/lvm.nix b/disko/EDI/lvm.nix index e5477dd..43b5e8f 100644 --- a/disko/EDI/lvm.nix +++ b/disko/EDI/lvm.nix @@ -53,7 +53,7 @@ }; }; root = { - size = "100%"; + size = "100%FREE"; content = { type = "filesystem"; format = "bcachefs"; From 54589eb953d191e6f1b4bac48e3fca40fca752e0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 15 Feb 2024 14:27:03 +0100 Subject: [PATCH 1289/2308] set up lanzaboot and update the EDI disko setup --- disko/EDI/lvm.nix | 3 +- nixos/hosts/EDI/configuration.nix | 27 +++++++++--- nixos/hosts/EDI/hardware-configuration.nix | 51 +++++++++------------- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/disko/EDI/lvm.nix b/disko/EDI/lvm.nix index 43b5e8f..f8cd5dc 100644 --- a/disko/EDI/lvm.nix +++ b/disko/EDI/lvm.nix @@ -47,9 +47,10 @@ type = "lvm_vg"; lvs = { swap = { - size = "4G"; + size = "8G"; content = { type = "swap"; + resumeDevice = true; # resume from hiberation from this device }; }; root = { diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 7788910..b76499a 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -24,7 +24,7 @@ ../../desktop - ../../../disko/EDI + ../../../disko/EDI/lvm.nix # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix @@ -41,6 +41,7 @@ environment.systemPackages = with pkgs; [ podman podman-compose + sbctl ]; virtualisation.podman = { @@ -53,13 +54,25 @@ boot.bootspec.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; boot.supportedFilesystems = ["bcachefs"]; - boot = { - loader.systemd-boot.enable = lib.mkForce false; - lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; + + # Lanzaboote currently replaces the systemd-boot module. + # This setting is usually set to true in configuration.nix + # generated at installation time. So we force it to false + # for now. + boot.loader.systemd-boot.enable = lib.mkForce false; + + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; }; + + #boot = { + #loader.systemd-boot.enable = lib.mkForce false; + #lanzaboote = { + #enable = true; + #pkiBundle = "/etc/secureboot"; + #}; + #}; # Enable bluetooth hardware hardware.bluetooth.enable = true; diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 6e02f8d..006d087 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -1,48 +1,37 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - # fileSystems."/" = { - # device = "UUID=88cd54d3-b644-4bae-96e9-51d2db3c5628"; - # fsType = "bcachefs"; - # }; + #fileSystems."/" = + # { device = "UUID=65956905-b7a5-4573-81fe-622c42cabdf5"; + # fsType = "bcachefs"; + # }; - #boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/91da75e7-52bc-4a50-9293-7e5e431040e0"; + #fileSystems."/boot" = + # { device = "/dev/disk/by-uuid/3D90-9CF4"; + # fsType = "vfat"; + # }; - # fileSystems."/boot" = { - # device = "/dev/disk/by-uuid/01B2-909E"; - # fsType = "vfat"; - # options = ["fmask=0077" "dmask=0077" "defaults"]; - # }; - - # swapDevices = [ - # { - # device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1-part2"; - # randomEncryption.enable = true; - # } - # ]; + #swapDevices = + # [ { device = "/dev/disk/by-uuid/07258619-dbae-4fe9-aa2e-921d85b6a53b"; } + # ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s20f0u9u2c2.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; From 032da60de7f985ef26376b1a60ef8f125f87fdeb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 15 Feb 2024 14:28:44 +0100 Subject: [PATCH 1290/2308] Little formatting fix --- nixos/hosts/EDI/configuration.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index b76499a..b665ba5 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -60,19 +60,12 @@ # generated at installation time. So we force it to false # for now. boot.loader.systemd-boot.enable = lib.mkForce false; - + boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; + enable = true; + pkiBundle = "/etc/secureboot"; }; - #boot = { - #loader.systemd-boot.enable = lib.mkForce false; - #lanzaboote = { - #enable = true; - #pkiBundle = "/etc/secureboot"; - #}; - #}; # Enable bluetooth hardware hardware.bluetooth.enable = true; From 82bac88a7bfbd70d8ef1d9461430a885fd47fc00 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 15 Feb 2024 18:37:06 +0000 Subject: [PATCH 1291/2308] adding GLaDOS disko config --- configuration.nix | 121 ++++++++++++++++++ disko/GLaDOS/default.nix | 71 ++++++++++ hardware-configuration.nix | 39 ++++++ nixos/hosts/GLaDOS/configuration.nix | 14 ++ nixos/hosts/GLaDOS/hardware-configuration.nix | 33 +++-- 5 files changed, 261 insertions(+), 17 deletions(-) create mode 100644 configuration.nix create mode 100644 disko/GLaDOS/default.nix create mode 100644 hardware-configuration.nix diff --git a/configuration.nix b/configuration.nix new file mode 100644 index 0000000..57a9ff3 --- /dev/null +++ b/configuration.nix @@ -0,0 +1,121 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # networking.hostName = "nixos"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + + # Enable the Plasma 5 Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.alice = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # firefox + # tree + # ]; + # }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + # environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + # ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "24.05"; # Did you read the comment? + +} + diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix new file mode 100644 index 0000000..98a0c8a --- /dev/null +++ b/disko/GLaDOS/default.nix @@ -0,0 +1,71 @@ +{ + disko.devices = { + disk = { + sda1 = { + type = "disk"; + device = "/dev/disk/by-path/pci-0000:06:00.0-ata-6"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "defaults" + ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + extraOpenArgs = []; + settings = { + # if you want to use the key for interactive login be sure there is no trailing newline + # for example use `echo -n "password" > /tmp/secret.key` + #keyFile = "/tmp/secret.key"; + allowDiscards = true; + }; + #additionalKeyFiles = ["/tmp/additionalSecret.key"]; + content = { + type = "lvm_pv"; + vg = "pool"; + }; + }; + }; + }; + }; + }; + }; + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + swap = { + size = "16G"; + content = { + type = "swap"; + resumeDevice = true; # resume from hiberation from this device + }; + }; + root = { + size = "100%FREE"; + content = { + type = "filesystem"; + format = "bcachefs"; + mountpoint = "/"; + mountOptions = [ + "defaults" + ]; + }; + }; + }; + }; + }; + }; +} diff --git a/hardware-configuration.nix b/hardware-configuration.nix new file mode 100644 index 0000000..fdf1ae2 --- /dev/null +++ b/hardware-configuration.nix @@ -0,0 +1,39 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "UUID=166dc8d8-b77f-43fe-8bee-a0fc5b26aeb5"; + fsType = "bcachefs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/743A-083A"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/3d300fda-35d4-4bdb-ac89-21b0f29b167c"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 71ba601..829303e 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -24,11 +24,25 @@ ../../desktop + ../../../disko/GLaDOS + # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix ]; boot.loader.systemd-boot.enable = true; + + # Lanzaboote currently replaces the systemd-boot module. + # This setting is usually set to true in configuration.nix + # generated at installation time. So we force it to false + # for now. + # boot.loader.systemd-boot.enable = lib.mkForce false; + + # boot.lanzaboote = { + # enable = true; + # pkiBundle = "/etc/secureboot"; + # }; + boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; boot.supportedFilesystems = ["bcachefs"]; diff --git a/nixos/hosts/GLaDOS/hardware-configuration.nix b/nixos/hosts/GLaDOS/hardware-configuration.nix index 3b523fc..50c0a1b 100644 --- a/nixos/hosts/GLaDOS/hardware-configuration.nix +++ b/nixos/hosts/GLaDOS/hardware-configuration.nix @@ -8,24 +8,24 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/14883cd2-72b8-4ab3-8cbf-d5dca40e036a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BA43-C24E"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/cffe625e-1dac-45bd-a744-303baa09affd"; } - ]; +# fileSystems."/" = +# { device = "UUID=166dc8d8-b77f-43fe-8bee-a0fc5b26aeb5"; +# fsType = "bcachefs"; +# }; +# +# fileSystems."/boot" = +# { device = "/dev/disk/by-uuid/743A-083A"; +# fsType = "vfat"; +# }; +# +# swapDevices = +# [ { device = "/dev/disk/by-uuid/3d300fda-35d4-4bdb-ac89-21b0f29b167c"; } +# ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -33,7 +33,6 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; From f7ce86697f0990466b27b6e72835c462250a049e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 15 Feb 2024 22:17:04 +0100 Subject: [PATCH 1292/2308] Change bootloader to lanzaboot in GLaDOS --- nixos/hosts/GLaDOS/configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 829303e..cd3c917 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -43,6 +43,13 @@ # pkiBundle = "/etc/secureboot"; # }; + boot.loader.systemd-boot.enable = lib.mkForce false; + + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; + boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; boot.supportedFilesystems = ["bcachefs"]; From 14126751e0252b7d8cd52f5ff0b5594457c7fce3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 15 Feb 2024 22:18:23 +0100 Subject: [PATCH 1293/2308] Need to remove enabling systemdboot --- nixos/hosts/GLaDOS/configuration.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index cd3c917..8d4e254 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -30,19 +30,6 @@ ./hardware-configuration.nix ]; - boot.loader.systemd-boot.enable = true; - - # Lanzaboote currently replaces the systemd-boot module. - # This setting is usually set to true in configuration.nix - # generated at installation time. So we force it to false - # for now. - # boot.loader.systemd-boot.enable = lib.mkForce false; - - # boot.lanzaboote = { - # enable = true; - # pkiBundle = "/etc/secureboot"; - # }; - boot.loader.systemd-boot.enable = lib.mkForce false; boot.lanzaboote = { From 7bdfbc45f741c9b8cacf7148958fd05d90e4e7e8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 15 Feb 2024 22:19:37 +0100 Subject: [PATCH 1294/2308] Enable lanzaboot in GLaDOS in the flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 937b5f3..08456d5 100644 --- a/flake.nix +++ b/flake.nix @@ -143,7 +143,7 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops - #lanzaboote.nixosModules.lanzaboote + lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko home-manager.nixosModules.home-manager { From 7bcb99f376a175b5f1106be833433861808fc849 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 15 Feb 2024 22:26:20 +0100 Subject: [PATCH 1295/2308] Add podman and sbctl to GLaDOS --- nixos/hosts/GLaDOS/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 8d4e254..517eb5a 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -30,6 +30,12 @@ ./hardware-configuration.nix ]; + environment.systemPackages = with pkgs; [ + podman + podman-compose + sbctl + ]; + boot.loader.systemd-boot.enable = lib.mkForce false; boot.lanzaboote = { From ef67bfff5c62d4231d2f949d9ad07bd5d429acaf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 15 Feb 2024 22:28:25 +0100 Subject: [PATCH 1296/2308] Add configurationlimit to EDI --- nixos/hosts/EDI/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index b665ba5..9f460ef 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -65,6 +65,8 @@ enable = true; pkiBundle = "/etc/secureboot"; }; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; # Enable bluetooth hardware hardware.bluetooth.enable = true; From a5d16b602bd07e46e3457254dcad980a83c7b45f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 15 Feb 2024 23:27:56 +0100 Subject: [PATCH 1297/2308] Accidentally uploaded these, remove them --- configuration.nix | 121 ------------------------------------- hardware-configuration.nix | 39 ------------ 2 files changed, 160 deletions(-) delete mode 100644 configuration.nix delete mode 100644 hardware-configuration.nix diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index 57a9ff3..0000000 --- a/configuration.nix +++ /dev/null @@ -1,121 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -{ config, lib, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # networking.hostName = "nixos"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkb.options in tty. - # }; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - - # Enable the Plasma 5 Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - - - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # sound.enable = true; - # hardware.pulseaudio.enable = true; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.alice = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # packages = with pkgs; [ - # firefox - # tree - # ]; - # }; - - # List packages installed in system profile. To search, run: - # $ nix search wget - # environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - # ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "24.05"; # Did you read the comment? - -} - diff --git a/hardware-configuration.nix b/hardware-configuration.nix deleted file mode 100644 index fdf1ae2..0000000 --- a/hardware-configuration.nix +++ /dev/null @@ -1,39 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "UUID=166dc8d8-b77f-43fe-8bee-a0fc5b26aeb5"; - fsType = "bcachefs"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/743A-083A"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/3d300fda-35d4-4bdb-ac89-21b0f29b167c"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} From e62c4697af725bd79863b802ee010d59956c723b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Feb 2024 10:20:59 +0100 Subject: [PATCH 1298/2308] Add v4l2loopback --- nixos/hosts/GLaDOS/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 517eb5a..369a529 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -34,6 +34,7 @@ podman podman-compose sbctl + linuxKernel.packages.linux_latest_libre.v4l2loopback ]; boot.loader.systemd-boot.enable = lib.mkForce false; From f0d377eb5703351e1bc0fa498ef23fa9b60cca64 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Feb 2024 10:42:37 +0100 Subject: [PATCH 1299/2308] This instead? --- nixos/hosts/GLaDOS/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 369a529..c0ecc96 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -34,7 +34,6 @@ podman podman-compose sbctl - linuxKernel.packages.linux_latest_libre.v4l2loopback ]; boot.loader.systemd-boot.enable = lib.mkForce false; @@ -47,6 +46,7 @@ boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; boot.supportedFilesystems = ["bcachefs"]; + boot.kernelModules = ["hid-nintendo" "v4l2loopback"]; boot.kernelPackages = pkgs.linuxPackages_latest; home-manager = { From f52e9eddd41483050365889f3e945b563d1a5cb1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Feb 2024 10:45:49 +0100 Subject: [PATCH 1300/2308] Or this? --- nixos/hosts/GLaDOS/configuration.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index c0ecc96..13dcb28 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -46,7 +46,20 @@ boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; boot.supportedFilesystems = ["bcachefs"]; - boot.kernelModules = ["hid-nintendo" "v4l2loopback"]; + boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; + boot.kernelModules = [ + # Virtual Camera + "v4l2loopback" + # Virtual Microphone, built-in + "snd-aloop" + ]; + # Set initial kernel module settings + boot.extraModprobeConfig = '' + # exclusive_caps: Skype, Zoom, Teams etc. will only show device when actually streaming + # card_label: Name of virtual camera, how it'll show up in Skype, Zoom, Teams + # https://github.com/umlaeute/v4l2loopback + options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" + ''; boot.kernelPackages = pkgs.linuxPackages_latest; home-manager = { From cf619a9a4da21205da84f69487e51413d199f8e0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Feb 2024 12:21:34 +0100 Subject: [PATCH 1301/2308] Add some obs plugins to GLaDOS --- home-manager/hosts/GLaDOS/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home-manager/hosts/GLaDOS/default.nix b/home-manager/hosts/GLaDOS/default.nix index c17b81a..8fc718d 100644 --- a/home-manager/hosts/GLaDOS/default.nix +++ b/home-manager/hosts/GLaDOS/default.nix @@ -10,4 +10,12 @@ imports = [ ./lillian.nix ]; + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + ]; + }; } From f9a34d7f3ba1828b5a14e45f4ca424a5ec401cd2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Feb 2024 12:23:46 +0100 Subject: [PATCH 1302/2308] Remove obs from GLaDOS specific and configure it in desktop instead --- home-manager/desktop/default.nix | 10 +++++++++- home-manager/hosts/GLaDOS/default.nix | 8 -------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 4eab3e0..03add67 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -65,7 +65,6 @@ # Multimedia: freetube - obs-studio vlc # Office applications: @@ -120,6 +119,15 @@ ]; }; + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + ]; + }; + # Enable home-manager and git programs.home-manager.enable = true; programs.git = { diff --git a/home-manager/hosts/GLaDOS/default.nix b/home-manager/hosts/GLaDOS/default.nix index 8fc718d..c17b81a 100644 --- a/home-manager/hosts/GLaDOS/default.nix +++ b/home-manager/hosts/GLaDOS/default.nix @@ -10,12 +10,4 @@ imports = [ ./lillian.nix ]; - programs.obs-studio = { - enable = true; - plugins = with pkgs.obs-studio-plugins; [ - wlrobs - obs-backgroundremoval - obs-pipewire-audio-capture - ]; - }; } From 629b3127c153f8f2fefabc0b5ba3401940a2ade2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Feb 2024 12:59:11 +0100 Subject: [PATCH 1303/2308] GPU drivers for GLaDOS --- nixos/hosts/GLaDOS/configuration.nix | 11 +++++ nixos/hosts/GLaDOS/hardware-configuration.nix | 48 ++++++++++--------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 13dcb28..44d1364 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -36,6 +36,17 @@ sbctl ]; + services.xserver.videoDrivers = ["amdgpu"]; + + # Add vulkan support to GPU + hardware.opengl.extraPackages = with pkgs; [ + amdvlk + ]; + # For 32 bit applications + hardware.opengl.extraPackages32 = with pkgs; [ + driversi686Linux.amdvlk + ]; + boot.loader.systemd-boot.enable = lib.mkForce false; boot.lanzaboote = { diff --git a/nixos/hosts/GLaDOS/hardware-configuration.nix b/nixos/hosts/GLaDOS/hardware-configuration.nix index 50c0a1b..c4ee5ec 100644 --- a/nixos/hosts/GLaDOS/hardware-configuration.nix +++ b/nixos/hosts/GLaDOS/hardware-configuration.nix @@ -1,31 +1,35 @@ # 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") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = ["dm-snapshot" "amdgpu"]; + boot.kernelModules = []; + boot.extraModulePackages = []; -# fileSystems."/" = -# { device = "UUID=166dc8d8-b77f-43fe-8bee-a0fc5b26aeb5"; -# fsType = "bcachefs"; -# }; -# -# fileSystems."/boot" = -# { device = "/dev/disk/by-uuid/743A-083A"; -# fsType = "vfat"; -# }; -# -# swapDevices = -# [ { device = "/dev/disk/by-uuid/3d300fda-35d4-4bdb-ac89-21b0f29b167c"; } -# ]; + # fileSystems."/" = + # { device = "UUID=166dc8d8-b77f-43fe-8bee-a0fc5b26aeb5"; + # fsType = "bcachefs"; + # }; + # + # fileSystems."/boot" = + # { device = "/dev/disk/by-uuid/743A-083A"; + # fsType = "vfat"; + # }; + # + # swapDevices = + # [ { device = "/dev/disk/by-uuid/3d300fda-35d4-4bdb-ac89-21b0f29b167c"; } + # ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From 123fc86753e4df7afbaba3a2f6ac3fee457d0185 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Feb 2024 14:41:36 +0100 Subject: [PATCH 1304/2308] Add & enable wireplumber --- nixos/desktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 23cc32c..327f504 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -89,6 +89,7 @@ # User tools noisetorch + wireplumber ]; programs.direnv = { @@ -146,6 +147,7 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + wireplumber.enable = true; }; programs.noisetorch = { From 0dcc2b9acc4a9e4cba02d585ecda9734b36dee32 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Feb 2024 21:31:25 +0100 Subject: [PATCH 1305/2308] Enable pipewire jack --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 327f504..30b88af 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -147,6 +147,7 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + jack.enable = true; wireplumber.enable = true; }; From ab474a949ced67649e999760880906bf5e050a89 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 19 Feb 2024 16:20:12 +0100 Subject: [PATCH 1306/2308] Add qjackctl to GLaDOS --- nixos/hosts/GLaDOS/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 44d1364..4de3f5b 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -34,6 +34,7 @@ podman podman-compose sbctl + qjackctl ]; services.xserver.videoDrivers = ["amdgpu"]; From bf4e708745c31ee64d681b643654b23c5ba72295 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 19 Feb 2024 16:21:21 +0100 Subject: [PATCH 1307/2308] Update flake lock --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 1dc8276..f2f5b97 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1707524024, - "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=", + "lastModified": 1708305517, + "narHash": "sha256-WYnEspeTTksC21obnnxWOGOAQbnBD0GES0S0XOLsJjs=", "owner": "nix-community", "repo": "disko", - "rev": "d07de570ba05cec2807d058daaa044f6955720c7", + "rev": "1ae1f57dad13595600dd57b6a55fcbaef6673804", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1707683400, - "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=", + "lastModified": 1708294481, + "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "21b078306a2ab68748abf72650db313d646cf2ca", + "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707567487, - "narHash": "sha256-4VyGscBVW9HX5h0UULi1blX1zSvN20hda/AeZkW40ZI=", + "lastModified": 1708148641, + "narHash": "sha256-UliMMpx84PPA+0mcyBj2yuKNawOX7L4u/wO8j9QGHVk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f02d975f23e83306ff1ab7ef2920e5da147b2d96", + "rev": "f318a856ff3177fdea6044d6c77dd49992330a31", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1707742806, - "narHash": "sha256-rYDoODYqYphsYJBs2EOkDNfLxe6Boq9BGtaCE4tVAI0=", + "lastModified": 1708343641, + "narHash": "sha256-UlTZmvuK18wc2I2Wt//Ry5CHxkbxpbE4ccwaVjix+CE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "71fb51225c124a84847a01300d605b91ab318621", + "rev": "470ba03c4b80ad57397af84145dc0911dc398f91", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1707725560, - "narHash": "sha256-RVdsjx/EoaHzmS0st91xnIFukb6BzFq4edbp6Ld38Us=", + "lastModified": 1707873059, + "narHash": "sha256-simzllUEmzVqmQogcGCorfIbJpodAhgGSr6vuFtd4XQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "3b6bde6b879a7b74d00f6870c07fc0b1067fcb8d", + "rev": "0aa24e93f75370454f0e03747b6836ac2a2c9fca", "type": "github" }, "original": { @@ -347,11 +347,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707711327, - "narHash": "sha256-JaiR0Er0Bx80CT5POOYR1I1tLM7VvC2/ny6mOmkoRQw=", + "lastModified": 1708307464, + "narHash": "sha256-OloBg9ZCoPrPqy8/ZoaoRB4kza3lKhnI0LuZq5xldhg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01737456dfe4907fb5bdc8af39ac8c6d6b1fb551", + "rev": "a332040396d7e3c47883e9c115c1da485712805e", "type": "github" }, "original": { @@ -409,11 +409,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1707603439, - "narHash": "sha256-LodBVZ3+ehJP2azM5oj+JrhfNAAzmTJ/OwAIOn0RfZ0=", + "lastModified": 1708210246, + "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8cd80616c8800feec0cab64331d7c3d5a1a6d98", + "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1707546158, - "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1707689078, + "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", "type": "github" }, "original": { @@ -457,11 +457,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707639604, - "narHash": "sha256-J5ipSdfkbYcYaH3Js2dUf3Of94BWStapdmxpW5wwH1U=", + "lastModified": 1708232726, + "narHash": "sha256-DYuEHWQSBwaJkS2rjLUsKvGgDK8QIVojC3klAUw6uyk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdc57436da855500d44e9c1ce7450c0772e1cfa1", + "rev": "35c5863c29ce81199ded8a3384f4979b7793f5dc", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1707546158, - "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { @@ -504,11 +504,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1707451808, - "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", + "lastModified": 1708151420, + "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "442d407992384ed9c0e6d352de75b69079904e4e", + "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", "type": "github" }, "original": { @@ -585,11 +585,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1707297608, - "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "type": "github" }, "original": { @@ -628,11 +628,11 @@ ] }, "locked": { - "lastModified": 1707617562, - "narHash": "sha256-Kk2vv5e4MqKPjelKoYsa6YaUyv3pvjWY9nJSnP2QU9w=", + "lastModified": 1708241671, + "narHash": "sha256-zSulX9tP4R35Y8A842dGSzaHMVP91W2Ry0SXvQKD2BQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a22bbbee9b479c6d95b4819135e856a6d447b3ba", + "rev": "d500e370b26f9b14303cb39bf1509df0a920c8b0", "type": "github" }, "original": { @@ -671,11 +671,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1707748232, - "narHash": "sha256-o9L8jrOemQl/5cYp++0cWdfMLzVljCdHwPFF4N0KZeQ=", + "lastModified": 1708225343, + "narHash": "sha256-Q0uVUOfumc1DcKsIJIfMCHph08MjkOvZxvPb/Vi8hWw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "695275c349bb27f91b2b06cb742510899c887b81", + "rev": "ffed177a9d2c685901781c3c6c9024ae0ffc252b", "type": "github" }, "original": { From 00f1f1be16dcdf5f64ea07eab3f731da9de5e3cb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 20 Feb 2024 09:50:26 +0100 Subject: [PATCH 1308/2308] Set configuration limit in EDI --- nixos/hosts/EDI/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index b665ba5..70d0c8b 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -60,6 +60,8 @@ # generated at installation time. So we force it to false # for now. boot.loader.systemd-boot.enable = lib.mkForce false; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; boot.lanzaboote = { enable = true; From 33d4b51c00587b1cfaa5a31c570ca24c74cc6b6c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 20 Feb 2024 09:57:29 +0100 Subject: [PATCH 1309/2308] T'was already in there --- nixos/hosts/EDI/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index ccc31db..70d0c8b 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -67,8 +67,6 @@ enable = true; pkiBundle = "/etc/secureboot"; }; - boot.loader.systemd-boot.configurationLimit = 3; - boot.loader.efi.canTouchEfiVariables = true; # Enable bluetooth hardware hardware.bluetooth.enable = true; From 4f22ad7e5105a8276f9e0a89cfbced969e811f05 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 21 Feb 2024 10:23:51 +0100 Subject: [PATCH 1310/2308] Remove the old disk layout for EDI --- disko/EDI/default.nix | 44 +++++++++++++------ disko/EDI/lvm.nix | 71 ------------------------------- nixos/hosts/EDI/configuration.nix | 2 +- 3 files changed, 32 insertions(+), 85 deletions(-) delete mode 100644 disko/EDI/lvm.nix diff --git a/disko/EDI/default.nix b/disko/EDI/default.nix index 30d9181..f8cd5dc 100644 --- a/disko/EDI/default.nix +++ b/disko/EDI/default.nix @@ -19,29 +19,22 @@ ]; }; }; - encryptedSwap = { - size = "4G"; - content = { - type = "swap"; - randomEncryption = true; - }; - }; luks = { size = "100%"; content = { type = "luks"; name = "crypted"; - # disable settings.keyFile if you want to use interactive password entry - #passwordFile = "/tmp/secret.key"; # Interactive + extraOpenArgs = []; settings = { - allowDiscards = true; + # if you want to use the key for interactive login be sure there is no trailing newline + # for example use `echo -n "password" > /tmp/secret.key` #keyFile = "/tmp/secret.key"; + allowDiscards = true; }; #additionalKeyFiles = ["/tmp/additionalSecret.key"]; content = { - type = "filesystem"; - format = "bcachefs"; - mountpoint = "/"; + type = "lvm_pv"; + vg = "pool"; }; }; }; @@ -49,5 +42,30 @@ }; }; }; + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + swap = { + size = "8G"; + content = { + type = "swap"; + resumeDevice = true; # resume from hiberation from this device + }; + }; + root = { + size = "100%FREE"; + content = { + type = "filesystem"; + format = "bcachefs"; + mountpoint = "/"; + mountOptions = [ + "defaults" + ]; + }; + }; + }; + }; + }; }; } diff --git a/disko/EDI/lvm.nix b/disko/EDI/lvm.nix deleted file mode 100644 index f8cd5dc..0000000 --- a/disko/EDI/lvm.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - disko.devices = { - disk = { - nvme0n1 = { - type = "disk"; - device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - extraOpenArgs = []; - settings = { - # if you want to use the key for interactive login be sure there is no trailing newline - # for example use `echo -n "password" > /tmp/secret.key` - #keyFile = "/tmp/secret.key"; - allowDiscards = true; - }; - #additionalKeyFiles = ["/tmp/additionalSecret.key"]; - content = { - type = "lvm_pv"; - vg = "pool"; - }; - }; - }; - }; - }; - }; - }; - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - swap = { - size = "8G"; - content = { - type = "swap"; - resumeDevice = true; # resume from hiberation from this device - }; - }; - root = { - size = "100%FREE"; - content = { - type = "filesystem"; - format = "bcachefs"; - mountpoint = "/"; - mountOptions = [ - "defaults" - ]; - }; - }; - }; - }; - }; - }; -} diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 70d0c8b..aa96251 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -24,7 +24,7 @@ ../../desktop - ../../../disko/EDI/lvm.nix + ../../../disko/EDI # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix From 23e5969c3f070a630c0c1bc10a5aac9ee13deadd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 21 Feb 2024 10:58:44 +0100 Subject: [PATCH 1311/2308] Update flake lock --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index f2f5b97..13c041e 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1708294481, - "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=", + "lastModified": 1708451036, + "narHash": "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790=", "owner": "nix-community", "repo": "home-manager", - "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438", + "rev": "517601b37c6d495274454f63c5a483c8e3ca6be1", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1708343641, - "narHash": "sha256-UlTZmvuK18wc2I2Wt//Ry5CHxkbxpbE4ccwaVjix+CE=", + "lastModified": 1708388174, + "narHash": "sha256-mLROAGNyOykYwWOLga24BX05GnRE+acms0Ru10tye2o=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "470ba03c4b80ad57397af84145dc0911dc398f91", + "rev": "73fec69386e8005911e15f3abe6bb6cee7fd9711", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixlib": { "locked": { - "lastModified": 1693701915, - "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "lastModified": 1708217146, + "narHash": "sha256-nGfEv7k78slqIR5E0zzWSx214d/4/ZPKDkObLJqVLVw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "rev": "e623008d8a46517470e6365505f1a3ce171fa46a", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1707873059, - "narHash": "sha256-simzllUEmzVqmQogcGCorfIbJpodAhgGSr6vuFtd4XQ=", + "lastModified": 1708402276, + "narHash": "sha256-7ZTUHdMwy8o6d8ela6H7H3UcS7cyns4D1zuWbmU1dCI=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0aa24e93f75370454f0e03747b6836ac2a2c9fca", + "rev": "fa146e1a156c83b009b398213c661d6b46d71421", "type": "github" }, "original": { @@ -347,11 +347,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708307464, - "narHash": "sha256-OloBg9ZCoPrPqy8/ZoaoRB4kza3lKhnI0LuZq5xldhg=", + "lastModified": 1708469763, + "narHash": "sha256-wCJljz6nQdCAnfTx+3i4fWteB3TnVEq95z6d6LhwVKs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a332040396d7e3c47883e9c115c1da485712805e", + "rev": "5eeded8e3518579daa13887297efa79f5be74b41", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", "type": "github" }, "original": { @@ -671,11 +671,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1708225343, - "narHash": "sha256-Q0uVUOfumc1DcKsIJIfMCHph08MjkOvZxvPb/Vi8hWw=", + "lastModified": 1708500294, + "narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ffed177a9d2c685901781c3c6c9024ae0ffc252b", + "rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11", "type": "github" }, "original": { From a3961b0bde91ec05308dddfa7823f89e52edc796 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 21 Feb 2024 11:21:08 +0100 Subject: [PATCH 1312/2308] Set lillian's password declaratively on EDI --- nixos/hosts/EDI/configuration.nix | 9 +++++++++ nixos/hosts/EDI/secrets/sops.yaml | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index aa96251..58350d5 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -30,6 +30,15 @@ ./hardware-configuration.nix ]; + sops.defaultSopsFile = ./secrets/sops.yaml; + sops.age.keyFile = ../../../../../../var/secrets/keys.txt; + + sops.secrets."lillian-password".neededForUsers = true; + + users.users.lillian = { + hashedPasswordFile = config.sops.secrets."lillian-password".path; + }; + home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { diff --git a/nixos/hosts/EDI/secrets/sops.yaml b/nixos/hosts/EDI/secrets/sops.yaml index 8a2082f..195607f 100644 --- a/nixos/hosts/EDI/secrets/sops.yaml +++ b/nixos/hosts/EDI/secrets/sops.yaml @@ -1,4 +1,4 @@ -password: ENC[AES256_GCM,data:4EAU7m0RF3BWnIDdcRFkC+UcwcQ=,iv:s1gF8edUjatry3h/e5ZmBXLOEJO1iX8tiyuanzuJgJY=,tag:cicC8WzOnIhG8xIM09nrTw==,type:str] +lillian-password: ENC[AES256_GCM,data:0mwqnvA+xrDD/m6uQtPbo9MpcFsOoqHE+Cg2gF6xZzNsqM3i/OmvAe7syp+mGBacZ3avoIHowLSWgXUkMcuFPeYa6XRkrX4LhA==,iv:f1kB54k6ZYWKlZ0Zowu8fOD0cf2WvNlX3GSpy1sUMdA=,tag:dsusc45E1BmYsNmiPzNccg==,type:str] sops: kms: [] gcp_kms: [] @@ -14,8 +14,8 @@ sops: eUZ6b09pYlRVWFBuUm1Ua2l6Z0dacW8KeQdAVsxXsDiDMtFA2koSpDsw7Ib63vA0 GE/ubWDwwRc7wMPFGuofIe6TaDSFgtVXza+yo+i4y51+BOpwqxlYYA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-04T09:24:15Z" - mac: ENC[AES256_GCM,data:SoNQ2F2hye6l4B29dLOycZYNqdpluRWgsIj0ZJ5aanExBKq8REHyoXU11X+ItZkrHkyNHyDf1cpQSwyL0AMJG6KXn0z//hKuMijOF3AQ5fXgIu4vmutvpvvIQ/7rBxATsFq43QjIWHsSOOfi1HYpBRlDwc/oTCG9G//NzR9MqOo=,iv:uhZuK1wGPUbhby++T2diyleLWvGbFE+1HCuw0y73eTQ=,tag:lkWn+nYkGP0L0HyVjjYhCA==,type:str] + lastmodified: "2024-02-21T10:15:11Z" + mac: ENC[AES256_GCM,data:AnQfufrAVvN2f2kr2KLM8toFj4BUxM1xvwH48DE1OcoenBlzQHu76R35cc9q0rJjOBWXYnZPLEHncE46XyXt56HPboH/blIEZwa9aL1pwDOV5UwbaqZTuSy7/Ylnn0ZoZtcD4gFnavWBT9iUgu3VjRso1i6eXm0Lc1mvwRbH63M=,iv:zJW4Bzm+IGzgxsFE7QP+E4RY5UoPWTUeo9RfoLpbSt8=,tag:E29Pnjtp0w05hdEQCmkj7A==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 261311687b130e8414e9dfb3eec4f7661db61f11 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 21 Feb 2024 11:43:24 +0100 Subject: [PATCH 1313/2308] Disable root password and make users immutable --- nixos/desktop/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 30b88af..9d01528 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -159,7 +159,12 @@ enable = true; }; + users.mutableuUsers = false; + users.users = { + root = { + hashedPassword = "*"; + }; lillian = { isNormalUser = true; extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; From 62a1b73475f3724b9be26d512926d6cc33fb997e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 21 Feb 2024 11:44:07 +0100 Subject: [PATCH 1314/2308] That's a typo, it's mutableUsers --- nixos/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 9d01528..3fda339 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -159,7 +159,7 @@ enable = true; }; - users.mutableuUsers = false; + users.mutableUsers = false; users.users = { root = { From 75a43bad231f148a3b1825201b08c4f26d9e4a19 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 21 Feb 2024 12:04:36 +0100 Subject: [PATCH 1315/2308] Update plasma settings EDI --- .../EDI/package-configs/plasma-desktop/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix index d065b77..c1a3aba 100644 --- a/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix +++ b/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix @@ -1,11 +1,4 @@ { - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { programs.plasma = { enable = true; shortcuts = { @@ -258,10 +251,12 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."General"."RememberOpenedTabs" = false; "dolphinrc"."IconsMode"."PreviewSize" = 80; "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "dolphinrc"."PreviewSettings"."Plugins" = "mobithumbnail,fontthumbnail,ebookthumbnail,kraorathumbnail,jpegthumbnail,windowsexethumbnail,comicbookthumbnail,djvuthumbnail,opendocumentthumbnail,windowsimagethumbnail,exrthumbnail,audiothumbnail,cursorthumbnail,svgthumbnail,blenderthumbnail,gsthumbnail,rawthumbnail,ffmpegthumbs,imagethumbnail,directorythumbnail"; "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; @@ -294,6 +289,7 @@ "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; + "kdeglobals"."PreviewSettings"."MaximumRemoteSize" = 0; "kdeglobals"."WM"."activeBackground" = "49,54,59"; "kdeglobals"."WM"."activeBlend" = "252,252,252"; "kdeglobals"."WM"."activeForeground" = "252,252,252"; @@ -836,6 +832,7 @@ "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."PreviewSettings"."MaximumRemoteSize[$d]" = ""; "khotkeysrc"."Voice"."Shortcut" = ""; "khotkeysrc"."WM"."activeBackground[$d]" = ""; "khotkeysrc"."WM"."activeBlend[$d]" = ""; @@ -844,6 +841,9 @@ "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; "kiorc"."Confirmations"."ConfirmDelete" = true; + "kiorc"."Confirmations"."ConfirmEmptyTrash" = true; + "kiorc"."Confirmations"."ConfirmTrash" = false; + "kiorc"."Executable scripts"."behaviourOnLaunch" = "alwaysAsk"; "krunnerrc"."Plugins"."baloosearchEnabled" = false; "krunnerrc"."Plugins"."locationsEnabled" = true; "krunnerrc"."Plugins"."placesEnabled" = true; From 5a05a797059de2e05ece14a4c772703748230987 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 21 Feb 2024 12:09:57 +0100 Subject: [PATCH 1316/2308] Little refactor --- nixos/hosts/EDI/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 58350d5..fb89ba7 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -37,6 +37,7 @@ users.users.lillian = { hashedPasswordFile = config.sops.secrets."lillian-password".path; + extraGroups = ["docker"]; }; home-manager = { @@ -80,8 +81,6 @@ # Enable bluetooth hardware hardware.bluetooth.enable = true; - users.users.lillian.extraGroups = ["docker"]; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } From 1e62fd28867b4b706e6c9e7a0e83cf1489a5473d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 21 Feb 2024 12:16:53 +0100 Subject: [PATCH 1317/2308] Little refactor to reduce reuse --- nixos/desktop/default.nix | 52 +++++++++++++++++++++++----- nixos/hosts/EDI/configuration.nix | 27 --------------- nixos/hosts/GLaDOS/configuration.nix | 23 ------------ 3 files changed, 43 insertions(+), 59 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 3fda339..e9b7baa 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -70,6 +70,9 @@ git-filter-repo gnupg pciutils + podman + podman-compose + sbctl waydroid xwaylandvideobridge yubikey-personalization @@ -89,6 +92,7 @@ # User tools noisetorch + qjackctl wireplumber ]; @@ -159,19 +163,49 @@ enable = true; }; + virtualisation.podman = { + enable = true; + dockerCompat = true; + }; + + sops.defaultSopsFile = ./secrets/sops.yaml; + sops.age.keyFile = ../../../../../../var/secrets/keys.txt; + + sops.secrets."lillian-password".neededForUsers = true; + + users.users.lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; + shell = pkgs.zsh; + hashedPasswordFile = config.sops.secrets."lillian-password".path; + }; + users.mutableUsers = false; - users.users = { - root = { - hashedPassword = "*"; - }; - lillian = { - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; - shell = pkgs.zsh; - }; + users.users.root = { + hashedPassword = "*"; }; + boot.bootspec.enable = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.supportedFilesystems = ["bcachefs"]; + boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; + boot.kernelModules = [ + # Virtual Camera + "v4l2loopback" + # Virtual Microphone, built-in + "snd-aloop" + ]; + # Set initial kernel module settings + boot.extraModprobeConfig = '' + # exclusive_caps: Skype, Zoom, Teams etc. will only show device when actually streaming + # card_label: Name of virtual camera, how it'll show up in Skype, Zoom, Teams + # https://github.com/umlaeute/v4l2loopback + options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" + ''; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; } diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index fb89ba7..40e4f31 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -30,16 +30,6 @@ ./hardware-configuration.nix ]; - sops.defaultSopsFile = ./secrets/sops.yaml; - sops.age.keyFile = ../../../../../../var/secrets/keys.txt; - - sops.secrets."lillian-password".neededForUsers = true; - - users.users.lillian = { - hashedPasswordFile = config.sops.secrets."lillian-password".path; - extraGroups = ["docker"]; - }; - home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { @@ -49,38 +39,21 @@ }; environment.systemPackages = with pkgs; [ - podman - podman-compose - sbctl ]; - virtualisation.podman = { - enable = true; - dockerCompat = true; - }; - networking.hostName = "EDI"; - boot.bootspec.enable = true; - boot.kernelPackages = pkgs.linuxPackages_latest; - boot.supportedFilesystems = ["bcachefs"]; - # Lanzaboote currently replaces the systemd-boot module. # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. boot.loader.systemd-boot.enable = lib.mkForce false; - boot.loader.systemd-boot.configurationLimit = 3; - boot.loader.efi.canTouchEfiVariables = true; boot.lanzaboote = { enable = true; pkiBundle = "/etc/secureboot"; }; - # Enable bluetooth hardware - hardware.bluetooth.enable = true; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 4de3f5b..10ec478 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -31,10 +31,6 @@ ]; environment.systemPackages = with pkgs; [ - podman - podman-compose - sbctl - qjackctl ]; services.xserver.videoDrivers = ["amdgpu"]; @@ -55,25 +51,6 @@ pkiBundle = "/etc/secureboot"; }; - boot.loader.systemd-boot.configurationLimit = 3; - boot.loader.efi.canTouchEfiVariables = true; - boot.supportedFilesystems = ["bcachefs"]; - boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; - boot.kernelModules = [ - # Virtual Camera - "v4l2loopback" - # Virtual Microphone, built-in - "snd-aloop" - ]; - # Set initial kernel module settings - boot.extraModprobeConfig = '' - # exclusive_caps: Skype, Zoom, Teams etc. will only show device when actually streaming - # card_label: Name of virtual camera, how it'll show up in Skype, Zoom, Teams - # https://github.com/umlaeute/v4l2loopback - options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" - ''; - boot.kernelPackages = pkgs.linuxPackages_latest; - home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { From 316ecdcc6c87394124603390b22b0b92424ce308 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 21 Feb 2024 12:19:42 +0100 Subject: [PATCH 1318/2308] Sops file needs to be in the right folder --- nixos/desktop/default.nix | 3 --- nixos/hosts/EDI/configuration.nix | 3 +++ nixos/hosts/GLaDOS/configuration.nix | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index e9b7baa..a525c4b 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -168,9 +168,6 @@ dockerCompat = true; }; - sops.defaultSopsFile = ./secrets/sops.yaml; - sops.age.keyFile = ../../../../../../var/secrets/keys.txt; - sops.secrets."lillian-password".neededForUsers = true; users.users.lillian = { diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 40e4f31..4aa7608 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -30,6 +30,9 @@ ./hardware-configuration.nix ]; + sops.defaultSopsFile = ./secrets/sops.yaml; + sops.age.keyFile = ../../../../../../var/secrets/keys.txt; + home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 10ec478..3be7c60 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -30,6 +30,9 @@ ./hardware-configuration.nix ]; + sops.defaultSopsFile = ./secrets/sops.yaml; + sops.age.keyFile = ../../../../../../var/secrets/keys.txt; + environment.systemPackages = with pkgs; [ ]; From 6dd7bfeb5c5f19e96684b2e55fbfc45dd46f2cbb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 11:55:48 +0100 Subject: [PATCH 1319/2308] Put font install in the correct place --- nixos/shared/packages/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index f262768..5c6c5c2 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -23,8 +23,17 @@ tldr # System libraries + ]; + + fonts.packages = with pkgs; [ noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + mplus-outline-fonts.githubRelease + dina-font + proggyfonts ]; } From a8a5cdec7b1e3c59772b2a2694ff381b2ed05e5c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 12:52:10 +0100 Subject: [PATCH 1320/2308] Put user definition in the shared file to reduce duplicate code --- nixos/desktop/default.nix | 15 --------------- nixos/hosts/queen/configuration.nix | 12 ------------ nixos/hosts/shodan/configuration.nix | 12 +----------- nixos/hosts/wheatley/configuration.nix | 12 ------------ nixos/shared/default.nix | 18 ++++++++++++++++++ 5 files changed, 19 insertions(+), 50 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index a525c4b..6ccf2db 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -168,21 +168,6 @@ dockerCompat = true; }; - sops.secrets."lillian-password".neededForUsers = true; - - users.users.lillian = { - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; - shell = pkgs.zsh; - hashedPasswordFile = config.sops.secrets."lillian-password".path; - }; - - users.mutableUsers = false; - - users.users.root = { - hashedPassword = "*"; - }; - boot.bootspec.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; boot.supportedFilesystems = ["bcachefs"]; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 87201be..393080c 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -135,18 +135,6 @@ # users.groups.virtualMail = {}; - users.users = { - lillian = { - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" - ]; - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; - shell = pkgs.zsh; - }; - }; - # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 0eb3bed..c44bca5 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -211,17 +211,7 @@ enable = true; }; - users.users = { - lillian = { - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" - ]; - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "decky"]; - shell = pkgs.zsh; - }; - }; + users.users.lillian.extraGroups = ["decky"]; # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index a463516..83e5295 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -117,18 +117,6 @@ enable = true; }; - users.users = { - lillian = { - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" - ]; - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"]; - shell = pkgs.zsh; - }; - }; - home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 281b3e1..b7e9f15 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -10,4 +10,22 @@ ./locale ./packages ]; + sops.secrets."lillian-password".neededForUsers = true; + + users.users.lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; + shell = pkgs.zsh; + hashedPasswordFile = config.sops.secrets."lillian-password".path; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + ]; + }; + + users.mutableUsers = false; + + users.users.root = { + hashedPassword = "*"; + }; } From b21150f431169f21a3edc429efe3c66853940952 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 13:01:31 +0100 Subject: [PATCH 1321/2308] Set password for all hosts, made sops look at the same folder for the key file for all hosts (move in queen) --- nixos/hosts/EDI/configuration.nix | 1 - nixos/hosts/GLaDOS/configuration.nix | 1 - nixos/hosts/GLaDOS/secrets/sops.yaml | 21 +++++++++++++++++++++ nixos/hosts/queen/configuration.nix | 1 - nixos/hosts/queen/secrets/sops.yaml | 5 +++-- nixos/hosts/shodan/secrets/sops.yaml | 5 +++-- nixos/hosts/wheatley/configuration.nix | 1 - nixos/hosts/wheatley/secrets/sops.yaml | 5 +++-- nixos/shared/default.nix | 1 + 9 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 nixos/hosts/GLaDOS/secrets/sops.yaml diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 4aa7608..0c9bb0d 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -31,7 +31,6 @@ ]; sops.defaultSopsFile = ./secrets/sops.yaml; - sops.age.keyFile = ../../../../../../var/secrets/keys.txt; home-manager = { extraSpecialArgs = {inherit inputs outputs;}; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 3be7c60..94e947a 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -31,7 +31,6 @@ ]; sops.defaultSopsFile = ./secrets/sops.yaml; - sops.age.keyFile = ../../../../../../var/secrets/keys.txt; environment.systemPackages = with pkgs; [ ]; diff --git a/nixos/hosts/GLaDOS/secrets/sops.yaml b/nixos/hosts/GLaDOS/secrets/sops.yaml new file mode 100644 index 0000000..66274e0 --- /dev/null +++ b/nixos/hosts/GLaDOS/secrets/sops.yaml @@ -0,0 +1,21 @@ +lillian-password: ENC[AES256_GCM,data:aHJCYmnpGIWJMsNZ8aw51Rquuv4F7kgGvfIxHMELuDlEqgjkg+SAhh+UQEpv16F0WVxrYZ/EwxKFMBpfPv9M2NLZC98bav0D9g==,iv:uzYLfmxG46ubmgeFsfW7aqXZbcL+TQw0VdDcklV0/ZI=,tag:Ozcf5qXC7xh0VcsBzhyo2g==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLUHlSTzhndDRHOUd1WG41 + Wk9haEVmS3FlcFl5VUxRZUVDaENHcUpsYm04ClBJS3doOXRHUjhsMmIvck5ldy8y + VW9yb2NCRWZhNGNlZWlyRlk4NFJiTTgKLS0tIElLMFdiUU95ejNoUFl4US9DSWU5 + MUZWTVh0dVdMZlRzelJ4WlROUlIyNmcKphNuMN9Wh8h/gvmtUxQWjPKtgjWriLRD + +DpEEVGrmu0RJ8/wUqjxGoL4GzLAlZm4EnKlyUyA0tw8sbLZ2Lnl/w== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-02-22T11:58:42Z" + mac: ENC[AES256_GCM,data:TuNvE51hpHvOjB3G2y7UCT8BvlI1ulc8aeeBihtnGiGDjwU1Eze1bdA47hZYCZsCYdo3Tow1gY0gCkJACKeWqUXMLT8jxcUfiUWqQicQhBm/TT9m+oqLQiAqJCkh1Ez8XuaftqIg+oJstyy4wZyvMK8Bg+9EsSYiBnMrKfrgLBs=,iv:GXy93l1BBkkeKXJ1ntFI6Rw6QZmSbzDlWClJ16/Csv4=,tag:jBYynl6tLL/xN61ypMwvrw==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 393080c..77f34b3 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -52,7 +52,6 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ./secrets/sops.yaml; - sops.age.keyFile = ../../../../../var/secrets/keys.txt; nix = { gc = { diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index 1eba722..955740b 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -7,6 +7,7 @@ mssqlpass: ENC[AES256_GCM,data:XEu4bQC5qM5Cm8UDVX3qAzTuL/t3xbx+qcEbZM4h3Hg=,iv:j mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8,iv:oAFna87l3sL/42ljUF1QsRL0xBrP82uYdKLxK/8HcQE=,tag:liFFGHbNPOpOHyMsjnvMOQ==,type:str] rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8uo8I8ZymVgIMKLI=,tag:Fr8rWIttLz7X8Pri6FBJBQ==,type:str] wg-private: ENC[AES256_GCM,data:6BEuNqqG//p5UhRmQ4RPEze6jZdvzK4PEXxlbX2ANYIhFpacj0aZnCr9o/A=,iv:tPlwYdV4I5oA8qG+bfVi1Dpbf7xedByantqsmylZXKQ=,tag:k1BqKqlayOWz5QW1XiAjqQ==,type:str] +lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW7IUpjHMyS7YP+pmmvDCzM9afIXMxyPFHGNRwiCmxqstiiNeSeLdo6rDw==,iv:sGeu9aNTgdpThv+0Z/nZKIrat1xNgM0t/KTGPaFbsdI=,tag:kZBHF4X0KO9znog61NwU+Q==,type:str] sops: kms: [] gcp_kms: [] @@ -22,8 +23,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-04T21:18:00Z" - mac: ENC[AES256_GCM,data:ZHXg541BI94kwvLJ/CFHS7UauQN6LimqNK9rU60dil1RIArDy5xHtRki/p5uajKeGhM+Bv1t9SWAehk1n3U0PiynLGLm3npraIxItBPiRf7hyqDXmc8kG4U7BBcbIf3qvkvxVVd5auWfnPobKsRhKA+gC1Z11ylPqK37yIgK5Sw=,iv:EKacOHhgwjFDw2ioraxlyfXt89VpT+B4D/a/rC+ulNM=,tag:YvgctOLxmojg2uOAlKihkQ==,type:str] + lastmodified: "2024-02-22T11:53:17Z" + mac: ENC[AES256_GCM,data:bOrEW/yQIgJy7Jqfj/95jtXoIeEX2JNTvsnodkrtmtUQoY8Lczb47rTLpS0CM9Gh1Do38dvoNgWY08jXj3PVPO6s7Yy995ZbtgaR8n/G190PZ+p+i7EInv/OAJe/Xw4WcZlLs1XeKPashJmoX7qZi2fVPmu5UpYD1YiCMzZsWkQ=,iv:vjEJCDX8D4relmBJs569d+sklY1bUptWBjJVS7pKB70=,tag:xsQM3cDBkHymS9t9Qyyitg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/hosts/shodan/secrets/sops.yaml b/nixos/hosts/shodan/secrets/sops.yaml index 45ec605..21314df 100644 --- a/nixos/hosts/shodan/secrets/sops.yaml +++ b/nixos/hosts/shodan/secrets/sops.yaml @@ -1,4 +1,5 @@ pass: ENC[AES256_GCM,data:M7V75Q7I,iv:d59fWvFsEOOu8A+BSK0f2ZskX1SXHN1wA3EfGGsHp70=,tag:FLTogvUgI3HdKYWCJc/M1Q==,type:int] +lillian-password: ENC[AES256_GCM,data:w/1/aAcP0MXe7EUhZshMcksvyzewlvO2/0PncrSnCkHHrPl8RHWvyBqxIZDC/FHlpZOO77lIsdcQzK9ahjEc/crUmit5LZeYThP4pPyXTol3uh3RqtH1HXbeOEmBufw4Ln+yJwWXo2eK4w==,iv:jEuB/+U2xe3sP6UIK9OZZKd0RBr5W8f5y55h64pMME4=,tag:2ZzNt7Sn2LXfUMVMoaOxkw==,type:str] sops: kms: [] gcp_kms: [] @@ -14,8 +15,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-12-28T21:33:20Z" - mac: ENC[AES256_GCM,data:4tFAJCqCAfqlIGj7kDQ9uoUg7TgXYgogkm/h0nP6fuedKiV/CRmD8CbdWInesaDP276pggZbtUY9I92pV8bpJ2h+U07qihTo79ZTPTsObUHQrrc002ZiYwCtI+14t1+2KuTQNpEJsZxoECjG1R0mjg3Zv8MQ0wj6YpnEaGmXkC0=,iv:roPZJXFjB7lLK4RQcmQaNOq5RRCvguNO4O2iasgolEU=,tag:j7G0HvAx6XqrijyZcqntXQ==,type:str] + lastmodified: "2024-02-22T11:57:17Z" + mac: ENC[AES256_GCM,data:IpF786I/i4U0oQqY1sRQAGZkK0uxHZYpZ2Hse2dzenedbwVZEOmhA1foc0fffVMd26AOrSg323vnndIEl1WTuzmZBhFlUM3fwX38wbhDrAuUJfGiyLLBVsZshW2EjkGzkdpQo2otyLNjah5qLUTsss5dUKMIUbTKpwAdkiujiqE=,iv:sA6ROO538N+XcezZUSQxwer5dLd+lmlavTVeDxiVVJA=,tag:GZZLUp3ZiUW25Tdji0tZGg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 83e5295..92a9e7b 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -53,7 +53,6 @@ }; sops.defaultSopsFile = ./secrets/sops.yaml; - sops.age.keyFile = ../../../../../var/secrets/keys.txt; sops.secrets."wireless.env".mode = "0440"; sops.secrets."wireless.env".owner = config.users.users.root.name; diff --git a/nixos/hosts/wheatley/secrets/sops.yaml b/nixos/hosts/wheatley/secrets/sops.yaml index 94f8617..5594a50 100644 --- a/nixos/hosts/wheatley/secrets/sops.yaml +++ b/nixos/hosts/wheatley/secrets/sops.yaml @@ -1,4 +1,5 @@ wireless.env: ENC[AES256_GCM,data:a5sUW0Lc4GRd9aUJwHbmQvzvRB8WaRjMSQ==,iv:+3ncL38E3aqbejoCzzeBtMukLk4n/AQBJELlqhXDqSA=,tag:buY9Mp10DAEEEKqSyHwB3g==,type:str] +lillian-password: ENC[AES256_GCM,data:GY7WyfLRc/q4fecnazWzfoZsruN/F0ar7mJ9RaqTHSb9K6xhEmifmJeqpR5xGIJYW6MYciCsZ9YmRsJbuSHTIlo9PrCTYBGvXg==,iv:bzml3abPox3RdvtKBQiBAcVXHUdGAn0ETMsDpBtT8T0=,tag:2iaBJ4hFFBUbonslTvQH5Q==,type:str] sops: kms: [] gcp_kms: [] @@ -14,8 +15,8 @@ sops: Vm9mWk5JRGtZNVVhN1JQWTBlb2kySkEKoLI1MzS3uGNUbyn7kI5DylKZiPtc1div bKIboWoobTfDt0EURfmZ5+JrX6DlZxRyNQyl9dsKmZT6pLdaIppStA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-12T16:14:03Z" - mac: ENC[AES256_GCM,data:J/0+e7w8tcfsQ9xtWJifKYpWQLpLssjSgxMl/PdIyYuWKDKkF/dDr+joP7Evlk5Hg3dXL7ijGFgYVwUjhFzbgk9pUiHt0cvXj0hthgwUIUpQh42M6qKtxRaxP/Mp9Shb2CSwZfZ2GyXP4lJuMS76SDKo46xGdbejwlLPZ11oArA=,iv:rWrrB9VUxX3N2OSSep9SPfyl9Ke7hQVGkheazOrbis4=,tag:9fBYgtCoNm9Unv7ADJTb0Q==,type:str] + lastmodified: "2024-02-22T11:57:45Z" + mac: ENC[AES256_GCM,data:V9vscu55woZjJGFV3aDgdHKqmIopYw6cajdOHG1/45Qel6l5YJkt8VyLMzYlUOlFGatXBlfTB7VC9zhhaY4lduww2XLrARcTk61BT+GSHp5sawND+RIDghY6CJBuoPUbtsfmmlmg+J2DljBlSbrcVmvfjMV12Ql6Zb8PEPM9K68=,iv:TFrDt1XpuIFLUyDN6+8n+0OypBkr1OrZOmXWvnY9ApI=,tag:EfsFhToEGFCZJSXh0WBrIw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index b7e9f15..db6995d 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -10,6 +10,7 @@ ./locale ./packages ]; + sops.age.keyFile = ../../../../../../var/secrets/keys.txt; sops.secrets."lillian-password".neededForUsers = true; users.users.lillian = { From b911aec529025aa13115e93ca8a7d5a89989d912 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 13:03:52 +0100 Subject: [PATCH 1322/2308] Shodan had a keyfile set that isn't right --- nixos/hosts/shodan/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index c44bca5..f620539 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -52,7 +52,6 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ./secrets/sops.yaml; - sops.age.keyFile = ./keys.txt; nix = { gc = { From 6d32c58490787008d56224b572c5b6199da920b5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 13:06:08 +0100 Subject: [PATCH 1323/2308] Wheatley used the old format for importing shared, fixed --- nixos/hosts/wheatley/configuration.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 92a9e7b..397e430 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -15,11 +15,8 @@ ./armv7l.nix ./hardware-configuration.nix - # Import locale settings - ../../shared/locale - - # Import shared packages - ../../shared/packages + # Import shared configurations + ../../shared ]; boot.loader.generic-extlinux-compatible.enable = true; From eba73661ad17f7b758b4bd568e3b7772424a3ca9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 13:17:43 +0100 Subject: [PATCH 1324/2308] Use yescrypt for shodan too --- nixos/hosts/shodan/secrets/sops.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/secrets/sops.yaml b/nixos/hosts/shodan/secrets/sops.yaml index 21314df..cdc6591 100644 --- a/nixos/hosts/shodan/secrets/sops.yaml +++ b/nixos/hosts/shodan/secrets/sops.yaml @@ -1,5 +1,5 @@ pass: ENC[AES256_GCM,data:M7V75Q7I,iv:d59fWvFsEOOu8A+BSK0f2ZskX1SXHN1wA3EfGGsHp70=,tag:FLTogvUgI3HdKYWCJc/M1Q==,type:int] -lillian-password: ENC[AES256_GCM,data:w/1/aAcP0MXe7EUhZshMcksvyzewlvO2/0PncrSnCkHHrPl8RHWvyBqxIZDC/FHlpZOO77lIsdcQzK9ahjEc/crUmit5LZeYThP4pPyXTol3uh3RqtH1HXbeOEmBufw4Ln+yJwWXo2eK4w==,iv:jEuB/+U2xe3sP6UIK9OZZKd0RBr5W8f5y55h64pMME4=,tag:2ZzNt7Sn2LXfUMVMoaOxkw==,type:str] +lillian-password: ENC[AES256_GCM,data:uPNBvMyhkiX3eedduFlsFUIcas/VBVSYrsmGTlgGUOzTQST59CYZRoq0ArphIJ3+Usy6KbR5tA5FCp4PoB3qVYBfjlAq6dhZIw==,iv:TiUIo2lvdL6SiDuW4gWn0TeJXkz5MldzqGxuK3MNPnE=,tag:d3p/h+q50JxygDtk2qxIeQ==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +15,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-02-22T11:57:17Z" - mac: ENC[AES256_GCM,data:IpF786I/i4U0oQqY1sRQAGZkK0uxHZYpZ2Hse2dzenedbwVZEOmhA1foc0fffVMd26AOrSg323vnndIEl1WTuzmZBhFlUM3fwX38wbhDrAuUJfGiyLLBVsZshW2EjkGzkdpQo2otyLNjah5qLUTsss5dUKMIUbTKpwAdkiujiqE=,iv:sA6ROO538N+XcezZUSQxwer5dLd+lmlavTVeDxiVVJA=,tag:GZZLUp3ZiUW25Tdji0tZGg==,type:str] + lastmodified: "2024-02-22T12:17:27Z" + mac: ENC[AES256_GCM,data:JYOxnbBK2Uj/TH9Pc6gFf0xE82lD726Jm2R7fz4WYM3pAeYoeauRVU0YoxKhOHmAjAq9ZyHZVdWg3bSMMEz9ONz/F6LZiI5qegT+SO3uAPaTRwUa639G6RGO5b86LIRPuXBw5sdePeoxDt62rOiT6UhySK5XiEysEv5NyQFijlw=,iv:1pbuTtnRbaNKRn73NLZ+s3ZW2sGAc80tRd2QWTR4688=,tag:YndVhpjQC1aUBhmv7d/4+A==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From f2ff58d622c4881bf3f234ec6f0f2d4639f5f2b9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 14:35:08 +0100 Subject: [PATCH 1325/2308] Clarified with a comment here --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 77f34b3..e0542b0 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -21,7 +21,7 @@ # Import shared settings ../../shared - #../../server/package-configs/akkoma/configuration.nix + # Import server settings ../../server ]; From 5e61dfeb352e6fb3e2e85f1146ae0b3c73bc8a83 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 14:44:50 +0100 Subject: [PATCH 1326/2308] Clarified the readme documentation --- README.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5dfb5df..66f29af 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,18 @@ The configuration of different NixOS hosts using flakes and home-manager. It is ## Building and deploying the configuration -The first step is to add your age keyfile to the /nix/var/secrets folder with the name "keys.txt" (if you don't have one, remove the imports from the configuration files; the import can be found under -``hosts//configuration.nix``). +The first step is to add your age keyfile to the /var/secrets folder with the name "keys.txt", in my case an age private key. If you don't have have an age private key you can generate one with the command +``age-keygen -o /var/secrets/keys.txt`` -Then run this command within your cloned github repo (I put mine in /etc/nixos): +**Note: make sure this key is not readable by normal users, I made it owned by root, and gave the file 400 (read only for user) permissions. eg: ``chown 400 /var/secrets/keys.txt``** + +if you don't want to use sops remove the import from the configuration files; the import can be found under +``hosts/shared/default.nix`` + +Upon any of the above changes; also remove/replace the secret files, they can be found under the host configuration folders in +``hosts//secrets/sops.yaml`` + +Then run this command with your cloned github repo (I put mine in /etc/nixos): ``sudo nixos-rebuild --flake .# switch`` @@ -33,10 +41,10 @@ Note: this does not build the full configuration, and errors might still happen ## Technical details -### Home manager +### Home manager[https://github.com/nix-community/home-manager] Home manager is imported as a module within the global configuration, it is therefor not needed to build home-manager packages separately in this configuration. On multi user systems it might be useful to pull the home-manager configurations from separate repos for different users, so you don't have to give your users access to the global configuration. -### Sops +### Sops[https://github.com/Mic92/sops-nix] The secrets are managed in sops files within the hosts folders, there is only one sops file per host, but this can be changed quite easily. The command to edit the sops file is as follows: ``nix-shell -p sops --run "sops ./nixos/hosts//secrets/sops.yaml"`` From 1fbaabe861811f25fbe062342d1f4daa0bb756d0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 14:46:08 +0100 Subject: [PATCH 1327/2308] Made sure this is clear too --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66f29af..ee2846f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The configuration of different NixOS hosts using flakes and home-manager. It is ## Building and deploying the configuration -The first step is to add your age keyfile to the /var/secrets folder with the name "keys.txt", in my case an age private key. If you don't have have an age private key you can generate one with the command +If you do not have my private age key, the first step is to add your age keyfile to the /var/secrets folder with the name "keys.txt", in my case an age private key. If you don't have have an age private key you can generate one with the command ``age-keygen -o /var/secrets/keys.txt`` **Note: make sure this key is not readable by normal users, I made it owned by root, and gave the file 400 (read only for user) permissions. eg: ``chown 400 /var/secrets/keys.txt``** From a824b3c1a485880521a88b8550d5178be477f259 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 14:53:31 +0100 Subject: [PATCH 1328/2308] Add lanzaboot explanation --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ee2846f..64ced50 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,12 @@ if you don't want to use sops remove the import from the configuration files; th Upon any of the above changes; also remove/replace the secret files, they can be found under the host configuration folders in ``hosts//secrets/sops.yaml`` +For the hosts EDI and GLaDOS, [lanzaboot](https://github.com/nix-community/lanzaboote) has to be disabled (and re-enabled if you want secure boot after install). You can first replace enabling lanzaboot with systemd-boot. You can do this by commenting out the lanzaboot configuration, and replace the line + + ``boot.loader.systemd-boot.enable = lib.mkForce false;`` with ``boot.loader.systemd-boot.enable = true`` + + To turn secure boot back on again you can look at the [lanzaboot](https://github.com/nix-community/lanzaboote) repository and follow the install steps. + Then run this command with your cloned github repo (I put mine in /etc/nixos): ``sudo nixos-rebuild --flake .# switch`` @@ -41,10 +47,10 @@ Note: this does not build the full configuration, and errors might still happen ## Technical details -### Home manager[https://github.com/nix-community/home-manager] +### [Home manager](https://github.com/nix-community/home-manager) Home manager is imported as a module within the global configuration, it is therefor not needed to build home-manager packages separately in this configuration. On multi user systems it might be useful to pull the home-manager configurations from separate repos for different users, so you don't have to give your users access to the global configuration. -### Sops[https://github.com/Mic92/sops-nix] +### [Sops](https://github.com/Mic92/sops-nix) The secrets are managed in sops files within the hosts folders, there is only one sops file per host, but this can be changed quite easily. The command to edit the sops file is as follows: ``nix-shell -p sops --run "sops ./nixos/hosts//secrets/sops.yaml"`` From cd29e813f33bb6e1d17ff399fcc1ba8d3ba06bed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 14:56:45 +0100 Subject: [PATCH 1329/2308] Clarity as to where sops looks for files --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 64ced50..ad6b592 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,12 @@ The configuration of different NixOS hosts using flakes and home-manager. It is ## Building and deploying the configuration If you do not have my private age key, the first step is to add your age keyfile to the /var/secrets folder with the name "keys.txt", in my case an age private key. If you don't have have an age private key you can generate one with the command -``age-keygen -o /var/secrets/keys.txt`` + +``age-keygen -o ~/.config/sops/age/keys.txt`` and copying this file to ``/var/secrets/`` **Note: make sure this key is not readable by normal users, I made it owned by root, and gave the file 400 (read only for user) permissions. eg: ``chown 400 /var/secrets/keys.txt``** -if you don't want to use sops remove the import from the configuration files; the import can be found under +if you don't want to use [Sops](https://github.com/Mic92/sops-nix) secret management remove the import from the configuration files; the import can be found under ``hosts/shared/default.nix`` Upon any of the above changes; also remove/replace the secret files, they can be found under the host configuration folders in From dd377bc1a5673bb09eda50172f14bf050361f3c9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 14:57:20 +0100 Subject: [PATCH 1330/2308] small s, that would bother me --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad6b592..44b3f5b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you do not have my private age key, the first step is to add your age keyfile **Note: make sure this key is not readable by normal users, I made it owned by root, and gave the file 400 (read only for user) permissions. eg: ``chown 400 /var/secrets/keys.txt``** -if you don't want to use [Sops](https://github.com/Mic92/sops-nix) secret management remove the import from the configuration files; the import can be found under +if you don't want to use [sops](https://github.com/Mic92/sops-nix) secret management remove the import from the configuration files; the import can be found under ``hosts/shared/default.nix`` Upon any of the above changes; also remove/replace the secret files, they can be found under the host configuration folders in From d589e1d4be887d14b452673bf3694c5dc6a717a2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 14:58:32 +0100 Subject: [PATCH 1331/2308] Remove some unecessary whitespace --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 44b3f5b..31f5291 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ Upon any of the above changes; also remove/replace the secret files, they can be For the hosts EDI and GLaDOS, [lanzaboot](https://github.com/nix-community/lanzaboote) has to be disabled (and re-enabled if you want secure boot after install). You can first replace enabling lanzaboot with systemd-boot. You can do this by commenting out the lanzaboot configuration, and replace the line - ``boot.loader.systemd-boot.enable = lib.mkForce false;`` with ``boot.loader.systemd-boot.enable = true`` +``boot.loader.systemd-boot.enable = lib.mkForce false;`` with ``boot.loader.systemd-boot.enable = true`` - To turn secure boot back on again you can look at the [lanzaboot](https://github.com/nix-community/lanzaboote) repository and follow the install steps. +To turn secure boot back on again you can look at the [lanzaboot](https://github.com/nix-community/lanzaboote) repository and follow the install steps. Then run this command with your cloned github repo (I put mine in /etc/nixos): From 125d119e18cf6cb2d6d54cff21b73afa604d23ca Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 15:22:45 +0100 Subject: [PATCH 1332/2308] Add tpm tools --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 6ccf2db..a64fd82 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -73,6 +73,7 @@ podman podman-compose sbctl + tpm2-tools waydroid xwaylandvideobridge yubikey-personalization From 5b296e8157beb164c72cc727c2078a40418ad0ed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 15:24:39 +0100 Subject: [PATCH 1333/2308] tss libraries too --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index a64fd82..9f57185 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -74,6 +74,7 @@ podman-compose sbctl tpm2-tools + tpm2-tss waydroid xwaylandvideobridge yubikey-personalization From b1e4af16d8ced4899dd14d0dfdfd6d780e9bc492 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 22 Feb 2024 15:31:14 +0100 Subject: [PATCH 1334/2308] Settings needed according to https://nixos.wiki/wiki/TPM --- nixos/desktop/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 9f57185..45b5a7c 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -170,6 +170,11 @@ dockerCompat = true; }; + security.tpm2.enable = true; + security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so + security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables + users.users.lillian.extraGroups = ["tss"]; # tss group has access to TPM devices + boot.bootspec.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; boot.supportedFilesystems = ["bcachefs"]; From 05303ca601a99bf7f9fcb3b5e0efbb5b184f1314 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 23 Feb 2024 13:57:56 +0100 Subject: [PATCH 1335/2308] Added redhat java to vscode --- home-manager/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 03add67..7180f22 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -114,6 +114,7 @@ #ms-vscode-remote.remote-containers ms-vscode-remote.remote-ssh oderwat.indent-rainbow + redhat.java rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; From 17f9ea4ffc15780b647a9746c3672291b73cf450 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 23 Feb 2024 14:04:42 +0100 Subject: [PATCH 1336/2308] Let's disable it and see if I can dynamically add it with direnv --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 7180f22..0479e13 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -114,7 +114,7 @@ #ms-vscode-remote.remote-containers ms-vscode-remote.remote-ssh oderwat.indent-rainbow - redhat.java + #redhat.java rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; From f247e563542f341bdee156197c61d1fc8beabf6b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 25 Feb 2024 16:16:01 +0100 Subject: [PATCH 1337/2308] Remove nix-env selector for vscodium --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 0479e13..568f8ce 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -97,7 +97,7 @@ enable = true; package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ - arrterian.nix-env-selector + #arrterian.nix-env-selector #ban.spellright #charliermarsh.ruff dracula-theme.theme-dracula From ea6e6a0233f6f49840183e22a8266db317238eff Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 25 Feb 2024 17:27:55 +0100 Subject: [PATCH 1338/2308] Update flake lock --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 13c041e..f28daed 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1708305517, - "narHash": "sha256-WYnEspeTTksC21obnnxWOGOAQbnBD0GES0S0XOLsJjs=", + "lastModified": 1708564520, + "narHash": "sha256-juduDTYBhGN6jNfQ5RMDpbQF+MkO0pj3k7XGDSTjAbs=", "owner": "nix-community", "repo": "disko", - "rev": "1ae1f57dad13595600dd57b6a55fcbaef6673804", + "rev": "23d308f0059955e3719efc81a34d1fc0369fbb74", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1708451036, - "narHash": "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790=", + "lastModified": 1708806879, + "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", "owner": "nix-community", "repo": "home-manager", - "rev": "517601b37c6d495274454f63c5a483c8e3ca6be1", + "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1708148641, - "narHash": "sha256-UliMMpx84PPA+0mcyBj2yuKNawOX7L4u/wO8j9QGHVk=", + "lastModified": 1708585220, + "narHash": "sha256-eQ5nGEEW4I8Btwso6Q940xilYG7QNyTuocfB0awjpA8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f318a856ff3177fdea6044d6c77dd49992330a31", + "rev": "2654de9ed084890d1814a841c4f863e9d7a44d54", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1708402276, - "narHash": "sha256-7ZTUHdMwy8o6d8ela6H7H3UcS7cyns4D1zuWbmU1dCI=", + "lastModified": 1708563055, + "narHash": "sha256-FaojUZNu+YPFi3eCI7mL4kxPKQ51DoySa7mqmllUOuc=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "fa146e1a156c83b009b398213c661d6b46d71421", + "rev": "f4631dee1a0fd56c0db89860e83e3588a28c7631", "type": "github" }, "original": { @@ -347,11 +347,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708469763, - "narHash": "sha256-wCJljz6nQdCAnfTx+3i4fWteB3TnVEq95z6d6LhwVKs=", + "lastModified": 1708751719, + "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5eeded8e3518579daa13887297efa79f5be74b41", + "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", "type": "github" }, "original": { @@ -409,11 +409,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1708210246, - "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=", + "lastModified": 1708819810, + "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49", + "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1708296515, - "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1708296515, - "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { @@ -504,11 +504,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1708151420, - "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", + "lastModified": 1708751719, + "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", + "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", "type": "github" }, "original": { @@ -554,11 +554,11 @@ ] }, "locked": { - "lastModified": 1707590627, - "narHash": "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw=", + "lastModified": 1708693644, + "narHash": "sha256-QZxSFZXJ0omNHCN7CT8MeaJwkEPEztvknA6+7wDldcY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "4e56cfeb95081a43cb49487d0996dc936d6201e5", + "rev": "02a9761ac6b692eba60a73c1196d205d24300de7", "type": "github" }, "original": { @@ -671,11 +671,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1708500294, - "narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=", + "lastModified": 1708830076, + "narHash": "sha256-Cjh2xdjxC6S6nW6Whr2dxSeh8vjodzhTmQdI4zPJ4RA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11", + "rev": "2874fbbe4a65bd2484b0ad757d27a16107f6bc17", "type": "github" }, "original": { From 983e994930b9e023991980c7069e5f02acc9733f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 Feb 2024 12:59:49 +0100 Subject: [PATCH 1339/2308] Remove some unneeded comments --- nixos/desktop/default.nix | 12 ------------ nixos/hosts/queen/configuration.nix | 9 --------- nixos/hosts/shodan/configuration.nix | 10 ---------- nixos/hosts/wheatley/configuration.nix | 9 --------- 4 files changed, 40 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 45b5a7c..5c0703c 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -19,20 +19,8 @@ outputs.overlays.additions outputs.overlays.modifications #outputs.overlays.unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) ]; - # Configure your nixpkgs instance config = { - # Disable if you don't want unfree packages allowUnfree = true; }; }; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index e0542b0..cbbbb3a 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -33,15 +33,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) ]; # Configure your nixpkgs instance config = { diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f620539..07a42b6 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -32,16 +32,6 @@ # You can add overlays here overlays = [ inputs.extest.overlays.default - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) ]; # Configure your nixpkgs instance config = { diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 397e430..b609001 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -32,15 +32,6 @@ nixpkgs = { # You can add overlays here overlays = [ - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) ]; # Configure your nixpkgs instance config = { From 52a50108912010f9e194ff3e92ad1c2e93c43291 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 Feb 2024 14:17:34 +0100 Subject: [PATCH 1340/2308] add rebuild command (untested) --- nixos/shared/packages/default.nix | 12 ++++++++++++ pkgs/default.nix | 1 + pkgs/rebuild/default.nix | 27 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/rebuild/default.nix diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 5c6c5c2..1182fbb 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -6,7 +6,19 @@ pkgs, ... }: { + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.additions + outputs.overlays.modifications + ]; + }; + environment.systemPackages = with pkgs; [ + # Custom tools + rebuild + # System tools age alejandra diff --git a/pkgs/default.nix b/pkgs/default.nix index 998cdfa..7569bfa 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,4 +4,5 @@ pkgs: { dvd = pkgs.callPackage ./dvd {}; dvt = pkgs.callPackage ./dvt {}; servo = pkgs.callPackage ./servo {}; + rebuild = pkgs.callPackage ./rebuild {}; } diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix new file mode 100644 index 0000000..50a57fc --- /dev/null +++ b/pkgs/rebuild/default.nix @@ -0,0 +1,27 @@ +{ + lib, + stdenv, + writeShellApplication, +}: +writeShellApplication +{ + name = "rebuild"; + + runtimeInputs = []; + + text = '' + # A rebuild script for NixOS + set -e + pushd /tmp + git clone forgejo@git.lillianviolet.dev:Lillian-Violet/NixOS-Config.git ./rebuild + $hostname=$(hostname) + pushd ./rebuild + echo "NixOS Rebuilding..." + sudo nixos-rebuild switch --flake #$hostname &>nixos-switch.log || (cat nixos-switch.log | grep --color error && false) + popd + echo "Cleaning up repository in tmp..." + rm -rf ./rebuild + popd + notify-send -e "NixOS Rebuilt OK!" --icon=software-update-available + ''; +} From db723b02d5de6d2525061dd681c0adb2c21cb718 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 Feb 2024 14:18:52 +0100 Subject: [PATCH 1341/2308] Oopsie small typo --- pkgs/rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 50a57fc..7eb88b4 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -14,7 +14,7 @@ writeShellApplication set -e pushd /tmp git clone forgejo@git.lillianviolet.dev:Lillian-Violet/NixOS-Config.git ./rebuild - $hostname=$(hostname) + hostname=$(hostname) pushd ./rebuild echo "NixOS Rebuilding..." sudo nixos-rebuild switch --flake #$hostname &>nixos-switch.log || (cat nixos-switch.log | grep --color error && false) From e307bf4952cc132ce53618a19fb8af0de36ad245 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 Feb 2024 14:20:13 +0100 Subject: [PATCH 1342/2308] Let's just remove hostname shenanigans --- pkgs/rebuild/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 7eb88b4..df8fd68 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -14,10 +14,9 @@ writeShellApplication set -e pushd /tmp git clone forgejo@git.lillianviolet.dev:Lillian-Violet/NixOS-Config.git ./rebuild - hostname=$(hostname) pushd ./rebuild echo "NixOS Rebuilding..." - sudo nixos-rebuild switch --flake #$hostname &>nixos-switch.log || (cat nixos-switch.log | grep --color error && false) + sudo nixos-rebuild switch --flake .# &>nixos-switch.log || (cat nixos-switch.log | grep --color error && false) popd echo "Cleaning up repository in tmp..." rm -rf ./rebuild From 0d03dc90a73ac533f69256ee8a45505fa324c910 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 Feb 2024 14:23:12 +0100 Subject: [PATCH 1343/2308] The logging doesn't work, let's remove it --- pkgs/rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index df8fd68..39456fd 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -16,7 +16,7 @@ writeShellApplication git clone forgejo@git.lillianviolet.dev:Lillian-Violet/NixOS-Config.git ./rebuild pushd ./rebuild echo "NixOS Rebuilding..." - sudo nixos-rebuild switch --flake .# &>nixos-switch.log || (cat nixos-switch.log | grep --color error && false) + sudo nixos-rebuild switch --flake .# popd echo "Cleaning up repository in tmp..." rm -rf ./rebuild From e80ad448873753d9e0e953f9b94b65390af31875 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 Feb 2024 14:25:07 +0100 Subject: [PATCH 1344/2308] Add libnotify for rebuild command --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 1182fbb..58b252a 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -26,6 +26,7 @@ git-filter-repo home-manager htop + libnotify neofetch oh-my-zsh rsync From acf332fdff6c1c9a164253e1457755d8e3b187b0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 Feb 2024 14:48:01 +0100 Subject: [PATCH 1345/2308] Use https for git clone since we won't push with the rebuild command --- pkgs/rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 39456fd..e1a5f3f 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -13,7 +13,7 @@ writeShellApplication # A rebuild script for NixOS set -e pushd /tmp - git clone forgejo@git.lillianviolet.dev:Lillian-Violet/NixOS-Config.git ./rebuild + git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild pushd ./rebuild echo "NixOS Rebuilding..." sudo nixos-rebuild switch --flake .# From d423ce4c0bc8eb60798edbc9a9862e984b053a7a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 27 Feb 2024 11:29:55 +0100 Subject: [PATCH 1346/2308] Enable initrd on EDI --- nixos/hosts/EDI/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 0c9bb0d..dc673a8 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -50,6 +50,7 @@ # generated at installation time. So we force it to false # for now. boot.loader.systemd-boot.enable = lib.mkForce false; + boot.initrd.systemd.enable = true; boot.lanzaboote = { enable = true; From 69898664d42f74c305eb81bb10f1171cdef7c5da Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 27 Feb 2024 15:42:27 +0100 Subject: [PATCH 1347/2308] Add new script for install (untested) --- pkgs/default.nix | 1 + pkgs/install-nix/default.nix | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/install-nix/default.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 7569bfa..fce0284 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,4 +5,5 @@ pkgs: { dvt = pkgs.callPackage ./dvt {}; servo = pkgs.callPackage ./servo {}; rebuild = pkgs.callPackage ./rebuild {}; + install-nix = pkgs.callPackage ./install-nix {}; } diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix new file mode 100644 index 0000000..d921918 --- /dev/null +++ b/pkgs/install-nix/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + writeShellApplication, +}: +writeShellApplication +{ + name = "install-nix"; + + runtimeInputs = []; + + text = '' + # An install script for NixOS installation to /tmp + set -e + hostname=$1 + if [[ "$1" == "" ]]; then + echo "No hostname given, please specify a hostname" + exit 2 + fi + pushd /tmp + git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install + pushd ./install + echo "NixOS Installing..." + sudo nixos-install --flake .#$1 + popd + echo "Cleaning up repository in tmp..." + rm -rf ./install + popd + notify-send -e "NixOS Install Succeeded!" --icon=software-update-available + ''; +} From 6af277d0aff28f88fd86f763b572289fb1a36606 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 28 Feb 2024 11:01:48 +0100 Subject: [PATCH 1348/2308] Add fancy selection menu to install bash app --- pkgs/install-nix/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index d921918..6340d86 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -12,16 +12,20 @@ writeShellApplication text = '' # An install script for NixOS installation to /tmp set -e - hostname=$1 - if [[ "$1" == "" ]]; then - echo "No hostname given, please specify a hostname" - exit 2 - fi pushd /tmp git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install + pushd ./install/nixos/hosts + echo "Please choose the hostname you are installing to from the following list:" + i=1 + for d in */ + do + dirs[i++]="$\{d%/}" + done + select dir in "$\{dirs[@]}"; do echo "you selected $\{dir}"; break; done + popd pushd ./install echo "NixOS Installing..." - sudo nixos-install --flake .#$1 + sudo nixos-install --flake .#$dir popd echo "Cleaning up repository in tmp..." rm -rf ./install From 455af77a40844cd65cd3491cb88b3255afb06a5b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 28 Feb 2024 11:03:49 +0100 Subject: [PATCH 1349/2308] Might need this --- pkgs/install-nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index 6340d86..bb0c474 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -25,7 +25,7 @@ writeShellApplication popd pushd ./install echo "NixOS Installing..." - sudo nixos-install --flake .#$dir + sudo nixos-install --flake .#$\{dir} popd echo "Cleaning up repository in tmp..." rm -rf ./install From b9469c840fc429082237955a08f121aa830b562c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 28 Feb 2024 14:26:58 +0100 Subject: [PATCH 1350/2308] Try and fix fonts --- nixos/shared/packages/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 58b252a..4d1544c 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -42,11 +42,6 @@ noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji - liberation_ttf - fira-code - fira-code-symbols - mplus-outline-fonts.githubRelease - dina-font - proggyfonts + (nerdfonts.override {fonts = ["FiraCode" "DroidSansMono"];}) ]; } From b8726e7f4b1f6457b76362b5f978780d73907f99 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 28 Feb 2024 14:28:17 +0100 Subject: [PATCH 1351/2308] Test to see what happens if I disable fonts --- nixos/shared/packages/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 4d1544c..29f50f1 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -38,10 +38,10 @@ # System libraries ]; - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-emoji-blob-bin - noto-fonts-emoji - (nerdfonts.override {fonts = ["FiraCode" "DroidSansMono"];}) - ]; + # fonts.packages = with pkgs; [ + # noto-fonts + # noto-fonts-emoji-blob-bin + # noto-fonts-emoji + # (nerdfonts.override {fonts = ["FiraCode" "DroidSansMono"];}) + # ]; } From bba5de71358934cd8e47154cdb8e4456c5d2285c Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Wed, 28 Feb 2024 21:53:08 +0100 Subject: [PATCH 1352/2308] Disable amdgpu thing in shodan to see if the mesa message goes away --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 07a42b6..101cdc7 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -122,7 +122,7 @@ jovian.decky-loader.enable = true; - jovian.hardware.has.amd.gpu = true; + # jovian.hardware.has.amd.gpu = true; programs.steam = { enable = true; From 1ba8e8f6729e740b3bd12069ea9510a4af1bb245 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 09:58:18 +0100 Subject: [PATCH 1353/2308] update flake lock --- flake.lock | 96 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index f28daed..840eecb 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1707685877, - "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", + "lastModified": 1708794349, + "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=", "owner": "ipetkov", "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", + "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1708564520, - "narHash": "sha256-juduDTYBhGN6jNfQ5RMDpbQF+MkO0pj3k7XGDSTjAbs=", + "lastModified": 1708910350, + "narHash": "sha256-cTuJVlOm05aQFIgGuYikgkrI61P2vTO2OfXwIRWEzUg=", "owner": "nix-community", "repo": "disko", - "rev": "23d308f0059955e3719efc81a34d1fc0369fbb74", + "rev": "a13f36255cf4ce99cc4236a34251c2e7106e101d", "type": "github" }, "original": { @@ -150,11 +150,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1708806879, - "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", + "lastModified": 1708988456, + "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", + "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1708585220, - "narHash": "sha256-eQ5nGEEW4I8Btwso6Q940xilYG7QNyTuocfB0awjpA8=", + "lastModified": 1709142038, + "narHash": "sha256-ZjP808isgLwuiqxSU1CYFyafm5GF80aYw1CXJbnVsgs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2654de9ed084890d1814a841c4f863e9d7a44d54", + "rev": "b83751a057acbb5f989193773841217ddc93d1f8", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1708388174, - "narHash": "sha256-mLROAGNyOykYwWOLga24BX05GnRE+acms0Ru10tye2o=", + "lastModified": 1709051793, + "narHash": "sha256-4FXFBq5mN1IwN18Fd2OEF1iCZV5PC40gP2L64oyq3xQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "73fec69386e8005911e15f3abe6bb6cee7fd9711", + "rev": "e761c7ee47b64debc687d8bff7599d702c893dcc", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixlib": { "locked": { - "lastModified": 1708217146, - "narHash": "sha256-nGfEv7k78slqIR5E0zzWSx214d/4/ZPKDkObLJqVLVw=", + "lastModified": 1708821942, + "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e623008d8a46517470e6365505f1a3ce171fa46a", + "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1708563055, - "narHash": "sha256-FaojUZNu+YPFi3eCI7mL4kxPKQ51DoySa7mqmllUOuc=", + "lastModified": 1709167897, + "narHash": "sha256-UQVMLPVCo3wcQUYZfHnSoVVgi5RzfnaOm2z+aTlxf4A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f4631dee1a0fd56c0db89860e83e3588a28c7631", + "rev": "f34ad8b5445d3f0b72370eaae8687125fb736efa", "type": "github" }, "original": { @@ -347,11 +347,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708751719, - "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", + "lastModified": 1709169036, + "narHash": "sha256-j+ywPKUS0JLpidNcz6vA0z1xI/rU5PcLV7pwZMce+Tw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", + "rev": "ec25c90d35d24e36c0af3b3d58a09542367ebbee", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1708807242, - "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", + "lastModified": 1709150264, + "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", "owner": "nixos", "repo": "nixpkgs", - "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", + "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1707689078, - "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", + "lastModified": 1708984720, + "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", + "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", "type": "github" }, "original": { @@ -457,11 +457,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708232726, - "narHash": "sha256-DYuEHWQSBwaJkS2rjLUsKvGgDK8QIVojC3klAUw6uyk=", + "lastModified": 1708847675, + "narHash": "sha256-RUZ7KEs/a4EzRELYDGnRB6i7M1Izii3JD/LyzH0c6Tg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "35c5863c29ce81199ded8a3384f4979b7793f5dc", + "rev": "2a34566b67bef34c551f204063faeecc444ae9da", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1708807242, - "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", + "lastModified": 1709150264, + "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", "owner": "nixos", "repo": "nixpkgs", - "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", + "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", "type": "github" }, "original": { @@ -554,11 +554,11 @@ ] }, "locked": { - "lastModified": 1708693644, - "narHash": "sha256-QZxSFZXJ0omNHCN7CT8MeaJwkEPEztvknA6+7wDldcY=", + "lastModified": 1708970090, + "narHash": "sha256-z/8pJRiLfYqGQvIJj3xGqobygNkVSSGN6115pAEDNU4=", "owner": "pjones", "repo": "plasma-manager", - "rev": "02a9761ac6b692eba60a73c1196d205d24300de7", + "rev": "74fa336c22adf822c6ef13b21bfff18fbef66e9c", "type": "github" }, "original": { @@ -628,11 +628,11 @@ ] }, "locked": { - "lastModified": 1708241671, - "narHash": "sha256-zSulX9tP4R35Y8A842dGSzaHMVP91W2Ry0SXvQKD2BQ=", + "lastModified": 1708827164, + "narHash": "sha256-oBNS6pO04Y6gZBLThP3JDDgviex0+WTXz3bVBenyzms=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d500e370b26f9b14303cb39bf1509df0a920c8b0", + "rev": "e0626adabd5ea461f80b1b11390da2a6575adb30", "type": "github" }, "original": { @@ -671,11 +671,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1708830076, - "narHash": "sha256-Cjh2xdjxC6S6nW6Whr2dxSeh8vjodzhTmQdI4zPJ4RA=", + "lastModified": 1708987867, + "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2874fbbe4a65bd2484b0ad757d27a16107f6bc17", + "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "type": "github" }, "original": { From af99e84356d054825c7231c11879473b481b2a99 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 09:59:48 +0100 Subject: [PATCH 1354/2308] They say I just have to update, I will see if it works like this then --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 101cdc7..07a42b6 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -122,7 +122,7 @@ jovian.decky-loader.enable = true; - # jovian.hardware.has.amd.gpu = true; + jovian.hardware.has.amd.gpu = true; programs.steam = { enable = true; From 03d185570afbbde757712c62680730eb3c60546b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 14:39:35 +0100 Subject: [PATCH 1355/2308] Add install nix command to all hosts --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 29f50f1..22e6391 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -18,6 +18,7 @@ environment.systemPackages = with pkgs; [ # Custom tools rebuild + install-nix # System tools age From 0c7363557b20ac4eed03a1daa9eea08f5d1bc368 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 14:41:33 +0100 Subject: [PATCH 1356/2308] Remove the breaks, might not need them --- pkgs/install-nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index bb0c474..e86ddee 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -19,13 +19,13 @@ writeShellApplication i=1 for d in */ do - dirs[i++]="$\{d%/}" + dirs[i++]="${d%/}" done - select dir in "$\{dirs[@]}"; do echo "you selected $\{dir}"; break; done + select dir in "${dirs[@]}"; do echo "you selected ${dir}"; break; done popd pushd ./install echo "NixOS Installing..." - sudo nixos-install --flake .#$\{dir} + sudo nixos-install --flake .#${dir} popd echo "Cleaning up repository in tmp..." rm -rf ./install From 201f6eccd95dc9d72e2a55dc270d2f989e401daf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 14:42:30 +0100 Subject: [PATCH 1357/2308] Remove rebuild before building in case it failed before --- pkgs/rebuild/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index e1a5f3f..278f985 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -13,6 +13,7 @@ writeShellApplication # A rebuild script for NixOS set -e pushd /tmp + rm -rf ./rebuild git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild pushd ./rebuild echo "NixOS Rebuilding..." From 5319aadfc23bfa873914cc45c6d7338ca5d57f53 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 14:45:07 +0100 Subject: [PATCH 1358/2308] Found how to escape them --- pkgs/install-nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index e86ddee..6e5733a 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -19,13 +19,13 @@ writeShellApplication i=1 for d in */ do - dirs[i++]="${d%/}" + dirs[i++]="''${d%/}" done - select dir in "${dirs[@]}"; do echo "you selected ${dir}"; break; done + select dir in "''${dirs[@]}"; do echo "you selected ''${dir}"; break; done popd pushd ./install echo "NixOS Installing..." - sudo nixos-install --flake .#${dir} + sudo nixos-install --flake .#''${dir} popd echo "Cleaning up repository in tmp..." rm -rf ./install From 53c48ed6e775d6036602c770922ff6f1780925e6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 14:48:16 +0100 Subject: [PATCH 1359/2308] It tells me to double quote, maybe this will work? --- pkgs/install-nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index 6e5733a..cbaf541 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -25,7 +25,7 @@ writeShellApplication popd pushd ./install echo "NixOS Installing..." - sudo nixos-install --flake .#''${dir} + sudo nixos-install --flake .#\"''${dir}\" popd echo "Cleaning up repository in tmp..." rm -rf ./install From 7e65e61c1ad35f9dc2e57d8a0c6e6d81712eefb1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 14:49:56 +0100 Subject: [PATCH 1360/2308] No need to escape, never mind that --- pkgs/install-nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index cbaf541..b07646a 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -25,7 +25,7 @@ writeShellApplication popd pushd ./install echo "NixOS Installing..." - sudo nixos-install --flake .#\"''${dir}\" + sudo nixos-install --flake .#"''${dir}" popd echo "Cleaning up repository in tmp..." rm -rf ./install From c102f8a05ce0dcb327c5a9e852c5c33acef8db33 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 14:52:12 +0100 Subject: [PATCH 1361/2308] Install folder already exists, let's try another one --- pkgs/install-nix/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index b07646a..bd25442 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -13,8 +13,9 @@ writeShellApplication # An install script for NixOS installation to /tmp set -e pushd /tmp - git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install - pushd ./install/nixos/hosts + rm -rf ./install-nix + git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix + pushd ./install-nix/nixos/hosts echo "Please choose the hostname you are installing to from the following list:" i=1 for d in */ @@ -23,12 +24,12 @@ writeShellApplication done select dir in "''${dirs[@]}"; do echo "you selected ''${dir}"; break; done popd - pushd ./install + pushd ./install-nix echo "NixOS Installing..." sudo nixos-install --flake .#"''${dir}" popd echo "Cleaning up repository in tmp..." - rm -rf ./install + rm -rf ./install-nix popd notify-send -e "NixOS Install Succeeded!" --icon=software-update-available ''; From f982d225e5e8af94b067efe5651b49f8e0609177 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 15:02:42 +0100 Subject: [PATCH 1362/2308] Silence the push and pop directory commands --- pkgs/install-nix/default.nix | 12 ++++++------ pkgs/rebuild/default.nix | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index bd25442..8aaacc0 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -12,10 +12,10 @@ writeShellApplication text = '' # An install script for NixOS installation to /tmp set -e - pushd /tmp + pushd /tmp > /dev/null rm -rf ./install-nix git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix - pushd ./install-nix/nixos/hosts + pushd ./install-nix/nixos/hosts > /dev/null echo "Please choose the hostname you are installing to from the following list:" i=1 for d in */ @@ -23,14 +23,14 @@ writeShellApplication dirs[i++]="''${d%/}" done select dir in "''${dirs[@]}"; do echo "you selected ''${dir}"; break; done - popd - pushd ./install-nix + popd > /dev/null + pushd ./install-nix > /dev/null echo "NixOS Installing..." sudo nixos-install --flake .#"''${dir}" - popd + popd > /dev/null echo "Cleaning up repository in tmp..." rm -rf ./install-nix - popd + popd > /dev/null notify-send -e "NixOS Install Succeeded!" --icon=software-update-available ''; } diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 278f985..9ea0b90 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -12,16 +12,16 @@ writeShellApplication text = '' # A rebuild script for NixOS set -e - pushd /tmp + pushd /tmp > /dev/null rm -rf ./rebuild git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild - pushd ./rebuild + pushd ./rebuild > /dev/null echo "NixOS Rebuilding..." sudo nixos-rebuild switch --flake .# - popd - echo "Cleaning up repository in tmp..." + popd > /dev/null + echo "Cleaning up repository in /tmp..." rm -rf ./rebuild - popd + popd > /dev/null notify-send -e "NixOS Rebuilt OK!" --icon=software-update-available ''; } From 9baf41431d2c0fac168894f25fd9ec2f1304baed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 15:06:27 +0100 Subject: [PATCH 1363/2308] Make clearing up output more in line with git output --- pkgs/install-nix/default.nix | 2 +- pkgs/rebuild/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index 8aaacc0..bc79d98 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -28,7 +28,7 @@ writeShellApplication echo "NixOS Installing..." sudo nixos-install --flake .#"''${dir}" popd > /dev/null - echo "Cleaning up repository in tmp..." + echo "Cleaning up repository in '/tmp/install-nix'..." rm -rf ./install-nix popd > /dev/null notify-send -e "NixOS Install Succeeded!" --icon=software-update-available diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 9ea0b90..d034e49 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -19,7 +19,7 @@ writeShellApplication echo "NixOS Rebuilding..." sudo nixos-rebuild switch --flake .# popd > /dev/null - echo "Cleaning up repository in /tmp..." + echo "Cleaning up repository in '/tmp/rebuild'..." rm -rf ./rebuild popd > /dev/null notify-send -e "NixOS Rebuilt OK!" --icon=software-update-available From f61a944dd1f54753975cb86fa7d23b4f504a3450 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 15:44:34 +0100 Subject: [PATCH 1364/2308] Add helix to all hosts --- nixos/shared/packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 22e6391..ff0ab96 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -31,7 +31,7 @@ neofetch oh-my-zsh rsync - spacevim + helix wget zsh tldr From 19579c43c7465315e62adfb3a4b82d29ac51b454 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 16:32:13 +0100 Subject: [PATCH 1365/2308] Add systemd inhibit to the rebuild and install scripts so they cannot be interrupted normally --- pkgs/install-nix/default.nix | 8 ++++---- pkgs/rebuild/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index bc79d98..a88e25e 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -13,8 +13,8 @@ writeShellApplication # An install script for NixOS installation to /tmp set -e pushd /tmp > /dev/null - rm -rf ./install-nix - git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix + systemd-inhibit rm -rf ./install-nix + systemd-inhibit git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix pushd ./install-nix/nixos/hosts > /dev/null echo "Please choose the hostname you are installing to from the following list:" i=1 @@ -26,10 +26,10 @@ writeShellApplication popd > /dev/null pushd ./install-nix > /dev/null echo "NixOS Installing..." - sudo nixos-install --flake .#"''${dir}" + systemd-inhibit sudo nixos-install --flake .#"''${dir}" popd > /dev/null echo "Cleaning up repository in '/tmp/install-nix'..." - rm -rf ./install-nix + systemd-inhibit rm -rf ./install-nix popd > /dev/null notify-send -e "NixOS Install Succeeded!" --icon=software-update-available ''; diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index d034e49..156469b 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -14,13 +14,13 @@ writeShellApplication set -e pushd /tmp > /dev/null rm -rf ./rebuild - git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild + systemd-inhibit git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild pushd ./rebuild > /dev/null echo "NixOS Rebuilding..." - sudo nixos-rebuild switch --flake .# + systemd-inhibit sudo nixos-rebuild switch --flake .# popd > /dev/null echo "Cleaning up repository in '/tmp/rebuild'..." - rm -rf ./rebuild + systemd-inhibit rm -rf ./rebuild popd > /dev/null notify-send -e "NixOS Rebuilt OK!" --icon=software-update-available ''; From 7aa040573828f4b5f3a0d052770671cbde5ecde5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 16:47:41 +0100 Subject: [PATCH 1366/2308] Need elevated privileges for normal inhibit, let's try what=idle instead --- pkgs/install-nix/default.nix | 8 ++++---- pkgs/rebuild/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index a88e25e..9cdd625 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -13,8 +13,8 @@ writeShellApplication # An install script for NixOS installation to /tmp set -e pushd /tmp > /dev/null - systemd-inhibit rm -rf ./install-nix - systemd-inhibit git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix + systemd-inhibit --what=idle rm -rf ./install-nix + systemd-inhibit --what=idle git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix pushd ./install-nix/nixos/hosts > /dev/null echo "Please choose the hostname you are installing to from the following list:" i=1 @@ -26,10 +26,10 @@ writeShellApplication popd > /dev/null pushd ./install-nix > /dev/null echo "NixOS Installing..." - systemd-inhibit sudo nixos-install --flake .#"''${dir}" + systemd-inhibit --what=idle sudo nixos-install --flake .#"''${dir}" popd > /dev/null echo "Cleaning up repository in '/tmp/install-nix'..." - systemd-inhibit rm -rf ./install-nix + systemd-inhibit --what=idle rm -rf ./install-nix popd > /dev/null notify-send -e "NixOS Install Succeeded!" --icon=software-update-available ''; diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 156469b..4fe4b8a 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -14,13 +14,13 @@ writeShellApplication set -e pushd /tmp > /dev/null rm -rf ./rebuild - systemd-inhibit git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild + systemd-inhibit --what=idle git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild pushd ./rebuild > /dev/null echo "NixOS Rebuilding..." - systemd-inhibit sudo nixos-rebuild switch --flake .# + systemd-inhibit --what=idle sudo nixos-rebuild switch --flake .# popd > /dev/null echo "Cleaning up repository in '/tmp/rebuild'..." - systemd-inhibit rm -rf ./rebuild + systemd-inhibit --what=idle rm -rf ./rebuild popd > /dev/null notify-send -e "NixOS Rebuilt OK!" --icon=software-update-available ''; From 9567f487a6db627bda7937e3227c7e034c0743dc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 23:51:14 +0100 Subject: [PATCH 1367/2308] Copied this config, have to edit it more, but looks promising --- nixos/server/package-configs/conduit/copy.nix | 256 ++++++++++++++++++ 1 file changed, 256 insertions(+) create mode 100644 nixos/server/package-configs/conduit/copy.nix diff --git a/nixos/server/package-configs/conduit/copy.nix b/nixos/server/package-configs/conduit/copy.nix new file mode 100644 index 0000000..78b1518 --- /dev/null +++ b/nixos/server/package-configs/conduit/copy.nix @@ -0,0 +1,256 @@ +{ + pkgs, + config, + lib, + flake-inputs, + ... +}: let + inherit (lib.strings) concatMapStringsSep; + + cfg = config.services.matrix-conduit; + domain = "matrix.gladtherescake.eu"; + turn-realm = "turn.gladtherescake.eu"; +in { + services.matrix-conduit = { + enable = true; + package = flake-inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.matrix-conduit; + settings.global = { + address = "127.0.0.1"; + server_name = domain; + database_backend = "rocksdb"; + + turn_uris = let + address = "${config.services.coturn.realm}:${toString config.services.coturn.listening-port}"; + tls-address = "${config.services.coturn.realm}:${toString config.services.coturn.tls-listening-port}"; + in [ + "turn:${address}?transport=udp" + "turn:${address}?transport=tcp" + "turns:${tls-address}?transport=udp" + "turns:${tls-address}?transport=tcp" + ]; + }; + }; + + systemd.services.heisenbridge = let + replaceSecretBin = "${pkgs.replace-secret}/bin/replace-secret"; + registrationFile = builtins.toFile "heisenbridge-registration.yaml" (builtins.toJSON { + id = "heisenbridge"; + url = "http://127.0.0.1:9898"; + as_token = "@AS_TOKEN@"; + hs_token = "@HS_TOKEN@"; + rate_limited = false; + sender_localpart = "heisenbridge"; + namespaces = { + users = [ + { + regex = "@irc_.*"; + exclusive = true; + } + { + regex = "@heisenbridge:.*"; + exclusive = true; + } + ]; + aliases = []; + rooms = []; + }; + }); + + # TODO(tlater): Starting with systemd 253 it will become possible + # to do the credential setup as part of ExecStartPre/preStart + # instead. + # + # This will also make it possible to actually set caps on the + # heisenbridge process using systemd, so that we can run the + # identd process. + execScript = pkgs.writeShellScript "heisenbridge" '' + cp ${registrationFile} "$RUNTIME_DIRECTORY/heisenbridge-registration.yaml" + chmod 600 $RUNTIME_DIRECTORY/heisenbridge-registration.yaml + ${replaceSecretBin} '@AS_TOKEN@' "$CREDENTIALS_DIRECTORY/heisenbridge_as-token" "$RUNTIME_DIRECTORY/heisenbridge-registration.yaml" + ${replaceSecretBin} '@HS_TOKEN@' "$CREDENTIALS_DIRECTORY/heisenbridge_hs-token" "$RUNTIME_DIRECTORY/heisenbridge-registration.yaml" + chmod 400 $RUNTIME_DIRECTORY/heisenbridge-registration.yaml + + ${pkgs.heisenbridge}/bin/heisenbridge \ + --config $RUNTIME_DIRECTORY/heisenbridge-registration.yaml \ + --owner @tlater:matrix.tlater.net \ + 'http://localhost:${toString cfg.settings.global.port}' + ''; + in { + description = "Matrix<->IRC bridge"; + wantedBy = ["multi-user.target"]; + after = ["conduit.service"]; + + serviceConfig = { + Type = "simple"; + + LoadCredential = "heisenbridge:/run/secrets/heisenbridge"; + + ExecStart = execScript; + + DynamicUser = true; + RuntimeDirectory = "heisenbridge"; + RuntimeDirectoryMode = "0700"; + + RestrictNamespaces = true; + PrivateUsers = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = ["AF_INET AF_INET6"]; + LockPersonality = true; + RestrictRealtime = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + UMask = 0077; + + # For the identd port + # CapabilityBoundingSet = ["CAP_NET_BIND_SERVICE"]; + # AmbientCapabilities = ["CAP_NET_BIND_SERVICE"]; + }; + }; + + # Pass in the TURN secret via EnvironmentFile, not supported by + # upstream module currently. + # + # See also https://gitlab.com/famedly/conduit/-/issues/314 + systemd.services.conduit.serviceConfig.EnvironmentFile = config.sops.secrets."turn/env".path; + + services.coturn = { + enable = true; + no-cli = true; + use-auth-secret = true; + static-auth-secret-file = config.sops.secrets."turn/secret".path; + realm = turn-realm; + relay-ips = [ + "178.79.137.55" + ]; + + # SSL config + # + # TODO(tlater): Switch to letsencrypt once google fix: + # https://github.com/vector-im/element-android/issues/1533 + pkey = config.sops.secrets."turn/ssl-key".path; + cert = config.sops.secrets."turn/ssl-cert".path; + + # Based on suggestions from + # https://github.com/matrix-org/synapse/blob/develop/docs/turn-howto.md + # and + # https://www.foxypossibilities.com/2018/05/19/setting-up-a-turn-sever-for-matrix-on-nixos/ + no-tcp-relay = true; + secure-stun = true; + extraConfig = '' + # Deny various local IP ranges, see + # https://www.rtcsec.com/article/cve-2020-26262-bypass-of-coturns-access-control-protection/ + no-multicast-peers + denied-peer-ip=0.0.0.0-0.255.255.255 + denied-peer-ip=10.0.0.0-10.255.255.255 + denied-peer-ip=100.64.0.0-100.127.255.255 + denied-peer-ip=127.0.0.0-127.255.255.255 + denied-peer-ip=169.254.0.0-169.254.255.255 + denied-peer-ip=172.16.0.0-172.31.255.255 + denied-peer-ip=192.0.0.0-192.0.0.255 + denied-peer-ip=192.0.2.0-192.0.2.255 + denied-peer-ip=192.88.99.0-192.88.99.255 + denied-peer-ip=192.168.0.0-192.168.255.255 + denied-peer-ip=198.18.0.0-198.19.255.255 + denied-peer-ip=198.51.100.0-198.51.100.255 + denied-peer-ip=203.0.113.0-203.0.113.255 + denied-peer-ip=240.0.0.0-255.255.255.255 denied-peer-ip=::1 + denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff + denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255 + denied-peer-ip=100::-100::ffff:ffff:ffff:ffff + denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff + denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff + denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff + denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff + + # *Allow* any IP addresses that we explicitly set as relay IPs + ${concatMapStringsSep "\n" (ip: "allowed-peer-ip=${ip}") config.services.coturn.relay-ips} + + # Various other security settings + no-tlsv1 + no-tlsv1_1 + + # Monitoring + prometheus + ''; + }; + + services.nginx.virtualHosts."${domain}" = { + enableACME = true; + + listen = [ + { + addr = "0.0.0.0"; + port = 80; + } + { + addr = "[::0]"; + port = 80; + } + { + addr = "0.0.0.0"; + port = 443; + ssl = true; + } + { + addr = "[::0]"; + port = 443; + ssl = true; + } + { + addr = "0.0.0.0"; + port = 8448; + ssl = true; + } + { + addr = "[::0]"; + port = 8448; + ssl = true; + } + ]; + + forceSSL = true; + extraConfig = '' + merge_slashes off; + access_log /var/log/nginx/${domain}/access.log upstream_time; + ''; + + locations = { + "/_matrix" = { + proxyPass = "http://${cfg.settings.global.address}:${toString cfg.settings.global.port}"; + # Recommended by conduit + extraConfig = '' + proxy_buffering off; + ''; + }; + + # Add Element X support + # TODO(tlater): Remove when no longer required: https://github.com/vector-im/element-x-android/issues/1085 + "=/.well-known/matrix/client" = { + alias = pkgs.writeText "well-known-matrix-client" (builtins.toJSON { + "m.homeserver".base_url = "https://${domain}"; + "org.matrix.msc3575.proxy".url = "https://${domain}"; + }); + + extraConfig = '' + default_type application/json; + add_header Access-Control-Allow-Origin "*"; + ''; + }; + }; + }; + + # services.backups.conduit = { + # user = "root"; + # paths = [ + # "/var/lib/private/matrix-conduit/" + # ]; + # # Other services store their data in conduit, so no other services + # # need to be shut down currently. + # pauseServices = ["conduit.service"]; + # }; +} From 0c450e5ad252be5972f8bf3088fde9c4e84ee758 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Feb 2024 23:54:29 +0100 Subject: [PATCH 1368/2308] Remove some things I don't need, still need to add some sops secrets and certs for turn --- nixos/server/package-configs/conduit/copy.nix | 91 ------------------- 1 file changed, 91 deletions(-) diff --git a/nixos/server/package-configs/conduit/copy.nix b/nixos/server/package-configs/conduit/copy.nix index 78b1518..4c301ac 100644 --- a/nixos/server/package-configs/conduit/copy.nix +++ b/nixos/server/package-configs/conduit/copy.nix @@ -31,87 +31,6 @@ in { }; }; - systemd.services.heisenbridge = let - replaceSecretBin = "${pkgs.replace-secret}/bin/replace-secret"; - registrationFile = builtins.toFile "heisenbridge-registration.yaml" (builtins.toJSON { - id = "heisenbridge"; - url = "http://127.0.0.1:9898"; - as_token = "@AS_TOKEN@"; - hs_token = "@HS_TOKEN@"; - rate_limited = false; - sender_localpart = "heisenbridge"; - namespaces = { - users = [ - { - regex = "@irc_.*"; - exclusive = true; - } - { - regex = "@heisenbridge:.*"; - exclusive = true; - } - ]; - aliases = []; - rooms = []; - }; - }); - - # TODO(tlater): Starting with systemd 253 it will become possible - # to do the credential setup as part of ExecStartPre/preStart - # instead. - # - # This will also make it possible to actually set caps on the - # heisenbridge process using systemd, so that we can run the - # identd process. - execScript = pkgs.writeShellScript "heisenbridge" '' - cp ${registrationFile} "$RUNTIME_DIRECTORY/heisenbridge-registration.yaml" - chmod 600 $RUNTIME_DIRECTORY/heisenbridge-registration.yaml - ${replaceSecretBin} '@AS_TOKEN@' "$CREDENTIALS_DIRECTORY/heisenbridge_as-token" "$RUNTIME_DIRECTORY/heisenbridge-registration.yaml" - ${replaceSecretBin} '@HS_TOKEN@' "$CREDENTIALS_DIRECTORY/heisenbridge_hs-token" "$RUNTIME_DIRECTORY/heisenbridge-registration.yaml" - chmod 400 $RUNTIME_DIRECTORY/heisenbridge-registration.yaml - - ${pkgs.heisenbridge}/bin/heisenbridge \ - --config $RUNTIME_DIRECTORY/heisenbridge-registration.yaml \ - --owner @tlater:matrix.tlater.net \ - 'http://localhost:${toString cfg.settings.global.port}' - ''; - in { - description = "Matrix<->IRC bridge"; - wantedBy = ["multi-user.target"]; - after = ["conduit.service"]; - - serviceConfig = { - Type = "simple"; - - LoadCredential = "heisenbridge:/run/secrets/heisenbridge"; - - ExecStart = execScript; - - DynamicUser = true; - RuntimeDirectory = "heisenbridge"; - RuntimeDirectoryMode = "0700"; - - RestrictNamespaces = true; - PrivateUsers = true; - ProtectHostname = true; - ProtectClock = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectKernelLogs = true; - ProtectControlGroups = true; - RestrictAddressFamilies = ["AF_INET AF_INET6"]; - LockPersonality = true; - RestrictRealtime = true; - ProtectProc = "invisible"; - ProcSubset = "pid"; - UMask = 0077; - - # For the identd port - # CapabilityBoundingSet = ["CAP_NET_BIND_SERVICE"]; - # AmbientCapabilities = ["CAP_NET_BIND_SERVICE"]; - }; - }; - # Pass in the TURN secret via EnvironmentFile, not supported by # upstream module currently. # @@ -243,14 +162,4 @@ in { }; }; }; - - # services.backups.conduit = { - # user = "root"; - # paths = [ - # "/var/lib/private/matrix-conduit/" - # ]; - # # Other services store their data in conduit, so no other services - # # need to be shut down currently. - # pauseServices = ["conduit.service"]; - # }; } From bdae4e36d1e1780a98a34b00fe331972e5e36ded Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 00:09:00 +0100 Subject: [PATCH 1369/2308] Force ipv6 support? --- nixos/hosts/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index cbbbb3a..e406620 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -102,6 +102,7 @@ networking.nat.enable = true; networking.nat.internalInterfaces = ["ve-+"]; networking.nat.externalInterface = "ens18"; + networking.enableIPv6 = lib.mkForce true; networking.firewall.enable = true; From 578f038179c1c62aa5ab10cd79ba0e7b5cf3ce94 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 10:21:47 +0100 Subject: [PATCH 1370/2308] Enable installing ruff --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 568f8ce..cb49647 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -99,7 +99,7 @@ extensions = with pkgs.vscode-extensions; [ #arrterian.nix-env-selector #ban.spellright - #charliermarsh.ruff + charliermarsh.ruff dracula-theme.theme-dracula eamodio.gitlens github.vscode-pull-request-github From 6ae866d53e4482668a9de7c616edfe292a931f2f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 14:53:40 +0100 Subject: [PATCH 1371/2308] add rebuild timer for queen --- nixos/hosts/queen/configuration.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index e406620..529339b 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -97,6 +97,20 @@ youtube-dl ]; + # Create an auto-update systemd service that runs every Saturday + systemd.services = { + updater = { + path = [ + pkgs.rebuild + ]; + script = "rebuild"; + serviceConfig = { + User = config.users.users.default.name; + }; + startAt = "weekly"; + }; + }; + # Enable networking networking.networkmanager.enable = true; networking.nat.enable = true; From 546b38547d6e372ada0652563c0096dd0e325ba6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 14:54:21 +0100 Subject: [PATCH 1372/2308] Have to make user root --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 529339b..abbc2f5 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -105,7 +105,7 @@ ]; script = "rebuild"; serviceConfig = { - User = config.users.users.default.name; + User = config.users.users.root; }; startAt = "weekly"; }; From 25ddebec3cc4288e205d62aeeda61c6ecd937da4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:04:14 +0100 Subject: [PATCH 1373/2308] I hope this works? --- nixos/hosts/queen/configuration.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index abbc2f5..1e7dbf5 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -97,17 +97,16 @@ youtube-dl ]; - # Create an auto-update systemd service that runs every Saturday + # Create an auto-update systemd service that runs every day systemd.services = { updater = { path = [ pkgs.rebuild + pkgs.nix + pkgs.bash ]; - script = "rebuild"; - serviceConfig = { - User = config.users.users.root; - }; - startAt = "weekly"; + script = "bash /run/current-system/sw/bin/rebuild"; + startAt = "daily"; }; }; From 456d7d1dfb158a070953f128db684e3f957e7ba8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:06:45 +0100 Subject: [PATCH 1374/2308] Rebuild shouldn't report failing if the libnotify doesn't work --- pkgs/rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 4fe4b8a..2be4014 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -22,6 +22,6 @@ writeShellApplication echo "Cleaning up repository in '/tmp/rebuild'..." systemd-inhibit --what=idle rm -rf ./rebuild popd > /dev/null - notify-send -e "NixOS Rebuilt OK!" --icon=software-update-available + notify-send -e "NixOS Rebuilt OK!" --icon=software-update-available > /dev/null ''; } From d98ca182e3f98896d75ad82fca1e77b783635e0f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:10:51 +0100 Subject: [PATCH 1375/2308] Let's just not use libnotify --- pkgs/rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 2be4014..0534627 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -22,6 +22,6 @@ writeShellApplication echo "Cleaning up repository in '/tmp/rebuild'..." systemd-inhibit --what=idle rm -rf ./rebuild popd > /dev/null - notify-send -e "NixOS Rebuilt OK!" --icon=software-update-available > /dev/null + echo "NixOS Rebuilt OK!" ''; } From 8e3c5c5340f841497987cdba3ab1813d7412b16a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:19:24 +0100 Subject: [PATCH 1376/2308] Create new systemd-rebuild script to do the updating --- nixos/hosts/queen/configuration.nix | 3 ++- nixos/shared/packages/default.nix | 1 + pkgs/default.nix | 1 + pkgs/systemd-rebuild/default.nix | 25 +++++++++++++++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/systemd-rebuild/default.nix diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1e7dbf5..127bd4d 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -104,8 +104,9 @@ pkgs.rebuild pkgs.nix pkgs.bash + pkgs.git ]; - script = "bash /run/current-system/sw/bin/rebuild"; + script = "bash /run/current-system/sw/bin/systemd-rebuild"; startAt = "daily"; }; }; diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index ff0ab96..b22c26f 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -19,6 +19,7 @@ # Custom tools rebuild install-nix + systemd-rebuild # System tools age diff --git a/pkgs/default.nix b/pkgs/default.nix index fce0284..cd4a625 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,5 +5,6 @@ pkgs: { dvt = pkgs.callPackage ./dvt {}; servo = pkgs.callPackage ./servo {}; rebuild = pkgs.callPackage ./rebuild {}; + systemd-rebuild = pkgs.callPackage ./systemd-rebuild {}; install-nix = pkgs.callPackage ./install-nix {}; } diff --git a/pkgs/systemd-rebuild/default.nix b/pkgs/systemd-rebuild/default.nix new file mode 100644 index 0000000..418197d --- /dev/null +++ b/pkgs/systemd-rebuild/default.nix @@ -0,0 +1,25 @@ +{ + lib, + stdenv, + writeShellApplication, +}: +writeShellApplication +{ + name = "systemd-rebuild"; + + runtimeInputs = []; + + text = '' + # A rebuild script for NixOS for use of the systemd service + cd /tmp + rm -rf ./rebuild + systemd-inhibit git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild + cd ./rebuild + echo "NixOS Rebuilding..." + systemd-inhibit sudo nixos-rebuild switch --flake .# + cd .. + echo "Cleaning up repository in '/tmp/rebuild'..." + systemd-inhibit rm -rf ./rebuild + echo "NixOS Rebuilt OK!" + ''; +} From 2c35fa2c9c047bf10c5b7ae975e351d76d5a69ff Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:21:29 +0100 Subject: [PATCH 1377/2308] Remove that sudo --- pkgs/systemd-rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/systemd-rebuild/default.nix b/pkgs/systemd-rebuild/default.nix index 418197d..ae83eac 100644 --- a/pkgs/systemd-rebuild/default.nix +++ b/pkgs/systemd-rebuild/default.nix @@ -16,7 +16,7 @@ writeShellApplication systemd-inhibit git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild cd ./rebuild echo "NixOS Rebuilding..." - systemd-inhibit sudo nixos-rebuild switch --flake .# + systemd-inhibit nixos-rebuild switch --flake .# cd .. echo "Cleaning up repository in '/tmp/rebuild'..." systemd-inhibit rm -rf ./rebuild From 71e0ec0fccfe1c4a6cc26a19cdd5244c9329732c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:25:41 +0100 Subject: [PATCH 1378/2308] Change some line order for easier debugging --- pkgs/systemd-rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/systemd-rebuild/default.nix b/pkgs/systemd-rebuild/default.nix index ae83eac..096f279 100644 --- a/pkgs/systemd-rebuild/default.nix +++ b/pkgs/systemd-rebuild/default.nix @@ -17,8 +17,8 @@ writeShellApplication cd ./rebuild echo "NixOS Rebuilding..." systemd-inhibit nixos-rebuild switch --flake .# - cd .. echo "Cleaning up repository in '/tmp/rebuild'..." + cd .. systemd-inhibit rm -rf ./rebuild echo "NixOS Rebuilt OK!" ''; From 81b88d4d05f06d5a5a96339c43491fd7d9e98383 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:33:46 +0100 Subject: [PATCH 1379/2308] Let's try these paths as well --- nixos/hosts/queen/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 127bd4d..abec857 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -105,6 +105,9 @@ pkgs.nix pkgs.bash pkgs.git + pkgs.gnutar + pkgs.xz.bin + config.nix.package.out ]; script = "bash /run/current-system/sw/bin/systemd-rebuild"; startAt = "daily"; From 1878f7b4497cf38b5e055de079865506878f57e7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:36:38 +0100 Subject: [PATCH 1380/2308] Let's try only absolute paths then --- pkgs/systemd-rebuild/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/systemd-rebuild/default.nix b/pkgs/systemd-rebuild/default.nix index 096f279..66b7bbe 100644 --- a/pkgs/systemd-rebuild/default.nix +++ b/pkgs/systemd-rebuild/default.nix @@ -11,15 +11,12 @@ writeShellApplication text = '' # A rebuild script for NixOS for use of the systemd service - cd /tmp - rm -rf ./rebuild - systemd-inhibit git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild - cd ./rebuild - echo "NixOS Rebuilding..." - systemd-inhibit nixos-rebuild switch --flake .# - echo "Cleaning up repository in '/tmp/rebuild'..." - cd .. - systemd-inhibit rm -rf ./rebuild - echo "NixOS Rebuilt OK!" + systemd-inhibit rm -rf /tmp/rebuild + systemd-inhibit git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git /tmp/rebuild + systemd-inhibit echo "NixOS Rebuilding..." + systemd-inhibit nixos-rebuild switch --flake /tmp/rebuild/# + systemd-inhibit echo "Cleaning up repository in '/tmp/rebuild'..." + systemd-inhibit rm -rf /tmp/rebuild + systemd-inhibit echo "NixOS Rebuilt OK!" ''; } From 3bfa44bdeaba3231b45393ad90c0c5c272fae8e7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:53:50 +0100 Subject: [PATCH 1381/2308] Let's use the standard auto-update instead --- nixos/hosts/queen/configuration.nix | 19 +++++-------------- pkgs/default.nix | 1 - pkgs/systemd-rebuild/default.nix | 22 ---------------------- 3 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 pkgs/systemd-rebuild/default.nix diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index abec857..decc0cb 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -98,20 +98,11 @@ ]; # Create an auto-update systemd service that runs every day - systemd.services = { - updater = { - path = [ - pkgs.rebuild - pkgs.nix - pkgs.bash - pkgs.git - pkgs.gnutar - pkgs.xz.bin - config.nix.package.out - ]; - script = "bash /run/current-system/sw/bin/systemd-rebuild"; - startAt = "daily"; - }; + system.autoUpgrade = { + flake = "git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git"; + dates = "daily"; + enable = true; + system.autoUpgrade.dates = "Sat *-*-1..7,15..21 01:00:00"; }; # Enable networking diff --git a/pkgs/default.nix b/pkgs/default.nix index cd4a625..fce0284 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,6 +5,5 @@ pkgs: { dvt = pkgs.callPackage ./dvt {}; servo = pkgs.callPackage ./servo {}; rebuild = pkgs.callPackage ./rebuild {}; - systemd-rebuild = pkgs.callPackage ./systemd-rebuild {}; install-nix = pkgs.callPackage ./install-nix {}; } diff --git a/pkgs/systemd-rebuild/default.nix b/pkgs/systemd-rebuild/default.nix deleted file mode 100644 index 66b7bbe..0000000 --- a/pkgs/systemd-rebuild/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - stdenv, - writeShellApplication, -}: -writeShellApplication -{ - name = "systemd-rebuild"; - - runtimeInputs = []; - - text = '' - # A rebuild script for NixOS for use of the systemd service - systemd-inhibit rm -rf /tmp/rebuild - systemd-inhibit git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git /tmp/rebuild - systemd-inhibit echo "NixOS Rebuilding..." - systemd-inhibit nixos-rebuild switch --flake /tmp/rebuild/# - systemd-inhibit echo "Cleaning up repository in '/tmp/rebuild'..." - systemd-inhibit rm -rf /tmp/rebuild - systemd-inhibit echo "NixOS Rebuilt OK!" - ''; -} From 724f43095a60e52d10a44b7cab490e1ebd688d86 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:54:39 +0100 Subject: [PATCH 1382/2308] That's not fitting there --- nixos/hosts/queen/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index decc0cb..cf10395 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -102,7 +102,6 @@ flake = "git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git"; dates = "daily"; enable = true; - system.autoUpgrade.dates = "Sat *-*-1..7,15..21 01:00:00"; }; # Enable networking From 0b36d9f978dd3ba4f43caac799ee4fdd2ecdec03 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:55:27 +0100 Subject: [PATCH 1383/2308] That doesn't exist anymore --- nixos/shared/packages/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index b22c26f..ff0ab96 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -19,7 +19,6 @@ # Custom tools rebuild install-nix - systemd-rebuild # System tools age From a2126338f501be1640d7fc0b0d1660f5021bd565 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 15:57:21 +0100 Subject: [PATCH 1384/2308] Update the rebuild command to be more elegant --- pkgs/rebuild/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 0534627..f8f2b5e 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -12,16 +12,8 @@ writeShellApplication text = '' # A rebuild script for NixOS set -e - pushd /tmp > /dev/null - rm -rf ./rebuild - systemd-inhibit --what=idle git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild - pushd ./rebuild > /dev/null echo "NixOS Rebuilding..." - systemd-inhibit --what=idle sudo nixos-rebuild switch --flake .# - popd > /dev/null - echo "Cleaning up repository in '/tmp/rebuild'..." - systemd-inhibit --what=idle rm -rf ./rebuild - popd > /dev/null + sudo systemd-inhibit nixos-rebuild switch --flake git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git# echo "NixOS Rebuilt OK!" ''; } From d1c2acafde7c14a36cdfbaf15293da640e9c1f23 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 16:00:23 +0100 Subject: [PATCH 1385/2308] Add description to systemd-inhibit --- pkgs/rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index f8f2b5e..ee55f3d 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -13,7 +13,7 @@ writeShellApplication # A rebuild script for NixOS set -e echo "NixOS Rebuilding..." - sudo systemd-inhibit nixos-rebuild switch --flake git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git# + sudo systemd-inhibit --who="System Updater" why="Updating System" nixos-rebuild switch --flake git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git# echo "NixOS Rebuilt OK!" ''; } From 92f76492c36fd69c5f1128af03599308ffaecd88 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 16:01:39 +0100 Subject: [PATCH 1386/2308] Should probably use -- there --- pkgs/rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index ee55f3d..1e5fb89 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -13,7 +13,7 @@ writeShellApplication # A rebuild script for NixOS set -e echo "NixOS Rebuilding..." - sudo systemd-inhibit --who="System Updater" why="Updating System" nixos-rebuild switch --flake git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git# + sudo systemd-inhibit --who="System Updater" --why="Updating System" nixos-rebuild switch --flake git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git# echo "NixOS Rebuilt OK!" ''; } From ace01f3391c22faff15676622c4b2e9bd23e51a4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 16:18:10 +0100 Subject: [PATCH 1387/2308] That doesn't seem to work as well for some reason --- pkgs/rebuild/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 1e5fb89..0534627 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -12,8 +12,16 @@ writeShellApplication text = '' # A rebuild script for NixOS set -e + pushd /tmp > /dev/null + rm -rf ./rebuild + systemd-inhibit --what=idle git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild + pushd ./rebuild > /dev/null echo "NixOS Rebuilding..." - sudo systemd-inhibit --who="System Updater" --why="Updating System" nixos-rebuild switch --flake git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git# + systemd-inhibit --what=idle sudo nixos-rebuild switch --flake .# + popd > /dev/null + echo "Cleaning up repository in '/tmp/rebuild'..." + systemd-inhibit --what=idle rm -rf ./rebuild + popd > /dev/null echo "NixOS Rebuilt OK!" ''; } From f8cf7b589b471a27d18f6cbf8db66eda80b45008 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 16:27:48 +0100 Subject: [PATCH 1388/2308] Make rebuild a bit cleaner with sudo --- pkgs/rebuild/default.nix | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 0534627..b7d63b6 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -11,17 +11,20 @@ writeShellApplication text = '' # A rebuild script for NixOS - set -e - pushd /tmp > /dev/null - rm -rf ./rebuild - systemd-inhibit --what=idle git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild - pushd ./rebuild > /dev/null - echo "NixOS Rebuilding..." - systemd-inhibit --what=idle sudo nixos-rebuild switch --flake .# - popd > /dev/null - echo "Cleaning up repository in '/tmp/rebuild'..." - systemd-inhibit --what=idle rm -rf ./rebuild - popd > /dev/null - echo "NixOS Rebuilt OK!" + rebuild_function (){ + set -e + pushd /tmp > /dev/null + rm -rf ./rebuild + git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild + pushd ./rebuild > /dev/null + echo "NixOS Rebuilding..." + sudo nixos-rebuild switch --flake .# + popd > /dev/null + echo "Cleaning up repository in '/tmp/rebuild'..." + rm -rf ./rebuild + popd > /dev/null + echo "NixOS Rebuilt OK!" + } + sudo systemd-inhibit --who="NixOS Updater" --why="Updating system configuration" sudo -u lillian rebuild_function ''; } From b5ff78aae98bf73a4f6340a478ca193c80f60ab6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 16:34:55 +0100 Subject: [PATCH 1389/2308] This might work --- pkgs/rebuild/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index b7d63b6..b51433f 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -11,7 +11,7 @@ writeShellApplication text = '' # A rebuild script for NixOS - rebuild_function (){ + rebuild_function () { set -e pushd /tmp > /dev/null rm -rf ./rebuild @@ -25,6 +25,7 @@ writeShellApplication popd > /dev/null echo "NixOS Rebuilt OK!" } + sudo bash -c "$(declare -f rebuild_function); rebuild_function" sudo systemd-inhibit --who="NixOS Updater" --why="Updating system configuration" sudo -u lillian rebuild_function ''; } From 42a5093c254a0e96276e6bbc7a068785f08ac5d9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Mar 2024 16:36:39 +0100 Subject: [PATCH 1390/2308] Or this instead actually --- pkgs/rebuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index b51433f..f4830e8 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -25,7 +25,7 @@ writeShellApplication popd > /dev/null echo "NixOS Rebuilt OK!" } - sudo bash -c "$(declare -f rebuild_function); rebuild_function" - sudo systemd-inhibit --who="NixOS Updater" --why="Updating system configuration" sudo -u lillian rebuild_function + + sudo systemd-inhibit --who="NixOS Updater" --why="Updating system configuration" sudo -u lillian bash -c "$(declare -f rebuild_function); rebuild_function" ''; } From 23e99a1c40c95b8ef68eac1f18e9b82cea298def Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 2 Mar 2024 17:37:35 +0100 Subject: [PATCH 1391/2308] Simplified rebuild and made it only need one password entry --- nixos/shared/packages/default.nix | 1 + pkgs/default.nix | 1 + pkgs/rebuild-no-inhibit/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/rebuild/default.nix | 17 +---------------- 4 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 pkgs/rebuild-no-inhibit/default.nix diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index ff0ab96..e6c3641 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -18,6 +18,7 @@ environment.systemPackages = with pkgs; [ # Custom tools rebuild + rebuild-no-inhibit install-nix # System tools diff --git a/pkgs/default.nix b/pkgs/default.nix index fce0284..b1ee834 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,6 +4,7 @@ pkgs: { dvd = pkgs.callPackage ./dvd {}; dvt = pkgs.callPackage ./dvt {}; servo = pkgs.callPackage ./servo {}; + rebuild-no-inhibit = pkgs.callPackage ./rebuild-no-inhibit {}; rebuild = pkgs.callPackage ./rebuild {}; install-nix = pkgs.callPackage ./install-nix {}; } diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix new file mode 100644 index 0000000..627bd05 --- /dev/null +++ b/pkgs/rebuild-no-inhibit/default.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + writeShellApplication, +}: +writeShellApplication +{ + name = "rebuild-no-inhibit"; + + runtimeInputs = []; + + text = '' + # A rebuild script for NixOS + + set -e + pushd /tmp > /dev/null + rm -rf ./rebuild + git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild + pushd ./rebuild > /dev/null + echo "NixOS Rebuilding..." + sudo nixos-rebuild switch --flake .# + popd > /dev/null + echo "Cleaning up repository in '/tmp/rebuild'..." + rm -rf ./rebuild + popd > /dev/null + echo "NixOS Rebuilt OK!" + ''; +} diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index f4830e8..ee5131a 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -11,21 +11,6 @@ writeShellApplication text = '' # A rebuild script for NixOS - rebuild_function () { - set -e - pushd /tmp > /dev/null - rm -rf ./rebuild - git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild - pushd ./rebuild > /dev/null - echo "NixOS Rebuilding..." - sudo nixos-rebuild switch --flake .# - popd > /dev/null - echo "Cleaning up repository in '/tmp/rebuild'..." - rm -rf ./rebuild - popd > /dev/null - echo "NixOS Rebuilt OK!" - } - - sudo systemd-inhibit --who="NixOS Updater" --why="Updating system configuration" sudo -u lillian bash -c "$(declare -f rebuild_function); rebuild_function" + sudo systemd-inhibit --who="NixOS Updater" --why="Updating system configuration" rebuild-no-inhibit" ''; } From 80952c7f1d9e7e955c94dec2ca8cb4396010c4b9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 2 Mar 2024 17:39:24 +0100 Subject: [PATCH 1392/2308] Small typo there, removed the trailing " --- pkgs/rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index ee5131a..8b59258 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -11,6 +11,6 @@ writeShellApplication text = '' # A rebuild script for NixOS - sudo systemd-inhibit --who="NixOS Updater" --why="Updating system configuration" rebuild-no-inhibit" + sudo systemd-inhibit --who="NixOS Updater" --why="Updating system configuration" rebuild-no-inhibit ''; } From a2c50346f0a5ba4d556f8ae59e55e91920cc116a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 2 Mar 2024 22:01:05 +0100 Subject: [PATCH 1393/2308] Secure queen's ssh a bit better (password not allowed) --- nixos/hosts/queen/configuration.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index cf10395..aa89f8d 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -28,7 +28,13 @@ boot.tmp.cleanOnBoot = true; zramSwap.enable = false; networking.domain = ""; - services.openssh.enable = true; + services.openssh = { + enable = true; + # require public key authentication for better security + settings.PasswordAuthentication = false; + settings.KbdInteractiveAuthentication = false; + settings.PermitRootLogin = "no"; + }; nixpkgs = { # You can add overlays here From ad4a70ffa1fd622d23cc54e4172b53377cf8f15e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 2 Mar 2024 23:15:23 +0100 Subject: [PATCH 1394/2308] Add contabo wan for ipv6 support --- flake.nix | 7 +++ modules/home-manager/default.nix | 5 +++ modules/nixos/contabo/wan/default.nix | 65 +++++++++++++++++++++++++++ modules/nixos/default.nix | 6 +++ nixos/hosts/queen/configuration.nix | 12 +++++ 5 files changed, 95 insertions(+) create mode 100644 modules/home-manager/default.nix create mode 100644 modules/nixos/contabo/wan/default.nix create mode 100644 modules/nixos/default.nix diff --git a/flake.nix b/flake.nix index 08456d5..5a3b753 100644 --- a/flake.nix +++ b/flake.nix @@ -95,6 +95,13 @@ # Other options beside 'alejandra' include 'nixpkgs-fmt' formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + # Reusable nixos modules you might want to export + # These are usually stuff you would upstream into nixpkgs + nixosModules = import ./modules/nixos; + # Reusable home-manager modules you might want to export + # These are usually stuff you would upstream into home-manager + homeManagerModules = import ./modules/home-manager; + # Your custom packages and modifications, exported as overlays overlays = import ./overlays {inherit inputs;}; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix new file mode 100644 index 0000000..c682b92 --- /dev/null +++ b/modules/home-manager/default.nix @@ -0,0 +1,5 @@ +# Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module). +# These should be stuff you would like to share with others, not your personal configurations. +{ + # List your module files here +} diff --git a/modules/nixos/contabo/wan/default.nix b/modules/nixos/contabo/wan/default.nix new file mode 100644 index 0000000..785ea9b --- /dev/null +++ b/modules/nixos/contabo/wan/default.nix @@ -0,0 +1,65 @@ +{ + lib, + config, + ... +}: +with lib; let + cfg = config.modules.contabo.wan; +in { + options.modules.contabo.wan = { + enable = mkEnableOption "Enable Contabo Cloud WAN interface configuration"; + + macAddress = mkOption { + type = types.str; + description = "MAC Address of the WAN interface"; + }; + + ipAddresses = mkOption { + type = types.listOf types.str; + description = "List of IP Addresses on the WAN interface"; + }; + }; + + config = mkIf cfg.enable { + systemd.network.networks."20-wan" = { + matchConfig = { + MACAddress = cfg.macAddress; + }; + address = cfg.ipAddresses; + routes = [ + {routeConfig.Gateway = "fe80::1";} + {routeConfig = {Destination = "172.31.1.1";};} + { + routeConfig = { + Gateway = "172.31.1.1"; + GatewayOnLink = true; + }; + } + { + routeConfig = { + Destination = "172.16.0.0/12"; + Type = "unreachable"; + }; + } + { + routeConfig = { + Destination = "192.168.0.0/16"; + Type = "unreachable"; + }; + } + { + routeConfig = { + Destination = "10.0.0.0/8"; + Type = "unreachable"; + }; + } + { + routeConfig = { + Destination = "fc00::/7"; + Type = "unreachable"; + }; + } + ]; + }; + }; +} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix new file mode 100644 index 0000000..8685807 --- /dev/null +++ b/modules/nixos/default.nix @@ -0,0 +1,6 @@ +# Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module). +# These should be stuff you would like to share with others, not your personal configurations. +{ + # List your module files here + contabo.wan = import ./contabo/wan; +} diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index aa89f8d..c313726 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -10,6 +10,7 @@ imports = [ # If you want to use modules your own flake exports (from modules/home-manager): # outputs.homeManagerModules.example + outputs.nixosModules.contabo.wan inputs.home-manager.nixosModules.home-manager # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default @@ -121,6 +122,17 @@ networking.firewall.allowedTCPPorts = [22 80 443]; + networking.useNetworkd = true; + + modules.contabo.wan = { + enable = true; + macAddress = "aa:bb:cc:dd:ee:ff"; # changeme + ipAddresses = [ + "192.0.2.0/32" + "2001:db8::1/64" + ]; + }; + # Set your time zone. time.timeZone = "Europe/Amsterdam"; From eee9ca8adb291a067bb42514d68256c215c3c04a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 2 Mar 2024 23:21:19 +0100 Subject: [PATCH 1395/2308] Maybe I need to disable DHCP --- nixos/hosts/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index c313726..61266b3 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -124,6 +124,8 @@ networking.useNetworkd = true; + networking.useDHCP = false; + modules.contabo.wan = { enable = true; macAddress = "aa:bb:cc:dd:ee:ff"; # changeme From 80878905b3833e9255beac90004b5a77f87bba6d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 00:21:14 +0100 Subject: [PATCH 1396/2308] Debugging the ipv6 thing more --- modules/nixos/contabo/wan/default.nix | 4 ++-- nixos/hosts/queen/configuration.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/nixos/contabo/wan/default.nix b/modules/nixos/contabo/wan/default.nix index 785ea9b..9da2971 100644 --- a/modules/nixos/contabo/wan/default.nix +++ b/modules/nixos/contabo/wan/default.nix @@ -28,10 +28,10 @@ in { address = cfg.ipAddresses; routes = [ {routeConfig.Gateway = "fe80::1";} - {routeConfig = {Destination = "172.31.1.1";};} + {routeConfig = {Destination = "62.171.160.1";};} { routeConfig = { - Gateway = "172.31.1.1"; + Gateway = "62.171.160.1"; GatewayOnLink = true; }; } diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 61266b3..f26c1ff 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -111,6 +111,7 @@ enable = true; }; + systemd.services.systemd-networkd.serviceConfig.Environment = "SYSTEMD_LOG_LEVEL=debug"; # Enable networking networking.networkmanager.enable = true; networking.nat.enable = true; From 9ce95d17f4a991f83c63cdc1029eb593d093d73d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 00:28:16 +0100 Subject: [PATCH 1397/2308] Add the mac address --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index f26c1ff..209725b 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -129,7 +129,7 @@ modules.contabo.wan = { enable = true; - macAddress = "aa:bb:cc:dd:ee:ff"; # changeme + macAddress = "00:50:56:43:01:e2"; # changeme ipAddresses = [ "192.0.2.0/32" "2001:db8::1/64" From 114d750ec849d9dd9dfea917a2d3c24d36770e43 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 13:30:26 +0100 Subject: [PATCH 1398/2308] Let's see if all this routing for queen is unneeded for the wan, and if it works that way --- modules/nixos/contabo/wan/default.nix | 62 +++++++++++++-------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/modules/nixos/contabo/wan/default.nix b/modules/nixos/contabo/wan/default.nix index 9da2971..e12ddeb 100644 --- a/modules/nixos/contabo/wan/default.nix +++ b/modules/nixos/contabo/wan/default.nix @@ -28,37 +28,37 @@ in { address = cfg.ipAddresses; routes = [ {routeConfig.Gateway = "fe80::1";} - {routeConfig = {Destination = "62.171.160.1";};} - { - routeConfig = { - Gateway = "62.171.160.1"; - GatewayOnLink = true; - }; - } - { - routeConfig = { - Destination = "172.16.0.0/12"; - Type = "unreachable"; - }; - } - { - routeConfig = { - Destination = "192.168.0.0/16"; - Type = "unreachable"; - }; - } - { - routeConfig = { - Destination = "10.0.0.0/8"; - Type = "unreachable"; - }; - } - { - routeConfig = { - Destination = "fc00::/7"; - Type = "unreachable"; - }; - } + # {routeConfig = {Destination = "62.171.160.1";};} + # { + # routeConfig = { + # Gateway = "62.171.160.1"; + # GatewayOnLink = true; + # }; + # } + # { + # routeConfig = { + # Destination = "172.16.0.0/12"; + # Type = "unreachable"; + # }; + # } + # { + # routeConfig = { + # Destination = "192.168.0.0/16"; + # Type = "unreachable"; + # }; + # } + # { + # routeConfig = { + # Destination = "10.0.0.0/8"; + # Type = "unreachable"; + # }; + # } + # { + # routeConfig = { + # Destination = "fc00::/7"; + # Type = "unreachable"; + # }; + # } ]; }; }; From 87caa9a8979c49ea2cfbd0c59aa7053210fc4cfa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 14:21:32 +0100 Subject: [PATCH 1399/2308] Let's try this for network on queen and otherwise just give up --- nixos/hosts/queen/configuration.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 209725b..a37c23b 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -118,6 +118,7 @@ networking.nat.internalInterfaces = ["ve-+"]; networking.nat.externalInterface = "ens18"; networking.enableIPv6 = lib.mkForce true; + networking.nameservers = ["2a02:c207::1:53" "2a02:c207::2:53"]; networking.firewall.enable = true; @@ -125,16 +126,16 @@ networking.useNetworkd = true; - networking.useDHCP = false; + # networking.useDHCP = false; - modules.contabo.wan = { - enable = true; - macAddress = "00:50:56:43:01:e2"; # changeme - ipAddresses = [ - "192.0.2.0/32" - "2001:db8::1/64" - ]; - }; + # modules.contabo.wan = { + # enable = true; + # macAddress = "00:50:56:43:01:e2"; # changeme + # ipAddresses = [ + # "192.0.2.0/32" + # "2001:db8::1/64" + # ]; + # }; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From e366f68f872a3dd917ab32e13b9e45d960a17ecd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 14:25:22 +0100 Subject: [PATCH 1400/2308] Don't use networkd either --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index a37c23b..5e93a27 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -124,7 +124,7 @@ networking.firewall.allowedTCPPorts = [22 80 443]; - networking.useNetworkd = true; + # networking.useNetworkd = true; # networking.useDHCP = false; From 401bd102db3bab59204583b06da214cd3a4bfa77 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 14:30:41 +0100 Subject: [PATCH 1401/2308] Update flake lock --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 840eecb..fa3d502 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1708910350, - "narHash": "sha256-cTuJVlOm05aQFIgGuYikgkrI61P2vTO2OfXwIRWEzUg=", + "lastModified": 1709439398, + "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=", "owner": "nix-community", "repo": "disko", - "rev": "a13f36255cf4ce99cc4236a34251c2e7106e101d", + "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1708988456, - "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", + "lastModified": 1709445365, + "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", + "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1709142038, - "narHash": "sha256-ZjP808isgLwuiqxSU1CYFyafm5GF80aYw1CXJbnVsgs=", + "lastModified": 1709295149, + "narHash": "sha256-+blV8vKyvh3gYnUFYTOu2yuWxEEBqwS7hfLm6qdpoe4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b83751a057acbb5f989193773841217ddc93d1f8", + "rev": "0ef51034dcc8b65b8be72eedd0d5db7d426ea054", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709051793, - "narHash": "sha256-4FXFBq5mN1IwN18Fd2OEF1iCZV5PC40gP2L64oyq3xQ=", + "lastModified": 1709332019, + "narHash": "sha256-kJAoPvpVRO3WR1dCZQKJpUMYoyA/6u9iUDX9gGEkjGI=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e761c7ee47b64debc687d8bff7599d702c893dcc", + "rev": "eeb45682dd4b2a921a3cab286f13101c9750d6bb", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1709167897, - "narHash": "sha256-UQVMLPVCo3wcQUYZfHnSoVVgi5RzfnaOm2z+aTlxf4A=", + "lastModified": 1709226763, + "narHash": "sha256-GlJ7g2srrtx6s5P2uswZ6Zcpy2u90tomIx+Gstlk97s=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f34ad8b5445d3f0b72370eaae8687125fb736efa", + "rev": "2c9562e7624fa1b50983fc18d504bf86202bef49", "type": "github" }, "original": { @@ -347,11 +347,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709169036, - "narHash": "sha256-j+ywPKUS0JLpidNcz6vA0z1xI/rU5PcLV7pwZMce+Tw=", + "lastModified": 1709386671, + "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec25c90d35d24e36c0af3b3d58a09542367ebbee", + "rev": "fa9a51752f1b5de583ad5213eb621be071806663", "type": "github" }, "original": { @@ -409,11 +409,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1708819810, - "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=", + "lastModified": 1709428628, + "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea", + "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709150264, - "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -457,11 +457,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708847675, - "narHash": "sha256-RUZ7KEs/a4EzRELYDGnRB6i7M1Izii3JD/LyzH0c6Tg=", + "lastModified": 1709271102, + "narHash": "sha256-Z2sBL/HRRTNABsU8E5XsP+FXBEyBoi6oMwm5bV7lSFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a34566b67bef34c551f204063faeecc444ae9da", + "rev": "09c1497ce5d4ed4a0edfdd44450d3048074cb300", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709150264, - "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -504,11 +504,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1708751719, - "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", + "lastModified": 1709356872, + "narHash": "sha256-mvxCirJbtkP0cZ6ABdwcgTk0u3bgLoIoEFIoYBvD6+4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", + "rev": "458b097d81f90275b3fdf03796f0563844926708", "type": "github" }, "original": { @@ -671,11 +671,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1708987867, - "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", + "lastModified": 1709434911, + "narHash": "sha256-UN47hQPM9ijwoz7cYq10xl19hvlSP/232+M5vZDOMs4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", + "rev": "075df9d85ee70cfb53e598058045e1738f05e273", "type": "github" }, "original": { From 294916003a88ad9b9768731c16c940010b525373 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 14:34:00 +0100 Subject: [PATCH 1402/2308] Add ipv4 nameserver --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 5e93a27..ce58117 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -118,7 +118,7 @@ networking.nat.internalInterfaces = ["ve-+"]; networking.nat.externalInterface = "ens18"; networking.enableIPv6 = lib.mkForce true; - networking.nameservers = ["2a02:c207::1:53" "2a02:c207::2:53"]; + networking.nameservers = ["1.1.1.1" "2a02:c207::1:53" "2a02:c207::2:53"]; networking.firewall.enable = true; From c3512036b198a6897c3626aa22ddbdd16522827f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 16:36:41 +0100 Subject: [PATCH 1403/2308] Enable gamemode on GLaDOS --- nixos/hosts/GLaDOS/configuration.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 94e947a..0d56557 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -46,6 +46,27 @@ driversi686Linux.amdvlk ]; + programs.gamemode = { + enable = true; + settings = { + general = { + renice = 10; + }; + + # Warning: GPU optimisations have the potential to damage hardware + gpu = { + apply_gpu_optimisations = "accept-responsibility"; + gpu_device = 0; + amd_performance_level = "high"; + }; + + custom = { + start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; + end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; + }; + }; + }; + boot.loader.systemd-boot.enable = lib.mkForce false; boot.lanzaboote = { From 6d806dde02979e4b08ddd7df8c11baca20f85f83 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 16:45:39 +0100 Subject: [PATCH 1404/2308] Add lillian to gamemode group --- nixos/hosts/GLaDOS/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 0d56557..c7dff7e 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -74,6 +74,8 @@ pkiBundle = "/etc/secureboot"; }; + users.users.lillian.extraGroups = ["gamemode"]; + home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { From 0cc5bb9a60ef64b115a7c40d98a9ed0596e9f02e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 16:48:18 +0100 Subject: [PATCH 1405/2308] Enable mangohud on GLaDOS too --- nixos/hosts/GLaDOS/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index c7dff7e..426ff2e 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -67,6 +67,11 @@ }; }; + programs.mangohud = { + enable = true; + enableSessionWide = true; + }; + boot.loader.systemd-boot.enable = lib.mkForce false; boot.lanzaboote = { From 0ab12a9f4abf6277cb92338fa36f90786f3f82f7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 16:49:53 +0100 Subject: [PATCH 1406/2308] It's a home manager option oops --- home-manager/hosts/GLaDOS/lillian.nix | 5 +++++ nixos/hosts/GLaDOS/configuration.nix | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 8558582..58eac07 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -27,6 +27,11 @@ r2modman ]; + programs.mangohud = { + enable = true; + enableSessionWide = true; + }; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "24.05"; } diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 426ff2e..c7dff7e 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -67,11 +67,6 @@ }; }; - programs.mangohud = { - enable = true; - enableSessionWide = true; - }; - boot.loader.systemd-boot.enable = lib.mkForce false; boot.lanzaboote = { From e5e2fe2f18dd702ff15a57e9fd1e120e3bf3241e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 17:10:23 +0100 Subject: [PATCH 1407/2308] Switch to plasma6! --- nixos/desktop/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 5c0703c..059b450 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -70,15 +70,15 @@ # KDE/QT krunner-translator - libsForQt5.discover - libsForQt5.kcalc - libsForQt5.kdepim-addons - libsForQt5.kirigami2 - libsForQt5.kdeconnect-kde - libsForQt5.krunner-ssh - libsForQt5.krunner-symbols - libsForQt5.packagekit-qt - libportal-qt5 + kdePackages.discover + kdePackages.kcalc + kdePackages.kdepim-addons + kdePackages.kirigami + kdePackages.kdeconnect-kde + # kdePackages.krunner-ssh + # kdePackages.krunner-symbols + kdePackages.packagekit-qt + libportal # User tools noisetorch @@ -108,8 +108,8 @@ # Enable the KDE Plasma Desktop Environment. services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.defaultSession = "plasmawayland"; + services.xserver.desktopManager.plasma6.enable = true; + services.xserver.displayManager.defaultSession = "plasma"; programs.kdeconnect.enable = true; # Enable flatpak support From 607e8596fd8d0d5f9f0feaf1ebb5f12d51690b3a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 18:07:54 +0100 Subject: [PATCH 1408/2308] Update shodan to plasma6 too --- nixos/hosts/shodan/configuration.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 07a42b6..602ab6b 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -83,16 +83,16 @@ #KDE: krunner-translator - libsForQt5.discover - libsForQt5.kcalc - libsForQt5.kdepim-addons - libsForQt5.kirigami2 - libsForQt5.kdeconnect-kde - libsForQt5.krunner-ssh - libsForQt5.krunner-symbols - libsForQt5.packagekit-qt - libsForQt5.qt5.qtvirtualkeyboard - libportal-qt5 + kdePackages.discover + kdePackages.kcalc + kdePackages.kdepim-addons + kdePackages.kirigami + kdePackages.kdeconnect-kde + # kdePackages.krunner-ssh + # kdePackages.krunner-symbols + kdePackages.qtvirtualkeyboard + kdePackages.packagekit-qt + libportal #Gaming: heroic @@ -138,7 +138,7 @@ services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.xserver.desktopManager.plasma5.enable = true; + services.xserver.desktopManager.plasma6.enable = true; programs.kdeconnect.enable = true; services.xserver.displayManager.sddm.settings = { From dd9b5aefb02c5bbc60ec19c659038f5fa88e2972 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 18:09:57 +0100 Subject: [PATCH 1409/2308] Forgot to set the desktop correctly --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 602ab6b..64eb2ea 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -107,7 +107,7 @@ jovian.steam.autoStart = true; #What desktop to start when switching to desktop session - jovian.steam.desktopSession = "plasmawayland"; + jovian.steam.desktopSession = "plasma"; jovian.steam.user = "lillian"; From 3b28b497cd911d8f8e0146fa2232044dd2ca0c7a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 20:55:49 +0100 Subject: [PATCH 1410/2308] Home manager configuration says this is needed, don't know why, also small refactor to put nix config in shared --- nixos/desktop/default.nix | 22 ---------------------- nixos/hosts/queen/configuration.nix | 22 ---------------------- nixos/hosts/shodan/configuration.nix | 22 ---------------------- nixos/shared/default.nix | 23 +++++++++++++++++++++++ 4 files changed, 23 insertions(+), 66 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 059b450..7d66489 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -25,28 +25,6 @@ }; }; - nix = { - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: {flake = value;}) inputs; - - # This will additionally add your inputs to the system's legacy channels - # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Deduplicate and optimize nix store - auto-optimise-store = true; - }; - }; - environment.systemPackages = with pkgs; [ # Custom tools dvd diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index ce58117..f27ff53 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -51,28 +51,6 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ./secrets/sops.yaml; - nix = { - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: {flake = value;}) inputs; - - # This will additionally add your inputs to the system's legacy channels - # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Deduplicate and optimize nix store - auto-optimise-store = true; - }; - }; - environment.systemPackages = with pkgs; [ akkoma fzf diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 64eb2ea..1ef0501 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -43,28 +43,6 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ./secrets/sops.yaml; - nix = { - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: {flake = value;}) inputs; - - # This will additionally add your inputs to the system's legacy channels - # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Deduplicate and optimize nix store - auto-optimise-store = true; - }; - }; - environment.systemPackages = with pkgs; [ #System: alejandra diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index db6995d..221e954 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -13,6 +13,29 @@ sops.age.keyFile = ../../../../../../var/secrets/keys.txt; sops.secrets."lillian-password".neededForUsers = true; + nix = { + package = pkgs.nixFlakes; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + users.users.lillian = { isNormalUser = true; extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; From f030d55e688b784441568568c474e02dec6d7c0a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 22:30:41 +0100 Subject: [PATCH 1411/2308] Remove discover from home manager --- home-manager/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index cb49647..c331ba1 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -75,7 +75,6 @@ # System tools: rage - discover flameshot fzf nextcloud-client From 9dc9cd3ddda3caa3a0f89293c59a23b86816a6df Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Mar 2024 22:45:30 +0100 Subject: [PATCH 1412/2308] Add yuzu to shodan --- home-manager/hosts/shodan/lillian.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 4675608..6f70218 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -52,6 +52,7 @@ #Gaming: prismlauncher r2modman + yuzu # Multimedia: freetube From bb4a940b2cd1f88c990ff2f7061ed16d52070451 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 01:33:03 +0100 Subject: [PATCH 1413/2308] switch to early access yuzu --- home-manager/hosts/shodan/lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 6f70218..edfa5fc 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -52,7 +52,7 @@ #Gaming: prismlauncher r2modman - yuzu + yuzu-early-access # Multimedia: freetube From b5a046bbf9d0d9a1808922dcc7d9ab0a435369e1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 16:11:01 +0100 Subject: [PATCH 1414/2308] Move some zsh config around to shared --- nixos/desktop/default.nix | 7 ------- nixos/hosts/queen/configuration.nix | 4 ---- nixos/hosts/shodan/configuration.nix | 4 ---- nixos/shared/default.nix | 7 +++++++ 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 7d66489..58fdf17 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -127,10 +127,6 @@ enable = true; }; - programs.zsh = { - enable = true; - }; - virtualisation.podman = { enable = true; dockerCompat = true; @@ -160,7 +156,4 @@ ''; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; - - # Enable completion of system packages by zsh - environment.pathsToLink = ["/share/zsh"]; } diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index f27ff53..50f1ce6 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -118,10 +118,6 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - programs.zsh = { - enable = true; - }; - programs.git = { enable = true; }; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 1ef0501..4d6232d 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -170,10 +170,6 @@ enable = true; }; - programs.zsh = { - enable = true; - }; - programs.git = { enable = true; }; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 221e954..55493b2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -47,6 +47,13 @@ ]; }; + programs.zsh = { + enable = true; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + users.mutableUsers = false; users.users.root = { From ff1acef5776c71f3c417ec52828cf4c118b520e4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 16:16:34 +0100 Subject: [PATCH 1415/2308] Replace cd with z --- home-manager/package-configs/zsh.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index e86be66..ed22d26 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -11,6 +11,10 @@ enable = true; }; + environment.interactiveShellInit = '' + alias cd='z' + ''; + programs.zsh = { enable = true; plugins = [ @@ -89,6 +93,7 @@ "web-search" "zsh-interactive-cd" "zsh-navigation-tools" + "z" ]; theme = "jtriley"; }; From 9884ed23c1809189b21a8fd02adfbf0fe395ac10 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 16:17:16 +0100 Subject: [PATCH 1416/2308] Needs to be in there instead --- home-manager/package-configs/zsh.nix | 4 ---- nixos/shared/default.nix | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index ed22d26..09eedb5 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -11,10 +11,6 @@ enable = true; }; - environment.interactiveShellInit = '' - alias cd='z' - ''; - programs.zsh = { enable = true; plugins = [ diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 55493b2..11217d3 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -54,6 +54,10 @@ # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; + environment.interactiveShellInit = '' + alias cd='z' + ''; + users.mutableUsers = false; users.users.root = { From 521d51b1ce13e7d249a7426e1c1f501508dcb26d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 16:20:07 +0100 Subject: [PATCH 1417/2308] Enable zoxide this way --- home-manager/package-configs/zsh.nix | 4 ++++ nixos/shared/default.nix | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 09eedb5..4cd8ac9 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -11,6 +11,10 @@ enable = true; }; + programs.zoxide = { + enable = true; + }; + programs.zsh = { enable = true; plugins = [ diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 11217d3..55493b2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -54,10 +54,6 @@ # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; - environment.interactiveShellInit = '' - alias cd='z' - ''; - users.mutableUsers = false; users.users.root = { From e39e1efe9df842f49047381a9c19fa7cd3525777 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 16:25:09 +0100 Subject: [PATCH 1418/2308] Maybe this will alias it --- home-manager/package-configs/zsh.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 4cd8ac9..fd81fb2 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -17,6 +17,9 @@ programs.zsh = { enable = true; + shellAliases = { + cd = "zoxide"; + }; plugins = [ { name = "zsh-nix-shell"; From 9dfb72cf6a1f4d7619b45ec4a119f802640b44bf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 16:26:40 +0100 Subject: [PATCH 1419/2308] Okay this should work, I was confused before --- home-manager/package-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index fd81fb2..bacb53e 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -18,7 +18,7 @@ programs.zsh = { enable = true; shellAliases = { - cd = "zoxide"; + cd = "z"; }; plugins = [ { From 50e34499e1d7098217a9698f2fc089386a57763d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 18:05:20 +0100 Subject: [PATCH 1420/2308] Set hardware config for xps 7390 for EDI --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flake.nix b/flake.nix index 5a3b753..8780eea 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,8 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + # Disko for declaratively setting disk formatting disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; @@ -76,6 +78,7 @@ linger, pihole, lanzaboote, + nixos-hardware, ... } @ inputs: let inherit (self) outputs; @@ -112,6 +115,7 @@ system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + nixos-hardware.nixosModules.dell-xps-13-7390 # > Our main nixos configuration file < ./nixos/hosts/EDI/configuration.nix sops-nix.nixosModules.sops From 9d5e710f90ef736ba2ba87dddbfe8b82502ee8c0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 18:06:34 +0100 Subject: [PATCH 1421/2308] update flake lock --- flake.lock | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index fa3d502..15670a4 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1709445365, - "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", + "lastModified": 1709485962, + "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=", "owner": "nix-community", "repo": "home-manager", - "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", + "rev": "d579633ff9915a8f4058d5c439281097e92380a8", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709332019, - "narHash": "sha256-kJAoPvpVRO3WR1dCZQKJpUMYoyA/6u9iUDX9gGEkjGI=", + "lastModified": 1709547316, + "narHash": "sha256-Dp/e31K3q1LWXReK03Y70SSV/GUYq52VNzA4oXSRHA0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "eeb45682dd4b2a921a3cab286f13101c9750d6bb", + "rev": "7fbb67b44ff61627d474bc0e2a6096b75f7b3a28", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixlib": { "locked": { - "lastModified": 1708821942, - "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=", + "lastModified": 1709426687, + "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b", + "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1709226763, - "narHash": "sha256-GlJ7g2srrtx6s5P2uswZ6Zcpy2u90tomIx+Gstlk97s=", + "lastModified": 1709557527, + "narHash": "sha256-PV8oYqhTHX6FGZMQ1m5dhRuS914AhofPwgnAMhUZtwE=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "2c9562e7624fa1b50983fc18d504bf86202bef49", + "rev": "d048d6fc4bada612ff08d4b9d5edc48d45389431", "type": "github" }, "original": { @@ -345,6 +345,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1709410583, + "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1709386671, @@ -554,11 +570,11 @@ ] }, "locked": { - "lastModified": 1708970090, - "narHash": "sha256-z/8pJRiLfYqGQvIJj3xGqobygNkVSSGN6115pAEDNU4=", + "lastModified": 1709474138, + "narHash": "sha256-OWwiBEw6bdCOdOTDSfLbGmWDV2JhrglfV76qlD61eAQ=", "owner": "pjones", "repo": "plasma-manager", - "rev": "74fa336c22adf822c6ef13b21bfff18fbef66e9c", + "rev": "8de2af1270b2a48f9f97880ae611c626379c860a", "type": "github" }, "original": { @@ -608,6 +624,7 @@ "lanzaboote": "lanzaboote", "linger": "linger", "nixos-generators": "nixos-generators", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "pihole": "pihole", From bafd4eb91c9a08098d50486de94988e5e01a98c8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 18:09:17 +0100 Subject: [PATCH 1422/2308] Just to be sure let's force the latest linux kernel --- nixos/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 58fdf17..2d64637 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -138,7 +138,7 @@ users.users.lillian.extraGroups = ["tss"]; # tss group has access to TPM devices boot.bootspec.enable = true; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; boot.supportedFilesystems = ["bcachefs"]; boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; boot.kernelModules = [ From 295d9bcc21c75e4d85585c45ef872ccdaf0ff3d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Mar 2024 18:20:58 +0100 Subject: [PATCH 1423/2308] Let's just undo this ipv6 shenaniganery --- nixos/hosts/queen/configuration.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 50f1ce6..41f637e 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -10,7 +10,7 @@ imports = [ # If you want to use modules your own flake exports (from modules/home-manager): # outputs.homeManagerModules.example - outputs.nixosModules.contabo.wan + # outputs.nixosModules.contabo.wan inputs.home-manager.nixosModules.home-manager # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default @@ -96,7 +96,9 @@ networking.nat.internalInterfaces = ["ve-+"]; networking.nat.externalInterface = "ens18"; networking.enableIPv6 = lib.mkForce true; - networking.nameservers = ["1.1.1.1" "2a02:c207::1:53" "2a02:c207::2:53"]; + networking.nameservers = ["1.1.1.1"]; + + # Contabo ipv6 nameservers: "2a02:c207::1:53" "2a02:c207::2:53" networking.firewall.enable = true; From c6d12908cb4d16cdb758c9e7c5d4b182b08e0f8f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Mar 2024 15:34:12 +0100 Subject: [PATCH 1424/2308] Inhibit trickery for the install command too --- pkgs/default.nix | 1 + pkgs/install-nix-no-inhibit/default.nix | 36 +++++++++++++++++++++++++ pkgs/install-nix/default.nix | 24 ++--------------- 3 files changed, 39 insertions(+), 22 deletions(-) create mode 100644 pkgs/install-nix-no-inhibit/default.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index b1ee834..ce69279 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,5 +6,6 @@ pkgs: { servo = pkgs.callPackage ./servo {}; rebuild-no-inhibit = pkgs.callPackage ./rebuild-no-inhibit {}; rebuild = pkgs.callPackage ./rebuild {}; + install-nix-no-inhibit = pkgs.callPackage ./install-nix-no-inhibit {}; install-nix = pkgs.callPackage ./install-nix {}; } diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix new file mode 100644 index 0000000..aef1360 --- /dev/null +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + writeShellApplication, +}: +writeShellApplication +{ + name = "install-nix-no-inhibit"; + + runtimeInputs = []; + + text = '' + # An install script for NixOS installation to /tmp + set -e + pushd /tmp > /dev/null + systemd-inhibit --what=idle rm -rf ./install-nix + systemd-inhibit --what=idle git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix + pushd ./install-nix/nixos/hosts > /dev/null + echo "Please choose the hostname you are installing to from the following list:" + i=1 + for d in */ + do + dirs[i++]="''${d%/}" + done + select dir in "''${dirs[@]}"; do echo "you selected ''${dir}"; break; done + popd > /dev/null + pushd ./install-nix > /dev/null + echo "NixOS Installing..." + systemd-inhibit --what=idle sudo nixos-install --flake .#"''${dir}" + popd > /dev/null + echo "Cleaning up repository in '/tmp/install-nix'..." + systemd-inhibit --what=idle rm -rf ./install-nix + popd > /dev/null + echo "NixOS Install Succeeded!" + ''; +} diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index 9cdd625..bfcf17e 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -10,27 +10,7 @@ writeShellApplication runtimeInputs = []; text = '' - # An install script for NixOS installation to /tmp - set -e - pushd /tmp > /dev/null - systemd-inhibit --what=idle rm -rf ./install-nix - systemd-inhibit --what=idle git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix - pushd ./install-nix/nixos/hosts > /dev/null - echo "Please choose the hostname you are installing to from the following list:" - i=1 - for d in */ - do - dirs[i++]="''${d%/}" - done - select dir in "''${dirs[@]}"; do echo "you selected ''${dir}"; break; done - popd > /dev/null - pushd ./install-nix > /dev/null - echo "NixOS Installing..." - systemd-inhibit --what=idle sudo nixos-install --flake .#"''${dir}" - popd > /dev/null - echo "Cleaning up repository in '/tmp/install-nix'..." - systemd-inhibit --what=idle rm -rf ./install-nix - popd > /dev/null - notify-send -e "NixOS Install Succeeded!" --icon=software-update-available + # A rebuild script for NixOS + sudo systemd-inhibit --who="NixOS Installer" --why="Installing NixOS to /mnt" install-nix-no-inhibit ''; } From 1fbdc1737cf15d0e24fbcdb90a190199026a57e1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 6 Mar 2024 10:38:50 +0100 Subject: [PATCH 1425/2308] Install aha and libportal-qt5 --- nixos/desktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 2d64637..90d79d9 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -32,6 +32,7 @@ servo # System tools + aha direnv git-filter-repo gnupg @@ -56,6 +57,7 @@ # kdePackages.krunner-ssh # kdePackages.krunner-symbols kdePackages.packagekit-qt + libportal-qt5 libportal # User tools From 8abedab4042604bba9fad855d06b03a88eecf37e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 7 Mar 2024 13:23:47 +0100 Subject: [PATCH 1426/2308] Forgejo jupyter rendering added --- nixos/hosts/queen/configuration.nix | 2 ++ nixos/server/package-configs/forgejo/default.nix | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 41f637e..d7c6ffe 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -72,6 +72,8 @@ onlyoffice-documentserver postgresql_16 python3 + python311Packages.nbconvert + jupyter rabbitmq-server roundcube roundcubePlugins.contextmenu diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index 8911594..2377b60 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -64,6 +64,13 @@ ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; }; + markup.jupyter = " + ENABLED = true; + FILE_EXTENSIONS = .ipynb + RENDER_COMMAND = jupyter nbconvert --stdout --to html --template full + IS_INPUT_FILE = true + RENDER_CONTENT_MODE = no-sanitizer + "; }; }; From d12054c95a384d885991bb100dc99a69bfc446b2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 8 Mar 2024 10:12:19 +0100 Subject: [PATCH 1427/2308] Flake lock update --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 15670a4..24d7f39 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1708794349, - "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=", + "lastModified": 1709485267, + "narHash": "sha256-bunOdYTK9YNiy+u0D6YN8q40oAeHoQ+9EgoatF3InJ8=", "owner": "ipetkov", "repo": "crane", - "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa", + "rev": "e4a71521a8eafc07524c55326ecc4ea942b06e25", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1709439398, - "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=", + "lastModified": 1709773529, + "narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=", "owner": "nix-community", "repo": "disko", - "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57", + "rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -168,11 +168,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1709485962, - "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=", + "lastModified": 1709764752, + "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d579633ff9915a8f4058d5c439281097e92380a8", + "rev": "cf111d1a849ddfc38e9155be029519b0e2329615", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1709295149, - "narHash": "sha256-+blV8vKyvh3gYnUFYTOu2yuWxEEBqwS7hfLm6qdpoe4=", + "lastModified": 1709744297, + "narHash": "sha256-Q2LOs08hmFlzJdJMN4yNrWvZTegfpHEajLin0vcw7t0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0ef51034dcc8b65b8be72eedd0d5db7d426ea054", + "rev": "f8e3302ee1e0ccaabc443f45dc415e117b54926f", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709547316, - "narHash": "sha256-Dp/e31K3q1LWXReK03Y70SSV/GUYq52VNzA4oXSRHA0=", + "lastModified": 1709641033, + "narHash": "sha256-Eegyvq56NiXgrDrZ6FgE1lNCD2Mi6aLY/HFOeVG8ZtI=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "7fbb67b44ff61627d474bc0e2a6096b75f7b3a28", + "rev": "3881267e84cc966ded48601390e88fc13d960319", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1709557527, - "narHash": "sha256-PV8oYqhTHX6FGZMQ1m5dhRuS914AhofPwgnAMhUZtwE=", + "lastModified": 1709887845, + "narHash": "sha256-803UIoB8+vGkm/VK/g55aBAAOf/ncTGvxXyjTF4ydm0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d048d6fc4bada612ff08d4b9d5edc48d45389431", + "rev": "bef32a05496d9480b02be586fa7827748b9e597b", "type": "github" }, "original": { @@ -363,11 +363,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709386671, - "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", + "lastModified": 1709780214, + "narHash": "sha256-p4iDKdveHMhfGAlpxmkCtfQO3WRzmlD11aIcThwPqhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa9a51752f1b5de583ad5213eb621be071806663", + "rev": "f945939fd679284d736112d3d5410eb867f3b31c", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709271102, - "narHash": "sha256-Z2sBL/HRRTNABsU8E5XsP+FXBEyBoi6oMwm5bV7lSFw=", + "lastModified": 1709455474, + "narHash": "sha256-UzfJcBjXUySRokQiI8QQZp/Xpneiu7A5iaLGU09NiQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09c1497ce5d4ed4a0edfdd44450d3048074cb300", + "rev": "768bb879887ae70e62d7628c82d825bbbf873b4b", "type": "github" }, "original": { @@ -489,11 +489,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -570,11 +570,11 @@ ] }, "locked": { - "lastModified": 1709474138, - "narHash": "sha256-OWwiBEw6bdCOdOTDSfLbGmWDV2JhrglfV76qlD61eAQ=", + "lastModified": 1709634318, + "narHash": "sha256-4jZRGyPYShyLocUnE0kqDoitqxqBCkuJ6w6/QX4bjYk=", "owner": "pjones", "repo": "plasma-manager", - "rev": "8de2af1270b2a48f9f97880ae611c626379c860a", + "rev": "9bac5925cf7716979535eed9c88e307fa9744169", "type": "github" }, "original": { @@ -645,11 +645,11 @@ ] }, "locked": { - "lastModified": 1708827164, - "narHash": "sha256-oBNS6pO04Y6gZBLThP3JDDgviex0+WTXz3bVBenyzms=", + "lastModified": 1709431943, + "narHash": "sha256-CqTcEJGITB3rfSuAcWC1QZnbVnIipXmIDbZHfxsAy80=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e0626adabd5ea461f80b1b11390da2a6575adb30", + "rev": "362184acf4a991f27fc222864e94a2e81b3c3c9f", "type": "github" }, "original": { @@ -688,11 +688,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1709434911, - "narHash": "sha256-UN47hQPM9ijwoz7cYq10xl19hvlSP/232+M5vZDOMs4=", + "lastModified": 1709711091, + "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "075df9d85ee70cfb53e598058045e1738f05e273", + "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", "type": "github" }, "original": { From 585127ffc7ea5e8fe43e2414ebc272ac9cd3a4e6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 11 Mar 2024 18:08:54 +0100 Subject: [PATCH 1428/2308] Update plasma config for EDI --- .../plasma-desktop/default.nix | 78 +++++++++++-------- 1 file changed, 45 insertions(+), 33 deletions(-) diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix index c1a3aba..26509cf 100644 --- a/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix +++ b/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix @@ -3,32 +3,39 @@ enable = true; shortcuts = { "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; + "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; - "kded5"."Show System Activity" = "Ctrl+Esc"; - "kded5"."display" = ["Display" "Meta+P"]; "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; + "kmix"."decrease_volume_small" = "Shift+Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; + "kmix"."increase_volume_small" = "Shift+Volume Up"; "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; "ksmserver"."Halt Without Confirmation" = []; "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; "ksmserver"."Log Out Without Confirmation" = []; + "ksmserver"."Reboot" = []; "ksmserver"."Reboot Without Confirmation" = []; + "ksmserver"."Shut Down" = []; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Cube" = "Meta+C"; + "kwin"."Cycle Overview" = []; + "kwin"."Cycle Overview Opposite" = []; "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."Grid View" = "Meta+G"; "kwin"."Increase Opacity" = []; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; "kwin"."Move Tablet to Next Output" = []; @@ -185,31 +192,19 @@ "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; - "org.kde.dolphin.desktop"."_launch" = "Meta+E"; - "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; - "org.kde.konsole.desktop"."NewTab" = []; - "org.kde.konsole.desktop"."NewWindow" = []; - "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; - "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; - "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; - "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; - "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; - "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; - "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; - "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; - "org.kde.spectacle.desktop"."_launch" = "Print"; "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down"; "org_kde_powerdevil"."Hibernate" = "Hibernate"; "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up"; "org_kde_powerdevil"."PowerDown" = "Power Down"; "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = []; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; "plasmashell"."activate task manager entry 10" = []; "plasmashell"."activate task manager entry 2" = "Meta+2"; @@ -237,12 +232,15 @@ "plasmashell"."switch to next activity" = []; "plasmashell"."switch to previous activity" = []; "plasmashell"."toggle do not disturb" = []; - "systemsettings.desktop"."_launch" = "Tools"; - "systemsettings.desktop"."kcm-kscreen" = []; - "systemsettings.desktop"."kcm-lookandfeel" = []; - "systemsettings.desktop"."kcm-users" = []; - "systemsettings.desktop"."powerdevilprofilesconfig" = []; - "systemsettings.desktop"."screenlocker" = []; + "services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { "baloofilerc"."General"."dbVersion" = 2; @@ -266,9 +264,12 @@ "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."General"."AccentColor" = "184,117,220"; "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; + "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; + "kdeglobals"."KDE"."ShowDeleteCommand" = false; "kdeglobals"."KDE"."SingleClick" = false; "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; @@ -300,21 +301,13 @@ "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; - "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; - "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; - "kglobalshortcutsrc"."org.kde.kcalc.desktop"."_k_friendly_name" = "KCalc"; - "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; - "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; - "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Emoji Selector"; - "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; - "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Power Management"; - "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; - "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "System Settings"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "KDE Power Management System"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "plasmashell"; "khotkeysrc"."Data"."DataCount" = 3; "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; "khotkeysrc"."Data_1"."DataCount" = 1; @@ -809,6 +802,7 @@ "khotkeysrc"."Icons"."Theme[$d]" = ""; "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; + "khotkeysrc"."KDE"."ShowDeleteCommand[$d]" = ""; "khotkeysrc"."KDE"."SingleClick[$d]" = ""; "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; @@ -848,6 +842,19 @@ "krunnerrc"."Plugins"."locationsEnabled" = true; "krunnerrc"."Plugins"."placesEnabled" = true; "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; + "kservicemenurc"."Show"."compressfileitemaction" = true; + "kservicemenurc"."Show"."extractfileitemaction" = true; + "kservicemenurc"."Show"."forgetfileitemaction" = true; + "kservicemenurc"."Show"."installFont" = true; + "kservicemenurc"."Show"."kactivitymanagerd_fileitem_linking_plugin" = true; + "kservicemenurc"."Show"."kdeconnectfileitemaction" = true; + "kservicemenurc"."Show"."kio-admin" = true; + "kservicemenurc"."Show"."mountisoaction" = true; + "kservicemenurc"."Show"."nextclouddolphinactionplugin" = true; + "kservicemenurc"."Show"."runInKonsole" = true; + "kservicemenurc"."Show"."setAsWallpaper" = true; + "kservicemenurc"."Show"."slideshowfileitemaction" = true; + "kservicemenurc"."Show"."tagsfileitemaction" = true; "kwalletrc"."Wallet"."First Use" = false; "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; @@ -855,15 +862,20 @@ "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; "kwinrc"."Desktops"."Number" = 4; "kwinrc"."Desktops"."Rows" = 2; + "kwinrc"."Effect-diminactive"."Strength" = 15; + "kwinrc"."Effect-magiclamp"."AnimationDuration" = 20; "kwinrc"."NightColor"."Active" = true; "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; "kwinrc"."NightColor"."LongitudeFixed" = 5.44; "kwinrc"."NightColor"."Mode" = "Location"; "kwinrc"."NightColor"."NightTemperature" = 1400; + "kwinrc"."Plugins"."diminactiveEnabled" = true; + "kwinrc"."Plugins"."dimscreenEnabled" = true; "kwinrc"."Plugins"."wobblywindowsEnabled" = true; "kwinrc"."Tiling"."padding" = 4; "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}],\"width\":1}]}"; "kwinrc"."Xwayland"."Scale" = 1; "kxkbrc"."Layout"."Options" = "compose:caps"; "kxkbrc"."Layout"."ResetOldOptions" = true; From 07538ad9cc3784705edd2b83568ee9a212af62da Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 11 Mar 2024 18:23:54 +0100 Subject: [PATCH 1429/2308] Refactor to re-use plasma desktop config --- home-manager/desktop/default.nix | 1 + .../plasma-desktop/default.nix | 0 home-manager/hosts/EDI/lillian.nix | 1 - home-manager/hosts/GLaDOS/lillian.nix | 1 - .../plasma-desktop/default.nix | 879 ------------------ home-manager/hosts/shodan/lillian.nix | 1 + 6 files changed, 2 insertions(+), 881 deletions(-) rename home-manager/{hosts/EDI/package-configs => desktop}/plasma-desktop/default.nix (100%) delete mode 100644 home-manager/hosts/GLaDOS/package-configs/plasma-desktop/default.nix diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index c331ba1..a3d69cc 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -17,6 +17,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../package-configs/zsh.nix + ./plasma-desktop ]; nixpkgs = { # You can add overlays here diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix b/home-manager/desktop/plasma-desktop/default.nix similarity index 100% rename from home-manager/hosts/EDI/package-configs/plasma-desktop/default.nix rename to home-manager/desktop/plasma-desktop/default.nix diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 56283bb..d6a4544 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -19,7 +19,6 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop - ./package-configs/plasma-desktop ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 58eac07..69d5be2 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -19,7 +19,6 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop - ./package-configs/plasma-desktop ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/default.nix b/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/default.nix deleted file mode 100644 index a193e98..0000000 --- a/home-manager/hosts/GLaDOS/package-configs/plasma-desktop/default.nix +++ /dev/null @@ -1,879 +0,0 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { - programs.plasma = { - enable = true; - shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; - "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; - "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; - "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; - "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; - "kded5"."Show System Activity" = "Ctrl+Esc"; - "kded5"."display" = ["Display" "Meta+P"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; - "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; - "kmix"."decrease_volume" = "Volume Down"; - "kmix"."increase_microphone_volume" = "Microphone Volume Up"; - "kmix"."increase_volume" = "Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; - "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = []; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; - "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = []; - "ksmserver"."Reboot Without Confirmation" = []; - "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Decrease Opacity" = []; - "kwin"."Edit Tiles" = "Meta+T"; - "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; - "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = []; - "kwin"."Increase Opacity" = []; - "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = []; - "kwin"."MoveMouseToCenter" = "Meta+F6"; - "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = []; - "kwin"."MoveZoomLeft" = []; - "kwin"."MoveZoomRight" = []; - "kwin"."MoveZoomUp" = []; - "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = []; - "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12"; - "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; - "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; - "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; - "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; - "kwin"."Switch Window Down" = "Meta+Alt+Down"; - "kwin"."Switch Window Left" = "Meta+Alt+Left"; - "kwin"."Switch Window Right" = "Meta+Alt+Right"; - "kwin"."Switch Window Up" = "Meta+Alt+Up"; - "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = []; - "kwin"."Switch to Desktop 11" = []; - "kwin"."Switch to Desktop 12" = []; - "kwin"."Switch to Desktop 13" = []; - "kwin"."Switch to Desktop 14" = []; - "kwin"."Switch to Desktop 15" = []; - "kwin"."Switch to Desktop 16" = []; - "kwin"."Switch to Desktop 17" = []; - "kwin"."Switch to Desktop 18" = []; - "kwin"."Switch to Desktop 19" = []; - "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = []; - "kwin"."Switch to Desktop 3" = "Ctrl+F3"; - "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = []; - "kwin"."Switch to Desktop 6" = []; - "kwin"."Switch to Desktop 7" = []; - "kwin"."Switch to Desktop 8" = []; - "kwin"."Switch to Desktop 9" = []; - "kwin"."Switch to Next Desktop" = []; - "kwin"."Switch to Next Screen" = []; - "kwin"."Switch to Previous Desktop" = []; - "kwin"."Switch to Previous Screen" = []; - "kwin"."Switch to Screen 0" = []; - "kwin"."Switch to Screen 1" = []; - "kwin"."Switch to Screen 2" = []; - "kwin"."Switch to Screen 3" = []; - "kwin"."Switch to Screen 4" = []; - "kwin"."Switch to Screen 5" = []; - "kwin"."Switch to Screen 6" = []; - "kwin"."Switch to Screen 7" = []; - "kwin"."Switch to Screen Above" = []; - "kwin"."Switch to Screen Below" = []; - "kwin"."Switch to Screen to the Left" = []; - "kwin"."Switch to Screen to the Right" = []; - "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = []; - "kwin"."Walk Through Desktop List" = []; - "kwin"."Walk Through Desktop List (Reverse)" = []; - "kwin"."Walk Through Desktops" = []; - "kwin"."Walk Through Desktops (Reverse)" = []; - "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = []; - "kwin"."Walk Through Windows Alternative (Reverse)" = []; - "kwin"."Walk Through Windows of Current Application" = "Alt+`"; - "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = []; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; - "kwin"."Window Above Other Windows" = []; - "kwin"."Window Below Other Windows" = []; - "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = []; - "kwin"."Window Grow Horizontal" = []; - "kwin"."Window Grow Vertical" = []; - "kwin"."Window Lower" = []; - "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = []; - "kwin"."Window Maximize Vertical" = []; - "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = []; - "kwin"."Window Move Center" = []; - "kwin"."Window No Border" = []; - "kwin"."Window On All Desktops" = []; - "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; - "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; - "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; - "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = []; - "kwin"."Window One Screen Up" = []; - "kwin"."Window One Screen to the Left" = []; - "kwin"."Window One Screen to the Right" = []; - "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = []; - "kwin"."Window Pack Left" = []; - "kwin"."Window Pack Right" = []; - "kwin"."Window Pack Up" = []; - "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = []; - "kwin"."Window Quick Tile Bottom Right" = []; - "kwin"."Window Quick Tile Left" = "Meta+Left"; - "kwin"."Window Quick Tile Right" = "Meta+Right"; - "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = []; - "kwin"."Window Quick Tile Top Right" = []; - "kwin"."Window Raise" = []; - "kwin"."Window Resize" = []; - "kwin"."Window Shade" = []; - "kwin"."Window Shrink Horizontal" = []; - "kwin"."Window Shrink Vertical" = []; - "kwin"."Window to Desktop 1" = []; - "kwin"."Window to Desktop 10" = []; - "kwin"."Window to Desktop 11" = []; - "kwin"."Window to Desktop 12" = []; - "kwin"."Window to Desktop 13" = []; - "kwin"."Window to Desktop 14" = []; - "kwin"."Window to Desktop 15" = []; - "kwin"."Window to Desktop 16" = []; - "kwin"."Window to Desktop 17" = []; - "kwin"."Window to Desktop 18" = []; - "kwin"."Window to Desktop 19" = []; - "kwin"."Window to Desktop 2" = []; - "kwin"."Window to Desktop 20" = []; - "kwin"."Window to Desktop 3" = []; - "kwin"."Window to Desktop 4" = []; - "kwin"."Window to Desktop 5" = []; - "kwin"."Window to Desktop 6" = []; - "kwin"."Window to Desktop 7" = []; - "kwin"."Window to Desktop 8" = []; - "kwin"."Window to Desktop 9" = []; - "kwin"."Window to Next Desktop" = []; - "kwin"."Window to Next Screen" = []; - "kwin"."Window to Previous Desktop" = []; - "kwin"."Window to Previous Screen" = []; - "kwin"."Window to Screen 0" = []; - "kwin"."Window to Screen 1" = []; - "kwin"."Window to Screen 2" = []; - "kwin"."Window to Screen 3" = []; - "kwin"."Window to Screen 4" = []; - "kwin"."Window to Screen 5" = []; - "kwin"."Window to Screen 6" = []; - "kwin"."Window to Screen 7" = []; - "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; - "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = []; - "mediacontrol"."mediavolumeup" = []; - "mediacontrol"."nextmedia" = "Media Next"; - "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = []; - "mediacontrol"."playpausemedia" = "Media Play"; - "mediacontrol"."previousmedia" = "Media Previous"; - "mediacontrol"."stopmedia" = "Media Stop"; - "org.kde.dolphin.desktop"."_launch" = "Meta+E"; - "org.kde.kcalc.desktop"."_launch" = "Launch (1)"; - "org.kde.konsole.desktop"."NewTab" = []; - "org.kde.konsole.desktop"."NewWindow" = []; - "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; - "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; - "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search"]; - "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; - "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; - "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; - "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; - "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; - "org.kde.spectacle.desktop"."_launch" = "Print"; - "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; - "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; - "org_kde_powerdevil"."Hibernate" = "Hibernate"; - "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; - "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; - "org_kde_powerdevil"."PowerDown" = "Power Down"; - "org_kde_powerdevil"."PowerOff" = "Power Off"; - "org_kde_powerdevil"."Sleep" = "Sleep"; - "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = []; - "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = []; - "plasmashell"."activate task manager entry 2" = "Meta+2"; - "plasmashell"."activate task manager entry 3" = "Meta+3"; - "plasmashell"."activate task manager entry 4" = "Meta+4"; - "plasmashell"."activate task manager entry 5" = "Meta+5"; - "plasmashell"."activate task manager entry 6" = "Meta+6"; - "plasmashell"."activate task manager entry 7" = "Meta+7"; - "plasmashell"."activate task manager entry 8" = "Meta+8"; - "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = []; - "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; - "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = []; - "plasmashell"."cyclePrevAction" = []; - "plasmashell"."edit_clipboard" = []; - "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = "Meta+Tab"; - "plasmashell"."previous activity" = "Meta+Shift+Tab"; - "plasmashell"."repeat_action" = "Meta+Ctrl+R"; - "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = []; - "plasmashell"."show-on-mouse-pos" = "Meta+V"; - "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = []; - "plasmashell"."switch to previous activity" = []; - "plasmashell"."toggle do not disturb" = []; - "systemsettings.desktop"."_launch" = "Tools"; - "systemsettings.desktop"."kcm-kscreen" = []; - "systemsettings.desktop"."kcm-lookandfeel" = []; - "systemsettings.desktop"."kcm-users" = []; - "systemsettings.desktop"."powerdevilprofilesconfig" = []; - "systemsettings.desktop"."screenlocker" = []; - }; - configFile = { - "baloofilerc"."General"."dbVersion" = 2; - "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; - "baloofilerc"."General"."exclude filters version" = 8; - "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; - "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; - "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; - "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; - "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; - "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; - "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; - "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; - "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; - "kded5rc"."Module-browserintegrationreminder"."autoload" = false; - "kded5rc"."Module-device_automounter"."autoload" = false; - "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; - "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; - "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; - "kdeglobals"."KDE"."SingleClick" = false; - "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; - "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; - "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; - "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; - "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; - "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; - "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; - "kdeglobals"."KFileDialog Settings"."Show Preview" = false; - "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; - "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; - "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; - "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; - "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; - "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; - "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; - "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; - "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; - "kdeglobals"."WM"."activeBackground" = "49,54,59"; - "kdeglobals"."WM"."activeBlend" = "252,252,252"; - "kdeglobals"."WM"."activeForeground" = "252,252,252"; - "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; - "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; - "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; - "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; - "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; - "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; - "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; - "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; - "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; - "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; - "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; - "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; - "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; - "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; - "kglobalshortcutsrc"."org.kde.kcalc.desktop"."_k_friendly_name" = "KCalc"; - "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; - "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; - "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Emoji Selector"; - "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; - "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Power Management"; - "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; - "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "System Settings"; - "khotkeysrc"."Data"."DataCount" = 3; - "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; - "khotkeysrc"."Data_1"."DataCount" = 1; - "khotkeysrc"."Data_1"."Enabled" = true; - "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; - "khotkeysrc"."Data_1"."SystemGroup" = 1; - "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1"."Comment" = "Comment"; - "khotkeysrc"."Data_1_1"."Enabled" = true; - "khotkeysrc"."Data_1_1"."Name" = "Search"; - "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; - "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; - "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; - "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; - "khotkeysrc"."Data_2"."DataCount" = 8; - "khotkeysrc"."Data_2"."Enabled" = false; - "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; - "khotkeysrc"."Data_2"."Name" = "Examples"; - "khotkeysrc"."Data_2"."SystemGroup" = 0; - "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; - "khotkeysrc"."Data_2_1"."Enabled" = false; - "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; - "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; - "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; - "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; - "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; - "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; - "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; - "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; - "khotkeysrc"."Data_2_2"."Enabled" = false; - "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; - "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; - "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; - "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; - "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; - "khotkeysrc"."Data_2_3"."Enabled" = false; - "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; - "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; - "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; - "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; - "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; - "khotkeysrc"."Data_2_4"."Enabled" = false; - "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; - "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; - "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; - "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; - "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; - "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; - "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; - "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; - "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; - "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; - "khotkeysrc"."Data_2_5"."Enabled" = false; - "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; - "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; - "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; - "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; - "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; - "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; - "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; - "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; - "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; - "khotkeysrc"."Data_2_6"."Enabled" = false; - "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; - "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; - "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; - "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; - "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; - "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; - "khotkeysrc"."Data_2_7"."DataCount" = 4; - "khotkeysrc"."Data_2_7"."Enabled" = false; - "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; - "khotkeysrc"."Data_2_7"."SystemGroup" = 0; - "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_7_1"."Comment" = ""; - "khotkeysrc"."Data_2_7_1"."Enabled" = false; - "khotkeysrc"."Data_2_7_1"."Name" = "Back"; - "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2"."Comment" = ""; - "khotkeysrc"."Data_2_7_2"."Enabled" = false; - "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; - "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3"."Comment" = ""; - "khotkeysrc"."Data_2_7_3"."Enabled" = false; - "khotkeysrc"."Data_2_7_3"."Name" = "Up"; - "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4"."Comment" = ""; - "khotkeysrc"."Data_2_7_4"."Enabled" = false; - "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; - "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; - "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; - "khotkeysrc"."Data_2_8"."Enabled" = false; - "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; - "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; - "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; - "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; - "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; - "khotkeysrc"."Data_3"."DataCount" = 14; - "khotkeysrc"."Data_3"."Enabled" = true; - "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; - "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; - "khotkeysrc"."Data_3"."SystemGroup" = 0; - "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; - "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; - "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; - "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; - "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; - "khotkeysrc"."Data_3_1"."Enabled" = true; - "khotkeysrc"."Data_3_1"."Name" = "Back"; - "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; - "khotkeysrc"."Data_3_10"."Enabled" = false; - "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; - "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; - "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; - "khotkeysrc"."Data_3_11"."Enabled" = true; - "khotkeysrc"."Data_3_11"."Name" = "Up"; - "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; - "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; - "khotkeysrc"."Data_3_12"."Enabled" = false; - "khotkeysrc"."Data_3_12"."Name" = "Up #2"; - "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; - "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; - "khotkeysrc"."Data_3_13"."Enabled" = true; - "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; - "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; - "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; - "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; - "khotkeysrc"."Data_3_14"."Enabled" = true; - "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; - "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; - "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; - "khotkeysrc"."Data_3_2"."Enabled" = true; - "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; - "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; - "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; - "khotkeysrc"."Data_3_3"."Enabled" = true; - "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; - "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; - "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; - "khotkeysrc"."Data_3_4"."Enabled" = true; - "khotkeysrc"."Data_3_4"."Name" = "Forward"; - "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; - "khotkeysrc"."Data_3_5"."Enabled" = true; - "khotkeysrc"."Data_3_5"."Name" = "Home"; - "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; - "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; - "khotkeysrc"."Data_3_6"."Enabled" = true; - "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; - "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; - "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; - "khotkeysrc"."Data_3_7"."Enabled" = true; - "khotkeysrc"."Data_3_7"."Name" = "New Tab"; - "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; - "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; - "khotkeysrc"."Data_3_8"."Enabled" = true; - "khotkeysrc"."Data_3_8"."Name" = "New Window"; - "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; - "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; - "khotkeysrc"."Data_3_9"."Enabled" = true; - "khotkeysrc"."Data_3_9"."Name" = "Reload"; - "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; - "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."General"."BrowserApplication[$d]" = ""; - "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; - "khotkeysrc"."General"."ColorScheme[$d]" = ""; - "khotkeysrc"."Gestures"."Disabled" = true; - "khotkeysrc"."Gestures"."MouseButton" = 2; - "khotkeysrc"."Gestures"."Timeout" = 300; - "khotkeysrc"."GesturesExclude"."Comment" = ""; - "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; - "khotkeysrc"."Icons"."Theme[$d]" = ""; - "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; - "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; - "khotkeysrc"."KDE"."SingleClick[$d]" = ""; - "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; - "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; - "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; - "khotkeysrc"."Main"."Disabled" = false; - "khotkeysrc"."Voice"."Shortcut" = ""; - "khotkeysrc"."WM"."activeBackground[$d]" = ""; - "khotkeysrc"."WM"."activeBlend[$d]" = ""; - "khotkeysrc"."WM"."activeForeground[$d]" = ""; - "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; - "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; - "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; - "kiorc"."Confirmations"."ConfirmDelete" = true; - "krunnerrc"."Plugins"."baloosearchEnabled" = false; - "krunnerrc"."Plugins"."locationsEnabled" = true; - "krunnerrc"."Plugins"."placesEnabled" = true; - "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; - "kwalletrc"."Wallet"."First Use" = false; - "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; - "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; - "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; - "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; - "kwinrc"."Desktops"."Number" = 4; - "kwinrc"."Desktops"."Rows" = 2; - "kwinrc"."NightColor"."Active" = true; - "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; - "kwinrc"."NightColor"."LongitudeFixed" = 5.44; - "kwinrc"."NightColor"."Mode" = "Location"; - "kwinrc"."NightColor"."NightTemperature" = 1400; - "kwinrc"."Plugins"."wobblywindowsEnabled" = true; - "kwinrc"."Tiling"."padding" = 4; - "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Xwayland"."Scale" = 1; - "kxkbrc"."Layout"."Options" = "compose:caps"; - "kxkbrc"."Layout"."ResetOldOptions" = true; - "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; - "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; - "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; - }; - }; -} diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index edfa5fc..f6195fb 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../package-configs/zsh.nix + ../../desktop/plasma-desktop ]; nixpkgs = { # You can add overlays here From 5340149ac98494e9f4e9eed0c283c3f46e797ae9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 00:13:11 +0100 Subject: [PATCH 1430/2308] Small plasma update --- home-manager/desktop/plasma-desktop/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home-manager/desktop/plasma-desktop/default.nix b/home-manager/desktop/plasma-desktop/default.nix index 26509cf..36bbc83 100644 --- a/home-manager/desktop/plasma-desktop/default.nix +++ b/home-manager/desktop/plasma-desktop/default.nix @@ -241,6 +241,15 @@ "services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; "services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services.org.kde.spectacle.desktop"."_launch" = "Print"; + "services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "Meta+Print" "Ctrl+!"]; + "services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "Ctrl+$" "Shift+Print"]; + "services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services.services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "Ctrl+@" "Meta+Shift+Print"]; + "services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "Meta+Ctrl+Print" "Ctrl+%"]; + "services.services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { "baloofilerc"."General"."dbVersion" = 2; From e3c857427aed61a96560932d8a21d6d3cd652efd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 10:55:32 +0100 Subject: [PATCH 1431/2308] Add simple editor command for vscodium --- home-manager/package-configs/zsh.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index bacb53e..6b570fb 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -19,6 +19,7 @@ enable = true; shellAliases = { cd = "z"; + code = "codium ./"; }; plugins = [ { From 08cc0a0b5c30827b010935ee85ca81425bbaad06 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 13:06:13 +0100 Subject: [PATCH 1432/2308] Remove conflicting keybind between helix and plasma --- home-manager/desktop/plasma-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/plasma-desktop/default.nix b/home-manager/desktop/plasma-desktop/default.nix index 36bbc83..fa8a52d 100644 --- a/home-manager/desktop/plasma-desktop/default.nix +++ b/home-manager/desktop/plasma-desktop/default.nix @@ -104,7 +104,7 @@ "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; "kwin"."Walk Through Windows Alternative" = []; "kwin"."Walk Through Windows Alternative (Reverse)" = []; - "kwin"."Walk Through Windows of Current Application" = "Alt+`"; + "kwin"."Walk Through Windows of Current Application" = []; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; "kwin"."Walk Through Windows of Current Application Alternative" = []; "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; From 50f21e221a92d26420aaba3eaeb17f49f435b5b5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 14:03:56 +0100 Subject: [PATCH 1433/2308] Add ls -lah alias "lh" --- home-manager/package-configs/zsh.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index 6b570fb..f29743f 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -20,6 +20,7 @@ shellAliases = { cd = "z"; code = "codium ./"; + lh = "ls -lah"; }; plugins = [ { From 74eb3db41ac5e85207ac0c9dad30bb615f2e5a18 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 14:42:33 +0100 Subject: [PATCH 1434/2308] Add update and upgrade commands --- pkgs/update/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/upgrade/default.nix | 17 +++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/update/default.nix create mode 100644 pkgs/upgrade/default.nix diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix new file mode 100644 index 0000000..dd7dc4e --- /dev/null +++ b/pkgs/update/default.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenv, + writeShellApplication, +}: +writeShellApplication +{ + name = "update"; + + runtimeInputs = []; + + text = '' + # A script to update the flake lock for NixOS + set -e + pushd /tmp > /dev/null + rm -rf ./update + git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./update + pushd ./update > /dev/null + echo "Updating flake lock..." + nix flake update + git commit -m "update flake lock" + git push + popd > /dev/null + echo "Cleaning up repository in '/tmp/update'..." + rm -rf ./update + popd > /dev/null + echo "Flake lock update OK!" + ''; +} diff --git a/pkgs/upgrade/default.nix b/pkgs/upgrade/default.nix new file mode 100644 index 0000000..c1e91b0 --- /dev/null +++ b/pkgs/upgrade/default.nix @@ -0,0 +1,17 @@ +{ + lib, + stdenv, + writeShellApplication, +}: +writeShellApplication +{ + name = "rebuild"; + + runtimeInputs = []; + + text = '' + # An upgrade script for nixos + sudo systemd-inhibit --who="NixOS Updater" --why="Updating flake lock" update + sudo systemd-inhibit --who="NixOS Updater" --why="Updating system configuration" rebuild-no-inhibit + ''; +} From 33f65f99c897c9f55e275d35ad3e5554a46f9fdf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 14:44:33 +0100 Subject: [PATCH 1435/2308] Add definitions for the commands too --- nixos/shared/packages/default.nix | 2 ++ pkgs/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index e6c3641..f3d6767 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -20,6 +20,8 @@ rebuild rebuild-no-inhibit install-nix + update + upgrade # System tools age diff --git a/pkgs/default.nix b/pkgs/default.nix index ce69279..6de28e2 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,4 +8,6 @@ pkgs: { rebuild = pkgs.callPackage ./rebuild {}; install-nix-no-inhibit = pkgs.callPackage ./install-nix-no-inhibit {}; install-nix = pkgs.callPackage ./install-nix {}; + update = pkgs.callPackage ./update {}; + upgrade = pkgs.callPackage ./upgrade {}; } From c976348db46448c9352d1e0d5e2dfdb37b041a7f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 14:48:03 +0100 Subject: [PATCH 1436/2308] Should probably name it upgrade in the file too --- pkgs/upgrade/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/upgrade/default.nix b/pkgs/upgrade/default.nix index c1e91b0..0b1ff11 100644 --- a/pkgs/upgrade/default.nix +++ b/pkgs/upgrade/default.nix @@ -5,7 +5,7 @@ }: writeShellApplication { - name = "rebuild"; + name = "upgrade"; runtimeInputs = []; From ab9f4698e149eb719257220478efb50233a610b5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 14:50:19 +0100 Subject: [PATCH 1437/2308] Stage the flake lock --- pkgs/update/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix index dd7dc4e..e14aa78 100644 --- a/pkgs/update/default.nix +++ b/pkgs/update/default.nix @@ -18,6 +18,7 @@ writeShellApplication pushd ./update > /dev/null echo "Updating flake lock..." nix flake update + git add flake.lock git commit -m "update flake lock" git push popd > /dev/null From 1314cc6bd5419700652745d609979df4a02fd45f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 14:53:54 +0100 Subject: [PATCH 1438/2308] Use ssh for update's git repo --- pkgs/update/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix index e14aa78..3d856b9 100644 --- a/pkgs/update/default.nix +++ b/pkgs/update/default.nix @@ -14,7 +14,7 @@ writeShellApplication set -e pushd /tmp > /dev/null rm -rf ./update - git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./update + git clone forgejo@git.lillianviolet.dev:Lillian-Violet/NixOS-Config.git ./update pushd ./update > /dev/null echo "Updating flake lock..." nix flake update From 541a3770994c15984f2f396f8e45edcbf0e49178 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 14:57:12 +0100 Subject: [PATCH 1439/2308] update flake lock --- flake.lock | 108 ++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 24d7f39..bf8a18e 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1709485267, - "narHash": "sha256-bunOdYTK9YNiy+u0D6YN8q40oAeHoQ+9EgoatF3InJ8=", + "lastModified": 1710003968, + "narHash": "sha256-g8+K+mLiNG5uch35Oy9oDQBAmGSkCcqrd0Jjme7xiG0=", "owner": "ipetkov", "repo": "crane", - "rev": "e4a71521a8eafc07524c55326ecc4ea942b06e25", + "rev": "10484f86201bb94bd61ecc5335b1496794fedb78", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1709773529, - "narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=", + "lastModified": 1710169806, + "narHash": "sha256-HeWFrRuHpnAiPmIr26OKl2g142HuGerwoO/XtW53pcI=", "owner": "nix-community", "repo": "disko", - "rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b", + "rev": "fe064a639319ed61cdf12b8f6eded9523abcc498", "type": "github" }, "original": { @@ -150,11 +150,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1709764752, - "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=", + "lastModified": 1710164657, + "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "cf111d1a849ddfc38e9155be029519b0e2329615", + "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1709744297, - "narHash": "sha256-Q2LOs08hmFlzJdJMN4yNrWvZTegfpHEajLin0vcw7t0=", + "lastModified": 1710025765, + "narHash": "sha256-CnNH3E1xB/xfif+KotTfvSGLLqOZ0OvUcUrDsFMwN6Q=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f8e3302ee1e0ccaabc443f45dc415e117b54926f", + "rev": "2e8c168044e86ee1344c18bde5caeffe205292f2", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709641033, - "narHash": "sha256-Eegyvq56NiXgrDrZ6FgE1lNCD2Mi6aLY/HFOeVG8ZtI=", + "lastModified": 1710171982, + "narHash": "sha256-WFMB+Yohcvego1/vOtaq+MJ8Wvp5meOANfNifg26Ie4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3881267e84cc966ded48601390e88fc13d960319", + "rev": "19ad7fd5724f30868748b8156ff25be838cd2bc5", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1709887845, - "narHash": "sha256-803UIoB8+vGkm/VK/g55aBAAOf/ncTGvxXyjTF4ydm0=", + "lastModified": 1710164763, + "narHash": "sha256-6p7yebSjzrL8qK4Q0gx2RnsxaudGUQcgkSxFG/J265Y=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "bef32a05496d9480b02be586fa7827748b9e597b", + "rev": "1d9c8cd24eba7942955f92fdcefba5a6a7543bc6", "type": "github" }, "original": { @@ -347,11 +347,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1709410583, - "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", + "lastModified": 1710123225, + "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", + "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", "type": "github" }, "original": { @@ -363,11 +363,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709780214, - "narHash": "sha256-p4iDKdveHMhfGAlpxmkCtfQO3WRzmlD11aIcThwPqhk=", + "lastModified": 1710222005, + "narHash": "sha256-irXySffHz7b82dZIme6peyAu+8tTJr1zyxcfUPhqUrg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f945939fd679284d736112d3d5410eb867f3b31c", + "rev": "9a9a7552431c4f1a3b2eee9398641babf7c30d0e", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1709428628, - "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=", + "lastModified": 1710033658, + "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555", + "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709455474, - "narHash": "sha256-UzfJcBjXUySRokQiI8QQZp/Xpneiu7A5iaLGU09NiQ0=", + "lastModified": 1710078301, + "narHash": "sha256-BQ3v+XPPz5dLiw2AqUEga++yfKRhqJANUqzqNL518pk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "768bb879887ae70e62d7628c82d825bbbf873b4b", + "rev": "73d699a6ff1e83df3fd6c1e60931e13667b8ae14", "type": "github" }, "original": { @@ -489,11 +489,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -520,11 +520,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1709356872, - "narHash": "sha256-mvxCirJbtkP0cZ6ABdwcgTk0u3bgLoIoEFIoYBvD6+4=", + "lastModified": 1709968316, + "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "458b097d81f90275b3fdf03796f0563844926708", + "rev": "0e7f98a5f30166cbed344569426850b21e4091d4", "type": "github" }, "original": { @@ -570,11 +570,11 @@ ] }, "locked": { - "lastModified": 1709634318, - "narHash": "sha256-4jZRGyPYShyLocUnE0kqDoitqxqBCkuJ6w6/QX4bjYk=", + "lastModified": 1709982472, + "narHash": "sha256-cMPHIV7yWbve+nwiQDhVt7BBkxrGTLzSTAslv7u6HZo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "9bac5925cf7716979535eed9c88e307fa9744169", + "rev": "26acf8f5880ae7d6e5de4ca953c8ad161b7903eb", "type": "github" }, "original": { @@ -645,11 +645,11 @@ ] }, "locked": { - "lastModified": 1709431943, - "narHash": "sha256-CqTcEJGITB3rfSuAcWC1QZnbVnIipXmIDbZHfxsAy80=", + "lastModified": 1710036830, + "narHash": "sha256-pnV4gO3N/7/GzyRSKTRlSfS/19KJiPSvYcL4apnSkoQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "362184acf4a991f27fc222864e94a2e81b3c3c9f", + "rev": "d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c", "type": "github" }, "original": { @@ -668,11 +668,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1706742486, - "narHash": "sha256-sv/MISTeD0rqeVivpZJpynboMWJp6i62OmrZX1rGl38=", + "lastModified": 1709905972, + "narHash": "sha256-18OF2/ypr0n4Lp6Fk5SLHPu12ok6jM+Hv3sC0PCim0Q=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "9e36323ae3dde787f761420465c3ae560f3dbf29", + "rev": "572c1b4d69deea1093ac231c37927cfa8ccad477", "type": "gitlab" }, "original": { @@ -688,11 +688,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1709711091, - "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", + "lastModified": 1710195194, + "narHash": "sha256-KFxCJp0T6TJOz1IOKlpRdpsCr9xsvlVuWY/VCiAFnTE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", + "rev": "e52d8117b330f690382f1d16d81ae43daeb4b880", "type": "github" }, "original": { From c236a32fe4b3d742c9956f5edde2cea6d42725bf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 14:57:59 +0100 Subject: [PATCH 1440/2308] Cannot update with sudo since it doesn't have the ssh key --- pkgs/upgrade/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/upgrade/default.nix b/pkgs/upgrade/default.nix index 0b1ff11..d72c480 100644 --- a/pkgs/upgrade/default.nix +++ b/pkgs/upgrade/default.nix @@ -11,7 +11,7 @@ writeShellApplication text = '' # An upgrade script for nixos - sudo systemd-inhibit --who="NixOS Updater" --why="Updating flake lock" update + update sudo systemd-inhibit --who="NixOS Updater" --why="Updating system configuration" rebuild-no-inhibit ''; } From 1dd60befa3c9dccab3d79c786cc69d646e5bbcf4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Mar 2024 15:06:07 +0100 Subject: [PATCH 1441/2308] gimp-with-plugins won't build, let's just do GNU imp --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index a3d69cc..e9e49b3 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -71,7 +71,7 @@ # Office applications: onlyoffice-bin teams-for-linux - gimp-with-plugins + gimp thunderbird # System tools: From 36f8e47edf214dd9cf94ecec458558aa66e1460a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 13 Mar 2024 18:23:29 +0100 Subject: [PATCH 1442/2308] update flake lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index bf8a18e..5b66d47 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1710169806, - "narHash": "sha256-HeWFrRuHpnAiPmIr26OKl2g142HuGerwoO/XtW53pcI=", + "lastModified": 1710332572, + "narHash": "sha256-7JYT5Qya6QuM2szCrdVcNghoz7ar+ClzaqKJ4cfJaKQ=", "owner": "nix-community", "repo": "disko", - "rev": "fe064a639319ed61cdf12b8f6eded9523abcc498", + "rev": "59e50d4ecbac78701c2f9950ff2b886ac66741ce", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1710164657, - "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", + "lastModified": 1710349883, + "narHash": "sha256-bjbdS2mC76xNJwt1d/uZa+JdHR8CCyYbF4Ey/NgOJus=", "owner": "nix-community", "repo": "home-manager", - "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", + "rev": "2f0db7d418e781354d8a3c50e611e3b1cd413087", "type": "github" }, "original": { @@ -363,11 +363,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710222005, - "narHash": "sha256-irXySffHz7b82dZIme6peyAu+8tTJr1zyxcfUPhqUrg=", + "lastModified": 1710313540, + "narHash": "sha256-HtTTpGe0azsEJVaT9RvbGFGB4idUneraLiUTxFb3ABM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a9a7552431c4f1a3b2eee9398641babf7c30d0e", + "rev": "4008381882569ab4773f2ba0d7b7bbde8f665672", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -489,11 +489,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { From 2b4bab9bba1bd271207534583f5beeae0bf77600 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 13 Mar 2024 18:33:01 +0100 Subject: [PATCH 1443/2308] Build message said this was renamed to services.desktopManager.plasma6.enable --- nixos/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 90d79d9..3107469 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -88,7 +88,7 @@ # Enable the KDE Plasma Desktop Environment. services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma6.enable = true; + services.desktopManager.plasma6.enable = true; services.xserver.displayManager.defaultSession = "plasma"; programs.kdeconnect.enable = true; From 5dfaf78aae77283f1f0e49b16a9ea8a790d129e4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 13 Mar 2024 18:37:18 +0100 Subject: [PATCH 1444/2308] This seems to fail the build, disable the virtual cam for now, fix later --- nixos/desktop/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 3107469..a46f6c5 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -139,13 +139,14 @@ security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables users.users.lillian.extraGroups = ["tss"]; # tss group has access to TPM devices + # FIXME: re-enable virtual camera loopback when it build again. boot.bootspec.enable = true; boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; boot.supportedFilesystems = ["bcachefs"]; - boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; + # boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; boot.kernelModules = [ # Virtual Camera - "v4l2loopback" + # "v4l2loopback" # Virtual Microphone, built-in "snd-aloop" ]; @@ -154,7 +155,7 @@ # exclusive_caps: Skype, Zoom, Teams etc. will only show device when actually streaming # card_label: Name of virtual camera, how it'll show up in Skype, Zoom, Teams # https://github.com/umlaeute/v4l2loopback - options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" + # options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" ''; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; From 5a363e94917bd4a8385e0616147cf1bbaf2fba75 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 13:50:43 +0100 Subject: [PATCH 1445/2308] Update conduit, flake lock, and fix all build errors --- flake.lock | 344 +++++++++++++++--- flake.nix | 33 +- .../desktop/plasma-desktop/default.nix | 7 + home-manager/hosts/shodan/lillian.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- nixos/server/package-configs/conduit/copy.nix | 165 --------- .../package-configs/conduit/default.nix | 140 ++++++- 7 files changed, 455 insertions(+), 238 deletions(-) delete mode 100644 nixos/server/package-configs/conduit/copy.nix diff --git a/flake.lock b/flake.lock index 5b66d47..97f202f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "attic": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1707922053, + "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", + "type": "github" + } + }, "blobs": { "flake": false, "locked": { @@ -16,7 +39,77 @@ "type": "gitlab" } }, + "conduit": { + "inputs": { + "attic": "attic", + "crane": "crane_2", + "fenix": "fenix", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710090208, + "narHash": "sha256-1W7yDW+kqCr/9SygZwygBayE8HwLnzJq48fMAOZQLAY=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "e888a0a745ac979abe6a687ff24b8c5e7b7b79ed", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" + } + }, "crane": { + "inputs": { + "nixpkgs": [ + "conduit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1702918879, + "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "owner": "ipetkov", + "repo": "crane", + "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "inputs": { + "nixpkgs": [ + "conduit", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707685877, + "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", + "owner": "ipetkov", + "repo": "crane", + "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", + "type": "github" + } + }, + "crane_3": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -44,11 +137,11 @@ ] }, "locked": { - "lastModified": 1710332572, - "narHash": "sha256-7JYT5Qya6QuM2szCrdVcNghoz7ar+ClzaqKJ4cfJaKQ=", + "lastModified": 1710379155, + "narHash": "sha256-zdHEsOOnfBTO1ymL6gd9etR+iNS6HowbJM4Llqxy+Uc=", "owner": "nix-community", "repo": "disko", - "rev": "59e50d4ecbac78701c2f9950ff2b886ac66741ce", + "rev": "cc69c2340b59e290982ec7e6238471d470c839d0", "type": "github" }, "original": { @@ -60,7 +153,7 @@ "extest": { "inputs": { "extest": "extest_2", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1706332837, @@ -92,7 +185,45 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "conduit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1709619709, + "narHash": "sha256-l6EPVJfwfelWST7qWQeP6t/TDK3HHv5uUB1b2vw4mOQ=", + "owner": "nix-community", + "repo": "fenix", + "rev": "c8943ea9e98d41325ff57d4ec14736d330b321b2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -108,7 +239,23 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1668681692, @@ -146,9 +293,42 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -163,9 +343,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_4": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1709126324, @@ -210,11 +390,11 @@ ] }, "locked": { - "lastModified": 1710349883, - "narHash": "sha256-bjbdS2mC76xNJwt1d/uZa+JdHR8CCyYbF4Ey/NgOJus=", + "lastModified": 1710401383, + "narHash": "sha256-jskq7uDpKXrRoY4hDpNqykmSSKHUXYlo7ZFc/se7fus=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f0db7d418e781354d8a3c50e611e3b1cd413087", + "rev": "1ab3cec3a1bbb065b2d52b913d1431366028d5b5", "type": "github" }, "original": { @@ -227,14 +407,14 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1710025765, - "narHash": "sha256-CnNH3E1xB/xfif+KotTfvSGLLqOZ0OvUcUrDsFMwN6Q=", + "lastModified": 1710404304, + "narHash": "sha256-tYsUAsZgt9TT7d+r1KRYHWyBRWedJ39SXNBVSCQVsGQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2e8c168044e86ee1344c18bde5caeffe205292f2", + "rev": "ffa51458aec4d53aac85b6dee1ee2ec29f4e953f", "type": "github" }, "original": { @@ -245,11 +425,11 @@ }, "lanzaboote": { "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", + "crane": "crane_3", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -287,6 +467,21 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -311,11 +506,11 @@ }, "nixlib": { "locked": { - "lastModified": 1709426687, - "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=", + "lastModified": 1710031547, + "narHash": "sha256-pkUg3hOKuGWMGF9WEMPPN/G4pqqdbNGJQ54yhyQYDVY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c", + "rev": "630ebdc047ca96d8126e16bb664c7730dc52f6e6", "type": "github" }, "original": { @@ -332,11 +527,11 @@ ] }, "locked": { - "lastModified": 1710164763, - "narHash": "sha256-6p7yebSjzrL8qK4Q0gx2RnsxaudGUQcgkSxFG/J265Y=", + "lastModified": 1710398463, + "narHash": "sha256-fQlYanU84E8uwBpcoTCcLCwU8cqn0eQ7nwTcrWfSngc=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "1d9c8cd24eba7942955f92fdcefba5a6a7543bc6", + "rev": "efd4e38532b5abfaa5c9fc95c5a913157dc20ccb", "type": "github" }, "original": { @@ -363,11 +558,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710313540, - "narHash": "sha256-HtTTpGe0azsEJVaT9RvbGFGB4idUneraLiUTxFb3ABM=", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4008381882569ab4773f2ba0d7b7bbde8f665672", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { @@ -408,6 +603,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1702780907, + "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1704874635, "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", @@ -423,7 +634,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1710033658, "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", @@ -456,6 +667,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1710377395, + "narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "db001797591bf76f7b8d4c4ed3b49233391e0c97", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1708984720, "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", @@ -471,7 +698,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1710078301, "narHash": "sha256-BQ3v+XPPz5dLiw2AqUEga++yfKRhqJANUqzqNL518pk=", @@ -487,7 +714,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -503,7 +730,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1705856552, "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", @@ -518,7 +745,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1709968316, "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=", @@ -598,7 +825,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1708018599, @@ -616,16 +843,17 @@ }, "root": { "inputs": { + "conduit": "conduit", "disko": "disko", "extest": "extest", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_3", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "linger": "linger", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "pihole": "pihole", "plasma-manager": "plasma-manager", @@ -633,6 +861,23 @@ "sops-nix": "sops-nix" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1709571018, + "narHash": "sha256-ISFrxHxE0J5g7lDAscbK88hwaT5uewvWoma9TlFmRzM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "9f14343f9ee24f53f17492c5f9b653427e2ad15e", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "flake-utils": [ @@ -661,8 +906,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_5", + "flake-compat": "flake-compat_4", + "nixpkgs": "nixpkgs_6", "nixpkgs-23_05": "nixpkgs-23_05", "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" @@ -684,15 +929,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_7", + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1710195194, - "narHash": "sha256-KFxCJp0T6TJOz1IOKlpRdpsCr9xsvlVuWY/VCiAFnTE=", + "lastModified": 1710417151, + "narHash": "sha256-3aDzAo0+jURqop+XL8EwVMmS3zkslGiPT2JXWOe9W+4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e52d8117b330f690382f1d16d81ae43daeb4b880", + "rev": "804157eb75a4312df25a9a144d3807c40ade72b6", "type": "github" }, "original": { @@ -731,6 +976,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/flake.nix b/flake.nix index 8780eea..ca7f796 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # Conduit fork without all the fuss and drama + conduit = { + url = "github:girlbossceo/conduwuit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Secret management with sops sops-nix.url = "github:Mic92/sops-nix"; @@ -79,6 +85,7 @@ pihole, lanzaboote, nixos-hardware, + conduit, ... } @ inputs: let inherit (self) outputs; @@ -123,29 +130,12 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager { - home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; + home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; } ]; }; }; - # ISO for EDI, can be built using nix build .#EDIISO - EDIISO = nixos-generators.nixosGenerate { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - ./nixos/hosts/EDI/configuration.nix - sops-nix.nixosModules.sops - lanzaboote.nixosModules.lanzaboote - disko.nixosModules.disko - home-manager.nixosModules.home-manager - { - home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; - } - ]; - format = "iso"; - }; - nixosConfigurations = { GLaDOS = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -158,7 +148,7 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager { - home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager]; + home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; } ]; }; @@ -186,9 +176,14 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops + home-manager.nixosModules.home-manager + { + home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; + } ]; }; }; + nixosConfigurations = { wheatley = nixpkgs.lib.nixosSystem { system = "armv7l-linux"; diff --git a/home-manager/desktop/plasma-desktop/default.nix b/home-manager/desktop/plasma-desktop/default.nix index fa8a52d..48e77cf 100644 --- a/home-manager/desktop/plasma-desktop/default.nix +++ b/home-manager/desktop/plasma-desktop/default.nix @@ -1,4 +1,11 @@ { + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { programs.plasma = { enable = true; shortcuts = { diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index f6195fb..1f1393d 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -53,7 +53,7 @@ #Gaming: prismlauncher r2modman - yuzu-early-access + ryujinx # Multimedia: freetube diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 4d6232d..7b8dcb3 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -116,7 +116,7 @@ services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.xserver.desktopManager.plasma6.enable = true; + services.desktopManager.plasma6.enable = true; programs.kdeconnect.enable = true; services.xserver.displayManager.sddm.settings = { diff --git a/nixos/server/package-configs/conduit/copy.nix b/nixos/server/package-configs/conduit/copy.nix deleted file mode 100644 index 4c301ac..0000000 --- a/nixos/server/package-configs/conduit/copy.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ - pkgs, - config, - lib, - flake-inputs, - ... -}: let - inherit (lib.strings) concatMapStringsSep; - - cfg = config.services.matrix-conduit; - domain = "matrix.gladtherescake.eu"; - turn-realm = "turn.gladtherescake.eu"; -in { - services.matrix-conduit = { - enable = true; - package = flake-inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.matrix-conduit; - settings.global = { - address = "127.0.0.1"; - server_name = domain; - database_backend = "rocksdb"; - - turn_uris = let - address = "${config.services.coturn.realm}:${toString config.services.coturn.listening-port}"; - tls-address = "${config.services.coturn.realm}:${toString config.services.coturn.tls-listening-port}"; - in [ - "turn:${address}?transport=udp" - "turn:${address}?transport=tcp" - "turns:${tls-address}?transport=udp" - "turns:${tls-address}?transport=tcp" - ]; - }; - }; - - # Pass in the TURN secret via EnvironmentFile, not supported by - # upstream module currently. - # - # See also https://gitlab.com/famedly/conduit/-/issues/314 - systemd.services.conduit.serviceConfig.EnvironmentFile = config.sops.secrets."turn/env".path; - - services.coturn = { - enable = true; - no-cli = true; - use-auth-secret = true; - static-auth-secret-file = config.sops.secrets."turn/secret".path; - realm = turn-realm; - relay-ips = [ - "178.79.137.55" - ]; - - # SSL config - # - # TODO(tlater): Switch to letsencrypt once google fix: - # https://github.com/vector-im/element-android/issues/1533 - pkey = config.sops.secrets."turn/ssl-key".path; - cert = config.sops.secrets."turn/ssl-cert".path; - - # Based on suggestions from - # https://github.com/matrix-org/synapse/blob/develop/docs/turn-howto.md - # and - # https://www.foxypossibilities.com/2018/05/19/setting-up-a-turn-sever-for-matrix-on-nixos/ - no-tcp-relay = true; - secure-stun = true; - extraConfig = '' - # Deny various local IP ranges, see - # https://www.rtcsec.com/article/cve-2020-26262-bypass-of-coturns-access-control-protection/ - no-multicast-peers - denied-peer-ip=0.0.0.0-0.255.255.255 - denied-peer-ip=10.0.0.0-10.255.255.255 - denied-peer-ip=100.64.0.0-100.127.255.255 - denied-peer-ip=127.0.0.0-127.255.255.255 - denied-peer-ip=169.254.0.0-169.254.255.255 - denied-peer-ip=172.16.0.0-172.31.255.255 - denied-peer-ip=192.0.0.0-192.0.0.255 - denied-peer-ip=192.0.2.0-192.0.2.255 - denied-peer-ip=192.88.99.0-192.88.99.255 - denied-peer-ip=192.168.0.0-192.168.255.255 - denied-peer-ip=198.18.0.0-198.19.255.255 - denied-peer-ip=198.51.100.0-198.51.100.255 - denied-peer-ip=203.0.113.0-203.0.113.255 - denied-peer-ip=240.0.0.0-255.255.255.255 denied-peer-ip=::1 - denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff - denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255 - denied-peer-ip=100::-100::ffff:ffff:ffff:ffff - denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff - denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff - denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff - denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff - - # *Allow* any IP addresses that we explicitly set as relay IPs - ${concatMapStringsSep "\n" (ip: "allowed-peer-ip=${ip}") config.services.coturn.relay-ips} - - # Various other security settings - no-tlsv1 - no-tlsv1_1 - - # Monitoring - prometheus - ''; - }; - - services.nginx.virtualHosts."${domain}" = { - enableACME = true; - - listen = [ - { - addr = "0.0.0.0"; - port = 80; - } - { - addr = "[::0]"; - port = 80; - } - { - addr = "0.0.0.0"; - port = 443; - ssl = true; - } - { - addr = "[::0]"; - port = 443; - ssl = true; - } - { - addr = "0.0.0.0"; - port = 8448; - ssl = true; - } - { - addr = "[::0]"; - port = 8448; - ssl = true; - } - ]; - - forceSSL = true; - extraConfig = '' - merge_slashes off; - access_log /var/log/nginx/${domain}/access.log upstream_time; - ''; - - locations = { - "/_matrix" = { - proxyPass = "http://${cfg.settings.global.address}:${toString cfg.settings.global.port}"; - # Recommended by conduit - extraConfig = '' - proxy_buffering off; - ''; - }; - - # Add Element X support - # TODO(tlater): Remove when no longer required: https://github.com/vector-im/element-x-android/issues/1085 - "=/.well-known/matrix/client" = { - alias = pkgs.writeText "well-known-matrix-client" (builtins.toJSON { - "m.homeserver".base_url = "https://${domain}"; - "org.matrix.msc3575.proxy".url = "https://${domain}"; - }); - - extraConfig = '' - default_type application/json; - add_header Access-Control-Allow-Origin "*"; - ''; - }; - }; - }; -} diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index d9f44a9..364d0e3 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -1,28 +1,148 @@ { - inputs, - outputs, - lib, config, pkgs, + inputs, ... -}: { +}: let + # You'll need to edit these values + # The hostname that will appear in your user and room IDs + server_name = "matrix.gladtherescake.eu"; + + # The hostname that Conduit actually runs on + # + # This can be the same as `server_name` if you want. This is only necessary + # when Conduit is running on a different machine than the one hosting your + # root domain. This configuration also assumes this is all running on a single + # machine, some tweaks will need to be made if this is not the case. + matrix_hostname = "${server_name}"; + + # An admin email for TLS certificate notifications + admin_email = "admin@${server_name}"; + + # These ones you can leave alone + + # Build a dervation that stores the content of `${server_name}/.well-known/matrix/server` + well_known_server = pkgs.writeText "well-known-matrix-server" '' + { + "m.server": "${matrix_hostname}" + } + ''; + + # Build a dervation that stores the content of `${server_name}/.well-known/matrix/client` + well_known_client = pkgs.writeText "well-known-matrix-client" '' + { + "m.homeserver": { + "base_url": "https://${matrix_hostname}" + } + } + ''; +in { + # Configure Conduit itself services.matrix-conduit = { enable = true; + + # This causes NixOS to use the flake defined in this repository instead of + # the build of Conduit built into nixpkgs. + package = flake-inputs.conduit.packages.${pkgs.system}.default; + settings.global = { - allow_registration = true; - server_name = "matrix.gladtherescake.eu"; - port = 6167; + inherit server_name; }; }; + # Configure automated TLS acquisition/renewal + security.acme = { + acceptTerms = true; + defaults = { + email = admin_email; + }; + }; + + # ACME data must be readable by the NGINX user + users.users.nginx.extraGroups = [ + "acme" + ]; + + # Configure NGINX as a reverse proxy services.nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts = { - "matrix.gladtherescake.eu" = { + "${matrix_hostname}" = { forceSSL = true; enableACME = true; - locations."/" = { - proxyPass = "http://localhost:6167"; + + listen = [ + { + addr = "0.0.0.0"; + port = 443; + ssl = true; + } + { + addr = "[::]"; + port = 443; + ssl = true; + } + { + addr = "0.0.0.0"; + port = 8448; + ssl = true; + } + { + addr = "[::]"; + port = 8448; + ssl = true; + } + ]; + + locations."/_matrix/" = { + proxyPass = "http://backend_conduit"; proxyWebsockets = true; + extraConfig = '' + proxy_set_header Host $host; + proxy_buffering off; + ''; + }; + + extraConfig = '' + merge_slashes off; + ''; + }; + + "${server_name}" = { + forceSSL = true; + enableACME = true; + + locations."=/.well-known/matrix/server" = { + # Use the contents of the derivation built previously + alias = "${well_known_server}"; + + extraConfig = '' + # Set the header since by default NGINX thinks it's just bytes + default_type application/json; + ''; + }; + + locations."=/.well-known/matrix/client" = { + # Use the contents of the derivation built previously + alias = "${well_known_client}"; + + extraConfig = '' + # Set the header since by default NGINX thinks it's just bytes + default_type application/json; + + # https://matrix.org/docs/spec/client_server/r0.4.0#web-browser-clients + add_header Access-Control-Allow-Origin "*"; + ''; + }; + }; + }; + + upstreams = { + "backend_conduit" = { + servers = { + "[::1]:${toString config.services.matrix-conduit.settings.global.port}" = {}; }; }; }; From 6ebf9f3146410b730b62960a4f9c518720c7c444 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 13:53:28 +0100 Subject: [PATCH 1446/2308] Rename flake-inputs to inputs --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 364d0e3..b8b2c6b 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -43,7 +43,7 @@ in { # This causes NixOS to use the flake defined in this repository instead of # the build of Conduit built into nixpkgs. - package = flake-inputs.conduit.packages.${pkgs.system}.default; + package = inputs.conduit.packages.${pkgs.system}.default; settings.global = { inherit server_name; From 0eb4a0c500248dc91bc5421ce450af883d0768d0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 13:55:57 +0100 Subject: [PATCH 1447/2308] Deduplicate since we use the same hostnames twice --- nixos/server/package-configs/conduit/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index b8b2c6b..3fd5934 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -104,16 +104,6 @@ in { proxy_buffering off; ''; }; - - extraConfig = '' - merge_slashes off; - ''; - }; - - "${server_name}" = { - forceSSL = true; - enableACME = true; - locations."=/.well-known/matrix/server" = { # Use the contents of the derivation built previously alias = "${well_known_server}"; @@ -136,6 +126,10 @@ in { add_header Access-Control-Allow-Origin "*"; ''; }; + + extraConfig = '' + merge_slashes off; + ''; }; }; From 04cc262273b09c2568e419efc713bc50ca3a3164 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 13:57:06 +0100 Subject: [PATCH 1448/2308] And some more deduping --- nixos/server/package-configs/conduit/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 3fd5934..7c78324 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -8,23 +8,15 @@ # The hostname that will appear in your user and room IDs server_name = "matrix.gladtherescake.eu"; - # The hostname that Conduit actually runs on - # - # This can be the same as `server_name` if you want. This is only necessary - # when Conduit is running on a different machine than the one hosting your - # root domain. This configuration also assumes this is all running on a single - # machine, some tweaks will need to be made if this is not the case. - matrix_hostname = "${server_name}"; - # An admin email for TLS certificate notifications - admin_email = "admin@${server_name}"; + admin_email = "admin@gladtherescake.eu"; # These ones you can leave alone # Build a dervation that stores the content of `${server_name}/.well-known/matrix/server` well_known_server = pkgs.writeText "well-known-matrix-server" '' { - "m.server": "${matrix_hostname}" + "m.server": "${server_name}" } ''; @@ -32,7 +24,7 @@ well_known_client = pkgs.writeText "well-known-matrix-client" '' { "m.homeserver": { - "base_url": "https://${matrix_hostname}" + "base_url": "https://${server_name}" } } ''; @@ -69,7 +61,7 @@ in { recommendedProxySettings = true; virtualHosts = { - "${matrix_hostname}" = { + "${server_name}" = { forceSSL = true; enableACME = true; From 460baf9612fa3919f1c74c21bada65d0094d1191 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 13:58:25 +0100 Subject: [PATCH 1449/2308] Already set the email so it complains, let's set it again --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 7c78324..48cb237 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -9,7 +9,7 @@ server_name = "matrix.gladtherescake.eu"; # An admin email for TLS certificate notifications - admin_email = "admin@gladtherescake.eu"; + admin_email = "letsencrypt@gladtherescake.eu"; # These ones you can leave alone From b3e8f34761d9facb899c176c0d863daa273c4761 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 14:20:43 +0100 Subject: [PATCH 1450/2308] Add nix flake check to the update script so you don't break configurations by updating the lock --- pkgs/update/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix index 3d856b9..94d98d6 100644 --- a/pkgs/update/default.nix +++ b/pkgs/update/default.nix @@ -19,6 +19,7 @@ writeShellApplication echo "Updating flake lock..." nix flake update git add flake.lock + sudo nix flake check git commit -m "update flake lock" git push popd > /dev/null From e377fd06ec1d76aefdd45eb3ee2bd1002d572a8f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 14:40:24 +0100 Subject: [PATCH 1451/2308] Is conduit causing the nginx issue or no? --- nixos/server/package-configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 3b2ddc4..be65609 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -7,7 +7,7 @@ ... }: { imports = [ - ./conduit + # ./conduit ./forgejo ./gotosocial ./mail-server From 1b3682f188f17690740e06797ac53a99cb0920c3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 14:52:24 +0100 Subject: [PATCH 1452/2308] Onlyoffice was also running on port 8000, fixed that --- nixos/server/package-configs/default.nix | 2 +- nixos/server/package-configs/nextcloud/default.nix | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index be65609..3b2ddc4 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -7,7 +7,7 @@ ... }: { imports = [ - # ./conduit + ./conduit ./forgejo ./gotosocial ./mail-server diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 47885b1..7ad320e 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -11,9 +11,9 @@ sops.secrets."local.json".owner = config.users.users.onlyoffice.name; users.users = { - nextcloud.extraGroups = [config.users.groups.keys.name "onlyoffice"]; + nextcloud.extraGroups = [config.users.groups.keys.name config.users.users.onlyoffice.name]; #aria2.extraGroups = ["nextcloud"]; - onlyoffice.extraGroups = ["nextcloud"]; + onlyoffice.extraGroups = [config.users.users.nextcloud.name]; }; # Enable Nginx @@ -91,6 +91,7 @@ }; services.onlyoffice = { + port = 16783; enable = true; hostname = "onlyoffice.gladtherescake.eu"; #postgresHost = "/run/postgesql"; From 4b1a2cffe9726b26173cd26428b9436420bc9d53 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 15:36:44 +0100 Subject: [PATCH 1453/2308] Database wasn't loaded it said, let's try this then --- nixos/server/package-configs/conduit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 48cb237..6ac673c 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -39,6 +39,8 @@ in { settings.global = { inherit server_name; + database_path = "/var/lib/conduwuit"; + database_backend = "sqlite"; }; }; From 5cdc12f523c8877b6bc1df8ab8b2991510e13325 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 15:41:15 +0100 Subject: [PATCH 1454/2308] Force this value to see if it doesn't collide --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 6ac673c..8a8a29d 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -39,7 +39,7 @@ in { settings.global = { inherit server_name; - database_path = "/var/lib/conduwuit"; + database_path = lib.mkForce "/var/lib/conduwuit"; database_backend = "sqlite"; }; }; From 5cf33bd5e5c3eea835e4718b29ca217a38d07161 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 15:41:41 +0100 Subject: [PATCH 1455/2308] Need to import lib --- nixos/server/package-configs/conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 8a8a29d..fcfdc27 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -2,6 +2,7 @@ config, pkgs, inputs, + lib, ... }: let # You'll need to edit these values From 15dff0835e95496e991bdc6292577634e9f5665a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 15:42:52 +0100 Subject: [PATCH 1456/2308] OK, that doesn't work, frustrating, let's try making /var/lib/matrix-conduit then --- nixos/server/package-configs/conduit/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index fcfdc27..85b8baa 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -40,8 +40,6 @@ in { settings.global = { inherit server_name; - database_path = lib.mkForce "/var/lib/conduwuit"; - database_backend = "sqlite"; }; }; From 67348cbf469d08ebe7984a45c6a3c2d579709fd4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 15:48:41 +0100 Subject: [PATCH 1457/2308] Add sqlite and rocksdb to see if conduit will start now --- nixos/hosts/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index d7c6ffe..2fb5185 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -82,6 +82,8 @@ roundcubePlugins.persistent_login roundcubePlugins.thunderbird_labels youtube-dl + sqlite + rocksdb ]; # Create an auto-update systemd service that runs every day From 31aeca5895aa5537aa7fdcb6ad0d2e132e235958 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 15:50:18 +0100 Subject: [PATCH 1458/2308] The config is wrong maybe? --- nixos/server/package-configs/conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 85b8baa..0b17214 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -40,6 +40,7 @@ in { settings.global = { inherit server_name; + database_backend = "sqlite"; }; }; From 8d8ed9f7b03c6de142caf59a9a35dc3cebd74d7f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 16:32:44 +0100 Subject: [PATCH 1459/2308] Add rustdesk for remove viewing --- nixos/desktop/default.nix | 1 + nixos/hosts/shodan/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index a46f6c5..18d5434 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -64,6 +64,7 @@ noisetorch qjackctl wireplumber + rustdesk ]; programs.direnv = { diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 7b8dcb3..64680c3 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -56,6 +56,7 @@ noto-fonts-emoji oh-my-zsh rsync + rustdesk wget zsh From 0ca3787a1e71b537059f73de6445fdf4b45970f8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 17:03:05 +0100 Subject: [PATCH 1460/2308] Restart script for plasma added --- nixos/desktop/default.nix | 1 + pkgs/default.nix | 1 + pkgs/restart/default.nix | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 pkgs/restart/default.nix diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 18d5434..909a171 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -30,6 +30,7 @@ dvd dvt servo + restart # System tools aha diff --git a/pkgs/default.nix b/pkgs/default.nix index 6de28e2..17b7a02 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -10,4 +10,5 @@ pkgs: { install-nix = pkgs.callPackage ./install-nix {}; update = pkgs.callPackage ./update {}; upgrade = pkgs.callPackage ./upgrade {}; + restart = pkgs.callPackage ./restart {}; } diff --git a/pkgs/restart/default.nix b/pkgs/restart/default.nix new file mode 100644 index 0000000..efb9376 --- /dev/null +++ b/pkgs/restart/default.nix @@ -0,0 +1,18 @@ +{ + lib, + stdenv, + writeShellApplication, +}: +writeShellApplication +{ + name = "restart"; + + runtimeInputs = [killall]; + + text = '' + # Restart script for kde + + killall plasmashell + kstart plasmashell + ''; +} From 2e37682dfa0f8f5a0c380a3cd16501a00849c92c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 17:03:47 +0100 Subject: [PATCH 1461/2308] Add killall to all hosts --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index f3d6767..6f1b6e9 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -30,6 +30,7 @@ git-filter-repo home-manager htop + killall libnotify neofetch oh-my-zsh From 583ad127f1734ed8e4d61242bb5a9202569d0624 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 17:04:22 +0100 Subject: [PATCH 1462/2308] Remove that --- pkgs/restart/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/restart/default.nix b/pkgs/restart/default.nix index efb9376..d5583ea 100644 --- a/pkgs/restart/default.nix +++ b/pkgs/restart/default.nix @@ -7,7 +7,7 @@ writeShellApplication { name = "restart"; - runtimeInputs = [killall]; + runtimeInputs = []; text = '' # Restart script for kde From 48aabd7fe9052fa3dcee653e8e61a722eb2a6c4b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Mar 2024 17:11:03 +0100 Subject: [PATCH 1463/2308] This is the name of plasmashell on nix! --- pkgs/restart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/restart/default.nix b/pkgs/restart/default.nix index d5583ea..c3fe9c1 100644 --- a/pkgs/restart/default.nix +++ b/pkgs/restart/default.nix @@ -12,7 +12,7 @@ writeShellApplication text = '' # Restart script for kde - killall plasmashell - kstart plasmashell + killall .plasmashell-wr + kstart plasmashell& ''; } From 3c9e97d7b5fa5ba1773fe5addb640c902169a601 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Mar 2024 16:24:02 +0100 Subject: [PATCH 1464/2308] Renamed enable auto suggestion --- home-manager/package-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index f29743f..f7346cd 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -34,7 +34,7 @@ }; } ]; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; historySubstringSearch.enable = true; syntaxHighlighting.enable = true; From b5c7817bbc08605f72ce084dcf03fa94489b7412 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Mar 2024 16:26:19 +0100 Subject: [PATCH 1465/2308] update flake lock --- flake.lock | 136 ++++++++++++++++++++++++----------------------------- 1 file changed, 61 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index 97f202f..8a77ad9 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1710090208, - "narHash": "sha256-1W7yDW+kqCr/9SygZwygBayE8HwLnzJq48fMAOZQLAY=", + "lastModified": 1710602287, + "narHash": "sha256-6hjHSfH3jfTDxD6hELL7RGoqv2pnyVAtS81H5Le6qkk=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "e888a0a745ac979abe6a687ff24b8c5e7b7b79ed", + "rev": "930bf3891c5a1279b23e16f3f10ce02c47b9b4cb", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1710379155, - "narHash": "sha256-zdHEsOOnfBTO1ymL6gd9etR+iNS6HowbJM4Llqxy+Uc=", + "lastModified": 1710427903, + "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=", "owner": "nix-community", "repo": "disko", - "rev": "cc69c2340b59e290982ec7e6238471d470c839d0", + "rev": "21d89b333ca300bef82c928c856d48b94a9f997c", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1710401383, - "narHash": "sha256-jskq7uDpKXrRoY4hDpNqykmSSKHUXYlo7ZFc/se7fus=", + "lastModified": 1710532761, + "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ab3cec3a1bbb065b2d52b913d1431366028d5b5", + "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1710123225, - "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", + "lastModified": 1710622004, + "narHash": "sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", + "rev": "968952f950a59dee9ed1e8799dda38c6dfa1bad3", "type": "github" }, "original": { @@ -572,36 +572,6 @@ "type": "github" } }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, - "nixpkgs-23_11": { - "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1702780907, @@ -636,11 +606,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1710033658, - "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", + "lastModified": 1710628718, + "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8", + "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", "type": "github" }, "original": { @@ -652,11 +622,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { @@ -668,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710377395, - "narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=", + "lastModified": 1710637405, + "narHash": "sha256-w/woLwnFyhOeJWPjSWFtMNI2/RZTaAtHySIfm43Chos=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db001797591bf76f7b8d4c4ed3b49233391e0c97", + "rev": "299d4668ba61600311553920d9fd9c102145b2cb", "type": "github" }, "original": { @@ -716,11 +686,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { @@ -732,11 +702,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -747,11 +717,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1709968316, - "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=", + "lastModified": 1710534455, + "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e7f98a5f30166cbed344569426850b21e4091d4", + "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", "type": "github" }, "original": { @@ -908,16 +878,14 @@ "blobs": "blobs", "flake-compat": "flake-compat_4", "nixpkgs": "nixpkgs_6", - "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" }, "locked": { - "lastModified": 1709905972, - "narHash": "sha256-18OF2/ypr0n4Lp6Fk5SLHPu12ok6jM+Hv3sC0PCim0Q=", + "lastModified": 1710449465, + "narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "572c1b4d69deea1093ac231c37927cfa8ccad477", + "rev": "79c8cfcd5873a85559da6201b116fb38b490d030", "type": "gitlab" }, "original": { @@ -933,11 +901,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1710417151, - "narHash": "sha256-3aDzAo0+jURqop+XL8EwVMmS3zkslGiPT2JXWOe9W+4=", + "lastModified": 1710644594, + "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "804157eb75a4312df25a9a144d3807c40ade72b6", + "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", "type": "github" }, "original": { @@ -991,13 +959,31 @@ "type": "github" } }, - "utils": { + "systems_4": { "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { From 10f23d3ef67b6ec3cf93949866aa17deb8ab9920 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Mar 2024 20:21:25 +0100 Subject: [PATCH 1466/2308] Let's try the non branch version? --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index ca7f796..f352745 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ # Conduit fork without all the fuss and drama conduit = { - url = "github:girlbossceo/conduwuit"; + url = "gitlab:famedly/conduit"; inputs.nixpkgs.follows = "nixpkgs"; }; From ec3909f36fff01f55ea71bd26f4ff0d84054538d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Mar 2024 20:24:19 +0100 Subject: [PATCH 1467/2308] update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 8a77ad9..66dd9f8 100644 --- a/flake.lock +++ b/flake.lock @@ -52,17 +52,17 @@ ] }, "locked": { - "lastModified": 1710602287, - "narHash": "sha256-6hjHSfH3jfTDxD6hELL7RGoqv2pnyVAtS81H5Le6qkk=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "930bf3891c5a1279b23e16f3f10ce02c47b9b4cb", - "type": "github" + "lastModified": 1710648418, + "narHash": "sha256-DW8l1iofy9lYeZaHLX89Wvvry2mzp2R2Yk4cM5pjB8g=", + "owner": "famedly", + "repo": "conduit", + "rev": "a8da61e5b7152da0925f9f9f25056144d24fe4a6", + "type": "gitlab" }, "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" + "owner": "famedly", + "repo": "conduit", + "type": "gitlab" } }, "crane": { @@ -638,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710637405, - "narHash": "sha256-w/woLwnFyhOeJWPjSWFtMNI2/RZTaAtHySIfm43Chos=", + "lastModified": 1710669607, + "narHash": "sha256-kNj0Ka1/rkQRcigYTa1c5B6IcFuxDgM3s9jYuKUhxyM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "299d4668ba61600311553920d9fd9c102145b2cb", + "rev": "6af7e814afb3b62171eee1edc31989ee61528d25", "type": "github" }, "original": { From 4c46a95a0030997ff57240bbac4899ad40be61da Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Mar 2024 20:47:07 +0100 Subject: [PATCH 1468/2308] Enable registration temporarily --- nixos/server/package-configs/conduit/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 0b17214..8932e7e 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -40,7 +40,8 @@ in { settings.global = { inherit server_name; - database_backend = "sqlite"; + database_backend = "rocksdb"; + allow_registration = true; }; }; From a219487fd93c1e75c1d2242189347a7933cbbcfd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Mar 2024 20:49:06 +0100 Subject: [PATCH 1469/2308] Just do sqlite --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 8932e7e..c0189dd 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -40,7 +40,7 @@ in { settings.global = { inherit server_name; - database_backend = "rocksdb"; + database_backend = "sqlite"; allow_registration = true; }; }; From f46f2de03fe1820b8b7ca9dcd6d4424e7b260a70 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Mar 2024 20:53:11 +0100 Subject: [PATCH 1470/2308] Disable registration now --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index c0189dd..74dc5a8 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -41,7 +41,7 @@ in { settings.global = { inherit server_name; database_backend = "sqlite"; - allow_registration = true; + allow_registration = false; }; }; From 47f0392a99ce6fddd4aa78f9c310abbce7b8fcb2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Mar 2024 22:41:42 +0100 Subject: [PATCH 1471/2308] Workaround for a totally quiet boot, hope this works --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 64680c3..279e89c 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -195,7 +195,7 @@ boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; boot.consoleLogLevel = 0; - boot.kernelParams = ["quiet" "udev.log_priority=0"]; + boot.kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; boot.plymouth.enable = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From e5b15294011038755d169f2e5b216b2d8ea40175 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Mar 2024 23:10:17 +0100 Subject: [PATCH 1472/2308] Try to automount the SD on boot --- nixos/hosts/shodan/hardware-configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/hosts/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix index dbd00de..ddbf19f 100644 --- a/nixos/hosts/shodan/hardware-configuration.nix +++ b/nixos/hosts/shodan/hardware-configuration.nix @@ -27,6 +27,11 @@ fsType = "vfat"; }; + fileSystems."/home/lillian/sd" = { + device = "/dev/mmcblk0p1"; + fsType = "exfat"; + }; + swapDevices = [ {device = "/dev/disk/by-uuid/c0c87d80-b6be-444a-a76f-b32d35c38994";} ]; From de078d7815f354679a58482e6855b097efcc42fa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 17 Mar 2024 23:11:49 +0100 Subject: [PATCH 1473/2308] Let's make that path a bit more standard --- nixos/hosts/shodan/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix index ddbf19f..ac88e90 100644 --- a/nixos/hosts/shodan/hardware-configuration.nix +++ b/nixos/hosts/shodan/hardware-configuration.nix @@ -27,7 +27,7 @@ fsType = "vfat"; }; - fileSystems."/home/lillian/sd" = { + fileSystems."/run/media/lillian/SD" = { device = "/dev/mmcblk0p1"; fsType = "exfat"; }; From 5a955870f809a7d24777f6e567d3334c3d383bab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 00:58:19 +0100 Subject: [PATCH 1474/2308] Enable automount on shodan for removable media --- nixos/hosts/shodan/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 279e89c..4fcc3c4 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -144,6 +144,10 @@ networking.firewall.allowedTCPPorts = [22]; + # Enable automounting of removable media + services.udisks2.enable = true; + services.devmon.enable = true; + # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 80fbd2c88493852d517c661ed559ba6ceb2c58d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 00:59:26 +0100 Subject: [PATCH 1475/2308] Add lillian to storage group on shodan to access the auto mounts --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 4fcc3c4..b33d6f5 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -179,7 +179,7 @@ enable = true; }; - users.users.lillian.extraGroups = ["decky"]; + users.users.lillian.extraGroups = ["decky" "storage"]; # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; From 684ac9b60588a42743249e31a5a25027ae04463b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 01:04:40 +0100 Subject: [PATCH 1476/2308] Enable bashmount in shodan home manager, maybe that will automount? --- home-manager/hosts/shodan/lillian.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 1f1393d..28f0bc6 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -78,6 +78,8 @@ ungoogled-chromium ]; + programs.bashmount.enable = true; + # Enable home-manager and git programs.home-manager.enable = true; programs.git = { From 11f30ba64c38a600f995cb3c5ec797a6562e97d7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 01:21:34 +0100 Subject: [PATCH 1477/2308] Let's try udiskie? --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b33d6f5..afdb6e7 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -147,6 +147,7 @@ # Enable automounting of removable media services.udisks2.enable = true; services.devmon.enable = true; + services.udiskie.enable = true; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 5e72f48b27f085fef7520b5866698776304ab0e2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 01:24:20 +0100 Subject: [PATCH 1478/2308] Wrong location for that --- home-manager/hosts/shodan/lillian.nix | 2 ++ nixos/hosts/shodan/configuration.nix | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 28f0bc6..6c23e7d 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -78,7 +78,9 @@ ungoogled-chromium ]; + # Automount services for user programs.bashmount.enable = true; + services.udiskie.enable = true; # Enable home-manager and git programs.home-manager.enable = true; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index afdb6e7..b33d6f5 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -147,7 +147,6 @@ # Enable automounting of removable media services.udisks2.enable = true; services.devmon.enable = true; - services.udiskie.enable = true; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 43221002507c7eaea5c37cde3db869ca7a179670 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 01:48:48 +0100 Subject: [PATCH 1479/2308] Let's try udiskie like this --- home-manager/hosts/shodan/lillian.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 6c23e7d..cfd8cce 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -80,7 +80,12 @@ # Automount services for user programs.bashmount.enable = true; - services.udiskie.enable = true; + services.udiskie = { + enable = true; + automount = true; + notify = false; + tray = "never"; + }; # Enable home-manager and git programs.home-manager.enable = true; From 3f2676c867d8dcf7d288e857b8dcfe102c4373be Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 01:56:24 +0100 Subject: [PATCH 1480/2308] Last attempt for today --- nixos/hosts/shodan/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b33d6f5..2fb4ac2 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -147,6 +147,8 @@ # Enable automounting of removable media services.udisks2.enable = true; services.devmon.enable = true; + services.gvfs.enable = true; + environment.variables.GIO_EXTRA_MODULES = ["${pkgs.gvfs}/lib/gio/modules"]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 6f65c57314b5405d874dc1ce3b4319e5b562b094 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 01:57:59 +0100 Subject: [PATCH 1481/2308] Force this? --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 2fb4ac2..55ea51e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -148,7 +148,7 @@ services.udisks2.enable = true; services.devmon.enable = true; services.gvfs.enable = true; - environment.variables.GIO_EXTRA_MODULES = ["${pkgs.gvfs}/lib/gio/modules"]; + environment.variables.GIO_EXTRA_MODULES = lib.mkForce ["${pkgs.gvfs}/lib/gio/modules"]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From fc3384472d7b994971dabd1e42162844e0749d99 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 14:44:16 +0100 Subject: [PATCH 1482/2308] Created new derivation based on this: https://github.com/scawp/Steam-Deck.Mount-External-Drive/ --- home-manager/hosts/shodan/lillian.nix | 16 +- nixos/hosts/shodan/auto-mount.nix | 30 ++++ pkgs/auto-mount/default.nix | 233 ++++++++++++++++++++++++++ pkgs/default.nix | 1 + 4 files changed, 272 insertions(+), 8 deletions(-) create mode 100644 nixos/hosts/shodan/auto-mount.nix create mode 100644 pkgs/auto-mount/default.nix diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index cfd8cce..dfac6d2 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -78,14 +78,14 @@ ungoogled-chromium ]; - # Automount services for user - programs.bashmount.enable = true; - services.udiskie = { - enable = true; - automount = true; - notify = false; - tray = "never"; - }; + # # Automount services for user + # programs.bashmount.enable = true; + # services.udiskie = { + # enable = true; + # automount = true; + # notify = false; + # tray = "never"; + # }; # Enable home-manager and git programs.home-manager.enable = true; diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix new file mode 100644 index 0000000..ac346cf --- /dev/null +++ b/nixos/hosts/shodan/auto-mount.nix @@ -0,0 +1,30 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + services.udev.extraRules = '' + KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="/bin/systemctl start --no-block external-drive-mount@%k.service" + KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="add", RUN+="/bin/systemctl start --no-block external-drive-mount@%k.service" + KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="remove", RUN+="/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="add", RUN+="/bin/systemctl start --no-block external-drive-mount@%k.service" + KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="/bin/systemctl stop --no-block external-drive-mount@%k.service" + ''; + systemd.services.auto-mount = { + enable = true; + description = "Mount External Drive on %i"; + unitConfig = { + }; + serviceConfig = { + Type = "oneshot"; + ExecStart = "/run/current-system/sw/bin/automount add %i"; + ExecStop = "/run/current-system/sw/bin/automount remove %i"; + RemainAfterExit = true; + }; + wantedBy = ["multi-user.target"]; + }; +} diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix new file mode 100644 index 0000000..e80df01 --- /dev/null +++ b/pkgs/auto-mount/default.nix @@ -0,0 +1,233 @@ +{ + lib, + stdenv, + direnv, + writeShellApplication, +}: +writeShellApplication +{ + name = "auto-mount"; + + runtimeInputs = []; + + text = '' + #!/bin/bash + + set -euo pipefail + + # Originally from https://serverfault.com/a/767079 + + # This script is called from our systemd unit file to mount or unmount + # a USB drive. + + usage() + { + echo "Usage: $0 {add|remove} device_name (e.g. sdb1)" + exit 1 + } + + if [[ $# -ne 2 ]]; then + usage + fi + + ACTION=$1 + DEVBASE=$2 + DEVICE="/dev/''${DEVBASE}" + + # Shared between this and the auto-mount script to ensure we're not double-triggering nor automounting while formatting + # or vice-versa. + MOUNT_LOCK="/var/run/jupiter-automount-''${DEVBASE//\/_}.lock" + + # Obtain lock + exec 9<>"$MOUNT_LOCK" + if ! flock -n 9; then + echo "$MOUNT_LOCK is active: ignoring action $ACTION" + # Do not return a success exit code: it could end up putting the service in 'started' state without doing the mount + # work (further start commands will be ignored after that) + exit 1 + fi + + # Wait N seconds for steam + wait_steam() + { + local i=0 + local wait=$1 + echo "Waiting up to $wait seconds for steam to load" + while ! pgrep -x steamwebhelper &>/dev/null && (( i++ < wait )); do + sleep 1 + done + } + + send_steam_url() + { + local command="$1" + local arg="$2" + local encoded=$(urlencode "$arg") + if pgrep -x "steam" > /dev/null; then + # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent + # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess + systemd-run -M 1000@ --user --collect --wait sh -c "./.steam/root/ubuntu12_32/steam steam://''${command}/''${encoded@Q}" + echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" + else + echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" + fi + } + + # From https://gist.github.com/HazCod/da9ec610c3d50ebff7dd5e7cac76de05 + urlencode() + { + [ -z "$1" ] || echo -n "$@" | hexdump -v -e '/1 "%02x"' | sed 's/\(..\)/%\1/g' + } + + do_mount() + { + declare -i ret + # NOTE: these values are ABI, since they are sent to the Steam client + readonly FSCK_ERROR=1 + readonly MOUNT_ERROR=2 + + # Get info for this drive: $ID_FS_LABEL, and $ID_FS_TYPE + dev_json=$(lsblk -o PATH,LABEL,FSTYPE --json -- "$DEVICE" | jq '.blockdevices[0]') + ID_FS_LABEL=$(jq -r '.label | select(type == "string")' <<< "$dev_json") + ID_FS_TYPE=$(jq -r '.fstype | select(type == "string")' <<< "$dev_json") + + # Global mount options + OPTS="rw,noatime" + + # File system type specific mount options + #if [[ ''${ID_FS_TYPE} == "vfat" ]]; then + # OPTS+=",users,gid=100,umask=000,shortname=mixed,utf8=1,flush" + #fi + + case "''${ID_FS_TYPE}" in + "ntfs") + echo "FSType is NTFS" + #Extra Opts don't seem necessary anymore? add if required + #OPTS+="" + ;; + "exfat") + echo "FSType is exFat" + #OPTS+=",users,gid=100,umask=000,shortname=mixed,utf8=1,flush" + ;; + "btrfs") + echo "FSType is btrfs" + ;; + "ext4") + echo "FSType is ext4" + #exit 2 + ;; + *) + echo "Error mounting ''${DEVICE}: unsupported fstype: ''${ID_FS_TYPE} - ''${dev_json}" + rm "''${MOUNT_LOCK}" + exit 2 + ;; + esac + + # Prior to talking to udisks, we need all udev hooks (we were started by one) to finish, so we know it has knowledge + # of the drive. Our own rule starts us as a service with --no-block, so we can wait for rules to settle here + # safely. + #if ! udevadm settle; then + # echo "Failed to wait for \`udevadm settle\`" + # exit 1 + #fi + + # Ask udisks to auto-mount. This needs a version of udisks that supports the 'as-user' option. + ret=0 + reply=$(busctl call --allow-interactive-authorization=false --expect-reply=true --json=short \ + org.freedesktop.UDisks2 \ + /org/freedesktop/UDisks2/block_devices/"''${DEVBASE}" \ + org.freedesktop.UDisks2.Filesystem \ + Mount 'a{sv}' 3 \ + as-user s lillian \ + auth.no_user_interaction b true \ + options s "$OPTS") || ret=$? + + if (( ret != 0 )); then + send_steam_url "system/devicemountresult" "''${DEVBASE}/''${MOUNT_ERROR}" + echo "Error mounting ''${DEVICE} (status = $ret)" + exit 1 + fi + + # Expected reply is of the format + # {"type":"s","data":["/run/media/lillian/home"]} + mount_point=$(jq -r '.data[0] | select(type == "string")' <<< "$reply" || true) + if [[ -z $mount_point ]]; then + echo "Error when mounting ''${DEVICE}: udisks returned success but could not parse reply:" + echo "---"$'\n'"$reply"$'\n'"---" + exit 1 + fi + + if [[ ''${ID_FS_TYPE} == "exfat" ]]; then + echo "exFat does not support symlinks, do not add library to Steam" + exit 0 + fi + + # Create a symlink from /run/media to keep compatibility with apps + # that use the older mount point (for SD cards only). + case "''${DEVBASE}" in + mmcblk0p*) + if [[ -z "''${ID_FS_LABEL}" ]]; then + old_mount_point="/run/media/''${DEVBASE}" + else + old_mount_point="/run/media/''${mount_point##*/}" + fi + if [[ ! -d "''${old_mount_point}" ]]; then + rm -f -- "''${old_mount_point}" + ln -s -- "''${mount_point}" "''${old_mount_point}" + fi + ;; + esac + + echo "**** Mounted ''${DEVICE} at ''${mount_point} ****" + + if [ -f "''${mount_point}/libraryfolder.vdf" ]; then + send_steam_url "addlibraryfolder" "''${mount_point}" + else + #TODO check permissions are 1000 when creating new SteamLibrary + mkdir -p "''${mount_point}/SteamLibrary" + chown lillian:lillian "''${mount_point}/SteamLibrary" + send_steam_url "addlibraryfolder" "''${mount_point}/SteamLibrary" + fi + } + + do_unmount() + { + local mount_point=$(findmnt -fno TARGET "''${DEVICE}" || true) + if [[ -n $mount_point ]]; then + # Remove symlink to the mount point that we're unmounting + find /run/media -maxdepth 1 -xdev -type l -lname "''${mount_point}" -exec rm -- {} \; + else + # If we don't know the mount point then remove all broken symlinks + find /run/media -maxdepth 1 -xdev -xtype l -exec rm -- {} \; + fi + } + + do_retrigger() + { + local mount_point=$(findmnt -fno TARGET "''${DEVICE}" || true) + [[ -n $mount_point ]] || return 0 + + # In retrigger mode, we want to wait a bit for steam as the common pattern is starting in parallel with a retrigger + wait_steam 10 + # This is a truly gnarly way to ensure steam is ready for commands. + # TODO literally anything else + sleep 6 + send_steam_url "addlibraryfolder" "''${mount_point}" + } + + case "''${ACTION}" in + add) + do_mount + ;; + remove) + do_unmount + ;; + retrigger) + do_retrigger + ;; + *) + usage + ;; + esac + ''; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index 17b7a02..f322ced 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -11,4 +11,5 @@ pkgs: { update = pkgs.callPackage ./update {}; upgrade = pkgs.callPackage ./upgrade {}; restart = pkgs.callPackage ./restart {}; + auto-mount = pkgs.callPackage ./auto-mount {}; } From b7eb0d5179a1b822369cbaa1c2f6b96bad46dae7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 14:46:37 +0100 Subject: [PATCH 1483/2308] Small tweaks, disable my earlier tinkering to not have it interfere --- nixos/hosts/shodan/auto-mount.nix | 2 ++ nixos/hosts/shodan/configuration.nix | 2 ++ pkgs/auto-mount/default.nix | 2 ++ 3 files changed, 6 insertions(+) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index ac346cf..a52c160 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -6,6 +6,8 @@ pkgs, ... }: { + environment.systemPackages = with pkgs; [auto-mount]; + services.udev.extraRules = '' KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="/bin/systemctl stop --no-block external-drive-mount@%k.service" diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 55ea51e..f750210 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -21,6 +21,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix + + ./auto-mount.nix ]; boot.tmp.cleanOnBoot = true; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index e80df01..176ee24 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -6,6 +6,8 @@ }: writeShellApplication { + # Originally from: https://github.com/scawp/Steam-Deck.Mount-External-Drive/ + name = "auto-mount"; runtimeInputs = []; From 4e3f91a12283fbc56a7afaf40f80c800dd430cdd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 14:49:13 +0100 Subject: [PATCH 1484/2308] Replace the generic linux stuff with nix specific things --- nixos/hosts/shodan/auto-mount.nix | 12 ++++++------ pkgs/auto-mount/default.nix | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index a52c160..f63a6c2 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -9,12 +9,12 @@ environment.systemPackages = with pkgs; [auto-mount]; services.udev.extraRules = '' - KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="/bin/systemctl start --no-block external-drive-mount@%k.service" - KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="/bin/systemctl stop --no-block external-drive-mount@%k.service" - KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="add", RUN+="/bin/systemctl start --no-block external-drive-mount@%k.service" - KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="remove", RUN+="/bin/systemctl stop --no-block external-drive-mount@%k.service" - KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="add", RUN+="/bin/systemctl start --no-block external-drive-mount@%k.service" - KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="/run/current-system/sw/bin/systemctl start --no-block external-drive-mount@%k.service" + KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="/run/current-system/sw/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="add", RUN+="/run/current-system/sw/bin/systemctl start --no-block external-drive-mount@%k.service" + KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="remove", RUN+="/run/current-system/sw/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="add", RUN+="/run/current-system/sw/bin/systemctl start --no-block external-drive-mount@%k.service" + KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="/run/current-system/sw/bin/systemctl stop --no-block external-drive-mount@%k.service" ''; systemd.services.auto-mount = { enable = true; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 176ee24..8f1af57 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -13,8 +13,6 @@ writeShellApplication runtimeInputs = []; text = '' - #!/bin/bash - set -euo pipefail # Originally from https://serverfault.com/a/767079 From 55488c83384a81b23bb77565a400312a45c3b8b1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 15:00:03 +0100 Subject: [PATCH 1485/2308] Declare some vars separately so shellckeck will pass --- pkgs/auto-mount/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 8f1af57..86fa285 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -192,7 +192,8 @@ writeShellApplication do_unmount() { - local mount_point=$(findmnt -fno TARGET "''${DEVICE}" || true) + local mount_point + mount_point=$(findmnt -fno TARGET "''${DEVICE}" || true) if [[ -n $mount_point ]]; then # Remove symlink to the mount point that we're unmounting find /run/media -maxdepth 1 -xdev -type l -lname "''${mount_point}" -exec rm -- {} \; @@ -204,7 +205,8 @@ writeShellApplication do_retrigger() { - local mount_point=$(findmnt -fno TARGET "''${DEVICE}" || true) + local mount_point + mount_point=$(findmnt -fno TARGET "''${DEVICE}" || true) [[ -n $mount_point ]] || return 0 # In retrigger mode, we want to wait a bit for steam as the common pattern is starting in parallel with a retrigger From 6015d165181926e32672bc2f12fca56471e6c88e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 15:04:26 +0100 Subject: [PATCH 1486/2308] Fixed these issues too, surpressed the unused argument since those are passed externally --- pkgs/auto-mount/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 86fa285..afc488c 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -60,9 +60,12 @@ writeShellApplication send_steam_url() { - local command="$1" - local arg="$2" - local encoded=$(urlencode "$arg") + local command + command="$1" + local arg + arg="$2" + local encoded + encoded=$(urlencode "$arg") if pgrep -x "steam" > /dev/null; then # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess @@ -83,7 +86,9 @@ writeShellApplication { declare -i ret # NOTE: these values are ABI, since they are sent to the Steam client + # shellcheck disable=SC2034 readonly FSCK_ERROR=1 + # shellcheck disable=SC2034 readonly MOUNT_ERROR=2 # Get info for this drive: $ID_FS_LABEL, and $ID_FS_TYPE From f24a6cb9a001e72e751b1188efdb3b3ae3981ae2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 15:09:12 +0100 Subject: [PATCH 1487/2308] Fix systemctl path --- nixos/hosts/shodan/auto-mount.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index f63a6c2..15ad8a3 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -9,12 +9,12 @@ environment.systemPackages = with pkgs; [auto-mount]; services.udev.extraRules = '' - KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="/run/current-system/sw/bin/systemctl start --no-block external-drive-mount@%k.service" - KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="/run/current-system/sw/bin/systemctl stop --no-block external-drive-mount@%k.service" - KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="add", RUN+="/run/current-system/sw/bin/systemctl start --no-block external-drive-mount@%k.service" - KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="remove", RUN+="/run/current-system/sw/bin/systemctl stop --no-block external-drive-mount@%k.service" - KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="add", RUN+="/run/current-system/sw/bin/systemctl start --no-block external-drive-mount@%k.service" - KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="/run/current-system/sw/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" + KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" + KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" + KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" ''; systemd.services.auto-mount = { enable = true; From 5b7093dde0203bdd9526f9eadf4d078f218651ec Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 15:19:43 +0100 Subject: [PATCH 1488/2308] Rename service and see if it works now --- nixos/hosts/shodan/auto-mount.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 15ad8a3..3901309 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -16,17 +16,14 @@ KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" ''; - systemd.services.auto-mount = { + systemd.services."external-drive-mount@" = { enable = true; description = "Mount External Drive on %i"; - unitConfig = { - }; serviceConfig = { Type = "oneshot"; + RemainAfterExit = true; ExecStart = "/run/current-system/sw/bin/automount add %i"; ExecStop = "/run/current-system/sw/bin/automount remove %i"; - RemainAfterExit = true; }; - wantedBy = ["multi-user.target"]; }; } From ff4083d1ab780146cf3c5a7ea12bdf374e89512d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 15:24:54 +0100 Subject: [PATCH 1489/2308] Disable all the other experiments from before --- nixos/hosts/shodan/configuration.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f750210..6db593d 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -146,11 +146,11 @@ networking.firewall.allowedTCPPorts = [22]; - # Enable automounting of removable media - services.udisks2.enable = true; - services.devmon.enable = true; - services.gvfs.enable = true; - environment.variables.GIO_EXTRA_MODULES = lib.mkForce ["${pkgs.gvfs}/lib/gio/modules"]; + # # Enable automounting of removable media + # services.udisks2.enable = true; + # services.devmon.enable = true; + # services.gvfs.enable = true; + # environment.variables.GIO_EXTRA_MODULES = lib.mkForce ["${pkgs.gvfs}/lib/gio/modules"]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; @@ -183,7 +183,7 @@ enable = true; }; - users.users.lillian.extraGroups = ["decky" "storage"]; + users.users.lillian.extraGroups = ["decky"]; # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; From 8dc0ceb16bdbe873257303f23c62031c614832f1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 16:06:23 +0100 Subject: [PATCH 1490/2308] Run SDDM on wayland --- nixos/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 909a171..be09f1d 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -89,7 +89,7 @@ services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; + services.xserver.displayManager.sddm.wayland.enable = true; services.desktopManager.plasma6.enable = true; services.xserver.displayManager.defaultSession = "plasma"; programs.kdeconnect.enable = true; From 30a243fae0f4f8f64fb91fc6589ab7dda020b82f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 16:17:48 +0100 Subject: [PATCH 1491/2308] Added some kde libraries --- nixos/desktop/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index be09f1d..dbe40da 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -58,6 +58,9 @@ # kdePackages.krunner-ssh # kdePackages.krunner-symbols kdePackages.packagekit-qt + kdePackages.plasma-pa + kdePackages.sddm-kcm + kdePackages.dolphin-plugins libportal-qt5 libportal From b20255e0e2e57b6a1ccc0f8a1abea0bb7fa850bf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 21:06:54 +0100 Subject: [PATCH 1492/2308] Cannot write to /var/ let's fix that --- pkgs/auto-mount/default.nix | 54 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index afc488c..4e8a34d 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -36,7 +36,7 @@ writeShellApplication # Shared between this and the auto-mount script to ensure we're not double-triggering nor automounting while formatting # or vice-versa. - MOUNT_LOCK="/var/run/jupiter-automount-''${DEVBASE//\/_}.lock" + MOUNT_LOCK="/home/lillian/lock/jupiter-automount-''${DEVBASE//\/_}.lock" # Obtain lock exec 9<>"$MOUNT_LOCK" @@ -60,20 +60,20 @@ writeShellApplication send_steam_url() { - local command - command="$1" - local arg - arg="$2" - local encoded - encoded=$(urlencode "$arg") - if pgrep -x "steam" > /dev/null; then - # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent - # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess - systemd-run -M 1000@ --user --collect --wait sh -c "./.steam/root/ubuntu12_32/steam steam://''${command}/''${encoded@Q}" - echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" - else - echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" - fi + local command + command="$1" + local arg + arg="$2" + local encoded + encoded=$(urlencode "$arg") + if pgrep -x "steam" > /dev/null; then + # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent + # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess + systemd-run -M 1000@ --user --collect --wait sh -c "./.steam/root/ubuntu12_32/steam steam://''${command}/''${encoded@Q}" + echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" + else + echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" + fi } # From https://gist.github.com/HazCod/da9ec610c3d50ebff7dd5e7cac76de05 @@ -106,25 +106,25 @@ writeShellApplication case "''${ID_FS_TYPE}" in "ntfs") - echo "FSType is NTFS" - #Extra Opts don't seem necessary anymore? add if required - #OPTS+="" + echo "FSType is NTFS" + #Extra Opts don't seem necessary anymore? add if required + #OPTS+="" ;; "exfat") - echo "FSType is exFat" + echo "FSType is exFat" #OPTS+=",users,gid=100,umask=000,shortname=mixed,utf8=1,flush" ;; "btrfs") - echo "FSType is btrfs" + echo "FSType is btrfs" ;; "ext4") echo "FSType is ext4" - #exit 2 - ;; + #exit 2 + ;; *) echo "Error mounting ''${DEVICE}: unsupported fstype: ''${ID_FS_TYPE} - ''${dev_json}" - rm "''${MOUNT_LOCK}" - exit 2 + rm "''${MOUNT_LOCK}" + exit 2 ;; esac @@ -143,9 +143,9 @@ writeShellApplication /org/freedesktop/UDisks2/block_devices/"''${DEVBASE}" \ org.freedesktop.UDisks2.Filesystem \ Mount 'a{sv}' 3 \ - as-user s lillian \ - auth.no_user_interaction b true \ - options s "$OPTS") || ret=$? + as-user s lillian \ + auth.no_user_interaction b true \ + options s "$OPTS") || ret=$? if (( ret != 0 )); then send_steam_url "system/devicemountresult" "''${DEVBASE}/''${MOUNT_ERROR}" From 88c5a3de6bf81937cbfe801b51df279922983730 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 21:10:06 +0100 Subject: [PATCH 1493/2308] Add jq library --- nixos/hosts/shodan/configuration.nix | 1 + pkgs/auto-mount/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 6db593d..462e094 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -53,6 +53,7 @@ git-filter-repo home-manager htop + jq noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 4e8a34d..d109ab5 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - direnv, + jq, writeShellApplication, }: writeShellApplication @@ -10,7 +10,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = []; + runtimeInputs = [jq]; text = '' set -euo pipefail From 70f63daf80fe719ebe3053e1809e7f9800d33626 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 21:36:29 +0100 Subject: [PATCH 1494/2308] Add fs tools --- nixos/shared/packages/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 6f1b6e9..a91bdbd 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -26,6 +26,8 @@ # System tools age alejandra + bcachefs-tools + e2fsprogs git git-filter-repo home-manager From ca4553749ca72169177876a35580353706e064ff Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Mar 2024 22:30:27 +0100 Subject: [PATCH 1495/2308] Make shodan more secure for reinstall, copied stuff from EDI --- disko/shodan/default.nix | 71 +++++++++++++++++++ flake.nix | 2 + nixos/hosts/shodan/configuration.nix | 11 ++- nixos/hosts/shodan/hardware-configuration.nix | 19 ----- 4 files changed, 83 insertions(+), 20 deletions(-) create mode 100644 disko/shodan/default.nix diff --git a/disko/shodan/default.nix b/disko/shodan/default.nix new file mode 100644 index 0000000..1375e5a --- /dev/null +++ b/disko/shodan/default.nix @@ -0,0 +1,71 @@ +{ + disko.devices = { + disk = { + nvme0n1 = { + type = "disk"; + device = "/dev/disk/by-path/pci-0000:01:00.0-nvme-1"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "defaults" + ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + extraOpenArgs = []; + settings = { + # if you want to use the key for interactive login be sure there is no trailing newline + # for example use `echo -n "password" > /tmp/secret.key` + #keyFile = "/tmp/secret.key"; + allowDiscards = true; + }; + #additionalKeyFiles = ["/tmp/additionalSecret.key"]; + content = { + type = "lvm_pv"; + vg = "pool"; + }; + }; + }; + }; + }; + }; + }; + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + swap = { + size = "16G"; + content = { + type = "swap"; + resumeDevice = true; # resume from hiberation from this device + }; + }; + root = { + size = "100%FREE"; + content = { + type = "filesystem"; + format = "bcachefs"; + mountpoint = "/"; + mountOptions = [ + "defaults" + ]; + }; + }; + }; + }; + }; + }; +} diff --git a/flake.nix b/flake.nix index f352745..1016c5d 100644 --- a/flake.nix +++ b/flake.nix @@ -176,6 +176,8 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops + lanzaboote.nixosModules.lanzaboote + disko.nixosModules.disko home-manager.nixosModules.home-manager { home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 462e094..b01c75a 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -22,6 +22,8 @@ # ./nvim.nix ./hardware-configuration.nix + ../../../disko/EDI + ./auto-mount.nix ]; @@ -184,7 +186,7 @@ enable = true; }; - users.users.lillian.extraGroups = ["decky"]; + users.users.lillian.extraGroups = ["decky" "tss"]; # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; @@ -199,6 +201,13 @@ networking.hostName = "shodan"; + security.tpm2.enable = true; + security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so + security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables + # tss group has access to TPM devices + + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + boot.supportedFilesystems = ["bcachefs"]; boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.timeout = 0; diff --git a/nixos/hosts/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix index ac88e90..fdfefac 100644 --- a/nixos/hosts/shodan/hardware-configuration.nix +++ b/nixos/hosts/shodan/hardware-configuration.nix @@ -17,25 +17,6 @@ boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = []; - fileSystems."/" = { - device = "/dev/disk/by-uuid/b29d5a9c-a4a6-4321-a767-27ed928cfa94"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/ABC6-B031"; - fsType = "vfat"; - }; - - fileSystems."/run/media/lillian/SD" = { - device = "/dev/mmcblk0p1"; - fsType = "exfat"; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/c0c87d80-b6be-444a-a76f-b32d35c38994";} - ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction From def2ae15e4e2bb9dd1455b4cbcdd6e66fc5003a8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Mar 2024 01:55:20 +0100 Subject: [PATCH 1496/2308] Disable quiet boot for now --- nixos/hosts/shodan/configuration.nix | 6 +++--- nixos/hosts/shodan/secrets/sops.yaml | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b01c75a..1621397 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -212,9 +212,9 @@ boot.loader.systemd-boot.configurationLimit = 3; boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; - boot.consoleLogLevel = 0; - boot.kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; - boot.plymouth.enable = true; + #boot.consoleLogLevel = 0; + #boot.kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; + #boot.plymouth.enable = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; diff --git a/nixos/hosts/shodan/secrets/sops.yaml b/nixos/hosts/shodan/secrets/sops.yaml index cdc6591..f203c8e 100644 --- a/nixos/hosts/shodan/secrets/sops.yaml +++ b/nixos/hosts/shodan/secrets/sops.yaml @@ -1,4 +1,3 @@ -pass: ENC[AES256_GCM,data:M7V75Q7I,iv:d59fWvFsEOOu8A+BSK0f2ZskX1SXHN1wA3EfGGsHp70=,tag:FLTogvUgI3HdKYWCJc/M1Q==,type:int] lillian-password: ENC[AES256_GCM,data:uPNBvMyhkiX3eedduFlsFUIcas/VBVSYrsmGTlgGUOzTQST59CYZRoq0ArphIJ3+Usy6KbR5tA5FCp4PoB3qVYBfjlAq6dhZIw==,iv:TiUIo2lvdL6SiDuW4gWn0TeJXkz5MldzqGxuK3MNPnE=,tag:d3p/h+q50JxygDtk2qxIeQ==,type:str] sops: kms: [] @@ -15,8 +14,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-02-22T12:17:27Z" - mac: ENC[AES256_GCM,data:JYOxnbBK2Uj/TH9Pc6gFf0xE82lD726Jm2R7fz4WYM3pAeYoeauRVU0YoxKhOHmAjAq9ZyHZVdWg3bSMMEz9ONz/F6LZiI5qegT+SO3uAPaTRwUa639G6RGO5b86LIRPuXBw5sdePeoxDt62rOiT6UhySK5XiEysEv5NyQFijlw=,iv:1pbuTtnRbaNKRn73NLZ+s3ZW2sGAc80tRd2QWTR4688=,tag:YndVhpjQC1aUBhmv7d/4+A==,type:str] + lastmodified: "2024-03-19T00:42:59Z" + mac: ENC[AES256_GCM,data:WuwpvgM5WCmtsb9WH6us1dn0+qQuV/6+ooI8K7Wp+VFlMWLA4g509TgOFHG+cxWJeN2cRtilnHM1INv1U6uadjWis0LrjrqbHaMRJ5aAr3/zKoTXWTG4pRNykoYmCkwHLnx0gJi6hm4PbKOIFVM+6V5m9JCLKRVO6eqyW15SVww=,iv:xVR5ZGs2Ww+J57qreIlHSW8A+ADAOjzM7B+KLRFrRLw=,tag:6KTaeX8+Txz4j1UJUWRj+w==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From e7416deafd16f778e14c4a6d96e744a38e6993b1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Mar 2024 01:58:26 +0100 Subject: [PATCH 1497/2308] Enable lanzaboot on shodan :) --- nixos/hosts/shodan/configuration.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 1621397..0270307 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -208,7 +208,17 @@ boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; boot.supportedFilesystems = ["bcachefs"]; - boot.loader.systemd-boot.enable = true; + # Lanzaboote currently replaces the systemd-boot module. + # This setting is usually set to true in configuration.nix + # generated at installation time. So we force it to false + # for now. + boot.loader.systemd-boot.enable = lib.mkForce false; + boot.initrd.systemd.enable = true; + + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; From 1a68af56941b0242858377bf0e33befb34ac6847 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Mar 2024 02:43:59 +0100 Subject: [PATCH 1498/2308] Fix chown command --- pkgs/auto-mount/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index d109ab5..1fe2bff 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -190,7 +190,7 @@ writeShellApplication else #TODO check permissions are 1000 when creating new SteamLibrary mkdir -p "''${mount_point}/SteamLibrary" - chown lillian:lillian "''${mount_point}/SteamLibrary" + chown lillian:users "''${mount_point}/SteamLibrary" send_steam_url "addlibraryfolder" "''${mount_point}/SteamLibrary" fi } From c38a2b6f66ac9062c69f10b90d49cd02ab9e0971 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Mar 2024 12:18:16 +0100 Subject: [PATCH 1499/2308] Enable sddm --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index dbe40da..54cdecc 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -93,6 +93,7 @@ # Enable the KDE Plasma Desktop Environment. services.xserver.displayManager.sddm.wayland.enable = true; + services.xserver.displayManager.sddm.enable = true; services.desktopManager.plasma6.enable = true; services.xserver.displayManager.defaultSession = "plasma"; programs.kdeconnect.enable = true; From 255a4130ff65d72c29dc196eaa9c8a16813b4710 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Mar 2024 12:46:02 +0100 Subject: [PATCH 1500/2308] Try and add some inputs to the auto-mount script --- pkgs/auto-mount/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 1fe2bff..ff231f0 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -2,6 +2,8 @@ lib, stdenv, jq, + coreutils, + udisks, writeShellApplication, }: writeShellApplication @@ -10,7 +12,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq]; + runtimeInputs = [jq coreutils udisks]; text = '' set -euo pipefail From 9d4ece44644f34e5004efb3a075bad569043b182 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Mar 2024 12:57:56 +0100 Subject: [PATCH 1501/2308] I sure hope this doesn't break shodan --- nixos/hosts/shodan/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 0270307..b0c4da4 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -206,7 +206,6 @@ security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables # tss group has access to TPM devices - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; boot.supportedFilesystems = ["bcachefs"]; # Lanzaboote currently replaces the systemd-boot module. # This setting is usually set to true in configuration.nix From 5038a75cb6b440fd9d080d007cac72723126b592 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Mar 2024 14:36:23 +0100 Subject: [PATCH 1502/2308] Change jovian to my fork --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 1016c5d..f15dfa1 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ lanzaboote.url = "github:nix-community/lanzaboote"; # Jovian nixos (steam deck) - jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; + jovian.url = "github:Lillian-Violet/Jovian-NixOS-bcachefs"; # Home manager home-manager.url = "github:nix-community/home-manager/master"; From 4078aa6690b5291b40dfa55f8d207442eeff5630 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Mar 2024 14:37:15 +0100 Subject: [PATCH 1503/2308] Disable this for now --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b0c4da4..0044ab2 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -206,7 +206,7 @@ security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables # tss group has access to TPM devices - boot.supportedFilesystems = ["bcachefs"]; + # boot.supportedFilesystems = ["bcachefs"]; # Lanzaboote currently replaces the systemd-boot module. # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false From 9b2fbd4ae5b738ded08ae8b407f86b8d3285c87e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 16:43:19 +0100 Subject: [PATCH 1504/2308] disable secure boot shodan, updates to other stuff --- flake.lock | 80 ++++++++++++++-------------- flake.nix | 2 +- nixos/hosts/shodan/auto-mount.nix | 3 +- nixos/hosts/shodan/configuration.nix | 10 ++-- 4 files changed, 47 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 66dd9f8..4b349db 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1710648418, - "narHash": "sha256-DW8l1iofy9lYeZaHLX89Wvvry2mzp2R2Yk4cM5pjB8g=", + "lastModified": 1710785672, + "narHash": "sha256-tEP/amp09fSKeTBrcHWAYr/tQ0g2ZxJQlnCiZDi6qtY=", "owner": "famedly", "repo": "conduit", - "rev": "a8da61e5b7152da0925f9f9f25056144d24fe4a6", + "rev": "81bc1fc4e324c4798dc7b7e3cec94495a94455e0", "type": "gitlab" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1710427903, - "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=", + "lastModified": 1710724748, + "narHash": "sha256-aXlifKr6Brg0SBUBgRNEBaZf3JLUeGhM9BX2gam+vvo=", "owner": "nix-community", "repo": "disko", - "rev": "21d89b333ca300bef82c928c856d48b94a9f997c", + "rev": "c09c3a9639690f94ddff44c3dd25c85602e5aeb2", "type": "github" }, "original": { @@ -348,11 +348,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1710532761, - "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", + "lastModified": 1710820906, + "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", "owner": "nix-community", "repo": "home-manager", - "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", + "rev": "022464438a85450abb23d93b91aa82e0addd71fb", "type": "github" }, "original": { @@ -410,16 +410,16 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1710404304, - "narHash": "sha256-tYsUAsZgt9TT7d+r1KRYHWyBRWedJ39SXNBVSCQVsGQ=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "ffa51458aec4d53aac85b6dee1ee2ec29f4e953f", + "lastModified": 1710856083, + "narHash": "sha256-kG/jMBaXlt+6LxL5uqOut9H1flEpLkAv7IezFKs4djA=", + "owner": "Lillian-Violet", + "repo": "Jovian-NixOS-bcachefs", + "rev": "2d9c09d9016af9ac8311c30f5b8a6f9a7ae6a427", "type": "github" }, "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", + "owner": "Lillian-Violet", + "repo": "Jovian-NixOS-bcachefs", "type": "github" } }, @@ -434,11 +434,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1710171982, - "narHash": "sha256-WFMB+Yohcvego1/vOtaq+MJ8Wvp5meOANfNifg26Ie4=", + "lastModified": 1710837180, + "narHash": "sha256-WVkLclGrUliLJUl+XaJplo09VdxyqHxZtkEmmDW2QYY=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "19ad7fd5724f30868748b8156ff25be838cd2bc5", + "rev": "ded8d23709f94aedb1407bee9e26581f258e9e3a", "type": "github" }, "original": { @@ -506,11 +506,11 @@ }, "nixlib": { "locked": { - "lastModified": 1710031547, - "narHash": "sha256-pkUg3hOKuGWMGF9WEMPPN/G4pqqdbNGJQ54yhyQYDVY=", + "lastModified": 1710636348, + "narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "630ebdc047ca96d8126e16bb664c7730dc52f6e6", + "rev": "fa827dda806c5aa98f454da4c567991ab8ce422c", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1710398463, - "narHash": "sha256-fQlYanU84E8uwBpcoTCcLCwU8cqn0eQ7nwTcrWfSngc=", + "lastModified": 1710722910, + "narHash": "sha256-P5p9+WQFuABoBXBKEK1ZYu8mD6q8j/cQwZ9OYb0oh2E=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "efd4e38532b5abfaa5c9fc95c5a913157dc20ccb", + "rev": "e63df01c798b99a76dc2ec25481be7dd25cd1610", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1710622004, - "narHash": "sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0=", + "lastModified": 1710783728, + "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "968952f950a59dee9ed1e8799dda38c6dfa1bad3", + "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710669607, - "narHash": "sha256-kNj0Ka1/rkQRcigYTa1c5B6IcFuxDgM3s9jYuKUhxyM=", + "lastModified": 1710827359, + "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6af7e814afb3b62171eee1edc31989ee61528d25", + "rev": "5710127d9693421e78cca4f74fac2db6d67162b1", "type": "github" }, "original": { @@ -670,11 +670,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1710078301, - "narHash": "sha256-BQ3v+XPPz5dLiw2AqUEga++yfKRhqJANUqzqNL518pk=", + "lastModified": 1710672219, + "narHash": "sha256-Bp3Jsq1Jn8q4EesBlcOVNwnEipNpzYs73kvR3+3EUC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73d699a6ff1e83df3fd6c1e60931e13667b8ae14", + "rev": "f471be9644f3ab2f3cb868de1787ab70a537b0e7", "type": "github" }, "original": { @@ -860,11 +860,11 @@ ] }, "locked": { - "lastModified": 1710036830, - "narHash": "sha256-pnV4gO3N/7/GzyRSKTRlSfS/19KJiPSvYcL4apnSkoQ=", + "lastModified": 1710641527, + "narHash": "sha256-R9JZEevtSyg7++LEryYJRrfyEe45azJxmu2k9VezEW0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c", + "rev": "50db54295d3922a3b7a40d580b84d75150b36c34", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f15dfa1..1016c5d 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ lanzaboote.url = "github:nix-community/lanzaboote"; # Jovian nixos (steam deck) - jovian.url = "github:Lillian-Violet/Jovian-NixOS-bcachefs"; + jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; # Home manager home-manager.url = "github:nix-community/home-manager/master"; diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 3901309..d9ac4a3 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -6,8 +6,6 @@ pkgs, ... }: { - environment.systemPackages = with pkgs; [auto-mount]; - services.udev.extraRules = '' KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" @@ -17,6 +15,7 @@ KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" ''; systemd.services."external-drive-mount@" = { + path = with pkgs; [jq coreutils udisks]; enable = true; description = "Mount External Drive on %i"; serviceConfig = { diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 0044ab2..ca2955e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -211,13 +211,13 @@ # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. - boot.loader.systemd-boot.enable = lib.mkForce false; + boot.loader.systemd-boot.enable = true; boot.initrd.systemd.enable = true; - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; + # boot.lanzaboote = { + # enable = true; + # pkiBundle = "/etc/secureboot"; + # }; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; From 3111ffeb03540ffdd9f5faca756cccbac6a5db84 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 16:48:59 +0100 Subject: [PATCH 1505/2308] Revert kernel to latest or now --- nixos/hosts/shodan/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index ca2955e..841aee8 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -214,6 +214,8 @@ boot.loader.systemd-boot.enable = true; boot.initrd.systemd.enable = true; + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + # boot.lanzaboote = { # enable = true; # pkiBundle = "/etc/secureboot"; From d1a5f75cd08f8cf45002fc56bc77f169679dc93f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 16:50:15 +0100 Subject: [PATCH 1506/2308] update flake lock --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 4b349db..21c76c4 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1710724748, - "narHash": "sha256-aXlifKr6Brg0SBUBgRNEBaZf3JLUeGhM9BX2gam+vvo=", + "lastModified": 1710906792, + "narHash": "sha256-kFzpfZcInLhBFWHy452NlvFuzNr0BDEkz3w9Sgg2ypo=", "owner": "nix-community", "repo": "disko", - "rev": "c09c3a9639690f94ddff44c3dd25c85602e5aeb2", + "rev": "e9875b969086a53dff5ec4677575ad3156fc875d", "type": "github" }, "original": { @@ -410,16 +410,16 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1710856083, - "narHash": "sha256-kG/jMBaXlt+6LxL5uqOut9H1flEpLkAv7IezFKs4djA=", - "owner": "Lillian-Violet", - "repo": "Jovian-NixOS-bcachefs", - "rev": "2d9c09d9016af9ac8311c30f5b8a6f9a7ae6a427", + "lastModified": 1710915975, + "narHash": "sha256-yOc0AD6ba7mbialNciZGzuSQLMo4CopoZGEfcUugA4I=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "179d73fbe14c5bdb835d10bcc1c783466112bfa6", "type": "github" }, "original": { - "owner": "Lillian-Violet", - "repo": "Jovian-NixOS-bcachefs", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", "type": "github" } }, @@ -622,11 +622,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710827359, - "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=", + "lastModified": 1710889954, + "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710127d9693421e78cca4f74fac2db6d67162b1", + "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { From 0c6b872152b8ca05e4dac930e3da6aa80a357c9c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 16:55:00 +0100 Subject: [PATCH 1507/2308] add efitools an sbctl to shodan --- nixos/hosts/shodan/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 841aee8..f48fe9c 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -51,6 +51,7 @@ #System: alejandra btrfs-progs + efitools git git-filter-repo home-manager @@ -62,6 +63,7 @@ oh-my-zsh rsync rustdesk + sbctl wget zsh From d887ee5220d0f5818e51b6bd869dc736986cb1cf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 17:01:59 +0100 Subject: [PATCH 1508/2308] Make shodan's disk ext4 --- disko/shodan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disko/shodan/default.nix b/disko/shodan/default.nix index 1375e5a..0ce86bc 100644 --- a/disko/shodan/default.nix +++ b/disko/shodan/default.nix @@ -57,7 +57,7 @@ size = "100%FREE"; content = { type = "filesystem"; - format = "bcachefs"; + format = "ext4"; mountpoint = "/"; mountOptions = [ "defaults" From ee0f382c0c98cc7b193cf9b37ad3de15c2bf1b47 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 17:43:53 +0100 Subject: [PATCH 1509/2308] No more bcachefs --- nixos/hosts/shodan/auto-mount.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index d9ac4a3..814bf47 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -15,7 +15,7 @@ KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks]; + path = with pkgs; [jq coreutils udisks bash]; enable = true; description = "Mount External Drive on %i"; serviceConfig = { diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f48fe9c..d2e6faa 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -216,8 +216,6 @@ boot.loader.systemd-boot.enable = true; boot.initrd.systemd.enable = true; - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - # boot.lanzaboote = { # enable = true; # pkiBundle = "/etc/secureboot"; From eed02cce8447fcb750ad47f1e050e2fcbf5f8128 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 18:14:29 +0100 Subject: [PATCH 1510/2308] remove bcachefs tools shodan --- nixos/desktop/default.nix | 1 + nixos/shared/packages/default.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 54cdecc..660e2ec 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -34,6 +34,7 @@ # System tools aha + bcachefs-tools direnv git-filter-repo gnupg diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index a91bdbd..4577fb9 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -26,7 +26,6 @@ # System tools age alejandra - bcachefs-tools e2fsprogs git git-filter-repo From 708e4fbefcd491395f6bae190f2042ec905adaa3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 18:17:57 +0100 Subject: [PATCH 1511/2308] remove the comment even? --- nixos/hosts/shodan/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index d2e6faa..80bb449 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -208,7 +208,6 @@ security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables # tss group has access to TPM devices - # boot.supportedFilesystems = ["bcachefs"]; # Lanzaboote currently replaces the systemd-boot module. # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false From dd9348b67269b66e478510d4b0250fa5a47798e7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 19:42:38 +0100 Subject: [PATCH 1512/2308] Try this iso, remove all references to bcachefs from shodan --- flake.nix | 24 +++-- home-manager/hosts/iso/default.nix | 13 +++ home-manager/hosts/iso/lillian.nix | 29 +++++++ nixos/hosts/iso/configuration.nix | 135 +++++++++++++++++++++++++++++ nixos/hosts/iso/secrets/sops.yaml | 21 +++++ 5 files changed, 214 insertions(+), 8 deletions(-) create mode 100644 home-manager/hosts/iso/default.nix create mode 100644 home-manager/hosts/iso/lillian.nix create mode 100644 nixos/hosts/iso/configuration.nix create mode 100644 nixos/hosts/iso/secrets/sops.yaml diff --git a/flake.nix b/flake.nix index 1016c5d..13ef2c0 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,7 @@ linger, pihole, lanzaboote, + jovian, nixos-hardware, conduit, ... @@ -134,9 +135,7 @@ } ]; }; - }; - nixosConfigurations = { GLaDOS = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; @@ -152,9 +151,7 @@ } ]; }; - }; - nixosConfigurations = { queen = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; @@ -166,9 +163,7 @@ simple-nixos-mailserver.nixosModule ]; }; - }; - nixosConfigurations = { shodan = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; @@ -178,15 +173,28 @@ sops-nix.nixosModules.sops lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko + jovian.nixosModules.jovian + home-manager.nixosModules.home-manager + { + home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; + } + ]; + }; + + ISO = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [ + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + ./nixos/hosts/iso/configuration.nix + sops-nix.nixosModules.sops home-manager.nixosModules.home-manager { home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; } ]; }; - }; - nixosConfigurations = { wheatley = nixpkgs.lib.nixosSystem { system = "armv7l-linux"; specialArgs = {inherit inputs outputs;}; diff --git a/home-manager/hosts/iso/default.nix b/home-manager/hosts/iso/default.nix new file mode 100644 index 0000000..c17b81a --- /dev/null +++ b/home-manager/hosts/iso/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + ./lillian.nix + ]; +} diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix new file mode 100644 index 0000000..d6a4544 --- /dev/null +++ b/home-manager/hosts/iso/lillian.nix @@ -0,0 +1,29 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ../../desktop + ]; + + home.packages = with pkgs; [ + ]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "24.05"; +} diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix new file mode 100644 index 0000000..3f4d419 --- /dev/null +++ b/nixos/hosts/iso/configuration.nix @@ -0,0 +1,135 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + nixpkgs-stable, + ... +}: { + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + # outputs.nixosModules.contabo.wan + inputs.home-manager.nixosModules.home-manager + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.defaults + + # Import shared settings + ../../shared + ]; + + boot.tmp.cleanOnBoot = true; + zramSwap.enable = false; + networking.domain = ""; + services.openssh = { + enable = true; + # require public key authentication for better security + settings.PasswordAuthentication = false; + settings.KbdInteractiveAuthentication = false; + settings.PermitRootLogin = "no"; + }; + + nixpkgs = { + # You can add overlays here + overlays = [ + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys + sops.defaultSopsFile = ./secrets/sops.yaml; + + environment.systemPackages = with pkgs; [ + # Custom tools + dvd + dvt + servo + restart + install-nix + + # System tools + aha + direnv + efitools + git-filter-repo + gnupg + pciutils + sbctl + tpm2-tools + tpm2-tss + waydroid + zsh + + # KDE/QT + krunner-translator + kdePackages.discover + kdePackages.kcalc + kdePackages.kdepim-addons + kdePackages.kirigami + kdePackages.kdeconnect-kde + # kdePackages.krunner-ssh + # kdePackages.krunner-symbols + kdePackages.packagekit-qt + kdePackages.plasma-pa + kdePackages.sddm-kcm + kdePackages.dolphin-plugins + libportal-qt5 + libportal + ]; + + # Enable networking + networking.networkmanager.enable = true; + + # Contabo ipv6 nameservers: "2a02:c207::1:53" "2a02:c207::2:53" + + networking.firewall.enable = true; + + networking.firewall.allowedTCPPorts = [22]; + + programs.kdeconnect.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = ""; + options = "terminate:ctrl_alt_bksp,compose:caps_toggle"; + }; + + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + security.tpm2.enable = true; + security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so + security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables + users.users.lillian.extraGroups = ["tss"]; # tss group has access to TPM devices + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + programs.git = { + enable = true; + }; + + programs.direnv = { + enable = true; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../../home-manager/hosts/iso; + }; + }; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "unstable"; +} diff --git a/nixos/hosts/iso/secrets/sops.yaml b/nixos/hosts/iso/secrets/sops.yaml new file mode 100644 index 0000000..92548c8 --- /dev/null +++ b/nixos/hosts/iso/secrets/sops.yaml @@ -0,0 +1,21 @@ +lillian-password: ENC[AES256_GCM,data:eQzZwGxK9Lw2gc8HDNw57odxPzTH4sa/2O97h3VAghRwLClmCYKT91kxj2F3kQ4iEctBl0GxdS4WoL3H9eE4/CAPffXdTmkdYg==,iv:2ezB4DNHFv5ceJ2gtATV12Azm3vFFDLX1qSSy+cKuMY=,tag:zxb5agUCDpi92bYV7+DmoA==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArbVd5bkxmV2FSNDVCWXN1 + RGxwdVZ5ZEROQTZ1d2ptU1RJc0dTUVlVOTE4CjhjeklubEhwUFgydkFWbDJkcU1U + VnowU29NSG10a3VKbXk3RWNWY0FwZ1EKLS0tIDJYMXhGeXArRnZ1NmQwQ3NqVHdM + dXlaN3dWOUl4Mys2V0x3Z3F6UVU4MVUKEJYpX8XhSNcM+7aUuxnIwrokY0/29Cnh + yz0HAZkaj8FwvnPnafo5jmwVyi6WXECvX5E0NZfjKH4AF5vTu6Wukg== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-03-20T18:17:48Z" + mac: ENC[AES256_GCM,data:3UHIoYPHC6n56CHguOVuoFd9VwCjGiD9VCYy2d5W+4XQEZpjnONX8fhwwWRm42COymz89tmqDmpDp88BnSU8uE14IaCIUoxfCaRiZtjAiHjouua2jr50aUV56pwyan8ZiiOjP8oP1VY/tsv1w0jWI9TjSTHvCdNLR8XEcf6bCrk=,iv:/lBJdkQgwZyiztQ9vSoHgY+WxXJKHFI93dxtOSunHNo=,tag:lLwrSdzoN9CzmyIdLOe5ig==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 From 633f07d12e07d38516b00f4efc25e953a475096d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 19:46:42 +0100 Subject: [PATCH 1513/2308] Some iso fixes --- flake.nix | 1 + nixos/hosts/iso/configuration.nix | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/flake.nix b/flake.nix index 13ef2c0..0f6f07e 100644 --- a/flake.nix +++ b/flake.nix @@ -182,6 +182,7 @@ }; ISO = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index 3f4d419..c3393fb 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -122,6 +122,17 @@ # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; + # kde power settings do not turn off screen + systemd = { + services.sshd.wantedBy = pkgs.lib.mkForce ["multi-user.target"]; + targets = { + sleep.enable = false; + suspend.enable = false; + hibernate.enable = false; + hybrid-sleep.enable = false; + }; + }; + home-manager = { extraSpecialArgs = {inherit inputs outputs;}; users = { From f480fcb86d474d0d37af29d8fa50a54261ac422e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 19:50:29 +0100 Subject: [PATCH 1514/2308] Update install a little more --- pkgs/install-nix-no-inhibit/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index aef1360..ea7ffeb 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -7,7 +7,7 @@ writeShellApplication { name = "install-nix-no-inhibit"; - runtimeInputs = []; + runtimeInputs = [git gum]; text = '' # An install script for NixOS installation to /tmp @@ -25,6 +25,16 @@ writeShellApplication select dir in "''${dirs[@]}"; do echo "you selected ''${dir}"; break; done popd > /dev/null pushd ./install-nix > /dev/null + gum confirm --default=false \ + "🔥 🔥 🔥 WARNING!!!! This will ERASE ALL DATA on the disk for ''${dir}. Are you sure you want to continue?" + + echo "Partitioning Disks" + sudo nix run github:nix-community/disko \ + --extra-experimental-features "nix-command flakes" \ + --no-write-lock-file \ + -- \ + --mode zap_create_mount \ + "./disko/''${dir}/default.nix" echo "NixOS Installing..." systemd-inhibit --what=idle sudo nixos-install --flake .#"''${dir}" popd > /dev/null From 2de6b9d2c9a54ae075bd98ec6ddcd6b92a2bf7d4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 19:55:16 +0100 Subject: [PATCH 1515/2308] Small fixes to iso --- nixos/hosts/iso/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index c3393fb..3202a6f 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -27,7 +27,6 @@ # require public key authentication for better security settings.PasswordAuthentication = false; settings.KbdInteractiveAuthentication = false; - settings.PermitRootLogin = "no"; }; nixpkgs = { @@ -44,6 +43,8 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ./secrets/sops.yaml; + services.desktopManager.plasma6.enable = true; + environment.systemPackages = with pkgs; [ # Custom tools dvd From 5b08d092c746ad603a2ae4280880554d4484a3aa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 21:07:22 +0100 Subject: [PATCH 1516/2308] That's not supposed to be there! --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 80bb449..e6833d9 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -22,7 +22,7 @@ # ./nvim.nix ./hardware-configuration.nix - ../../../disko/EDI + ../../../disko/shodan ./auto-mount.nix ]; From 32ad2da056dedb824c081bf2ffcedeca1857132e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 21:12:30 +0100 Subject: [PATCH 1517/2308] Add bcachefs support to install ISO --- nixos/hosts/iso/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index 3202a6f..aa2de2c 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -142,6 +142,9 @@ }; }; + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + boot.supportedFilesystems = ["bcachefs"]; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; } From c55c65998c264908a981d983ee05ce41eea4a650 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 21:54:29 +0100 Subject: [PATCH 1518/2308] Disable zfs for ISO --- nixos/hosts/iso/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index aa2de2c..f8efbdb 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -143,7 +143,7 @@ }; boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - boot.supportedFilesystems = ["bcachefs"]; + boot.supportedFilesystems = lib.mkForce ["bcachefs" "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; From 83e04ab281cc7a99dc6d08c90f811db9350357fc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:16:40 +0100 Subject: [PATCH 1519/2308] Let's try this then --- nixos/hosts/shodan/auto-mount.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 814bf47..af339de 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -15,14 +15,14 @@ KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks bash]; + path = with pkgs; [jq coreutils udisks bash automount]; enable = true; description = "Mount External Drive on %i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = "/run/current-system/sw/bin/automount add %i"; - ExecStop = "/run/current-system/sw/bin/automount remove %i"; + ExecStart = "automount add %i"; + ExecStop = "automount remove %i"; }; }; } From adbd60c26627d19c55a404dd0093bd75a00af879 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:18:10 +0100 Subject: [PATCH 1520/2308] Can't add that --- nixos/hosts/shodan/auto-mount.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index af339de..63f64d7 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -15,7 +15,7 @@ KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks bash automount]; + path = with pkgs; [jq coreutils udisks bash]; enable = true; description = "Mount External Drive on %i"; serviceConfig = { From 3524b157f62b4df5883aa52a8a38d93e6634e841 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:21:23 +0100 Subject: [PATCH 1521/2308] Maybe get the name right.... --- nixos/hosts/shodan/auto-mount.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 63f64d7..e9b031f 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -15,14 +15,14 @@ KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks bash]; + path = with pkgs; [jq coreutils udisks bash auto-mount]; enable = true; description = "Mount External Drive on %i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = "automount add %i"; - ExecStop = "automount remove %i"; + ExecStart = "auto-mount add %i"; + ExecStop = "auto-mount remove %i"; }; }; } From c63150ce2d3eca0e3fab71d8bfd1ea28dd94714a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:23:40 +0100 Subject: [PATCH 1522/2308] add auto-mount to shodan --- nixos/hosts/shodan/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index e6833d9..474e628 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -48,6 +48,9 @@ sops.defaultSopsFile = ./secrets/sops.yaml; environment.systemPackages = with pkgs; [ + # Custom tools + auto-mount + #System: alejandra btrfs-progs From 6b0155a6b4d1850fab8a06b21695f29724a76a3b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:26:41 +0100 Subject: [PATCH 1523/2308] Maybe this then --- nixos/hosts/shodan/auto-mount.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index e9b031f..d44b212 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -21,8 +21,8 @@ serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = "auto-mount add %i"; - ExecStop = "auto-mount remove %i"; + ExecStart = "${pkgs.auto-mount} add %i"; + ExecStop = "${pkgs.auto-mount} remove %i"; }; }; } From 5df487f073d40b4a8ef8bc194c346322586c6b1d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:35:27 +0100 Subject: [PATCH 1524/2308] Maybe this will work? --- nixos/hosts/shodan/auto-mount.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index d44b212..f4d4834 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -21,8 +21,8 @@ serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = "${pkgs.auto-mount} add %i"; - ExecStop = "${pkgs.auto-mount} remove %i"; + script = "auto-mount add %i"; + preStop = "auto-mount remove %i"; }; }; } From 0b88a87abe8d06b0086e4c93c2cc800abf573593 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:40:09 +0100 Subject: [PATCH 1525/2308] That didn't work --- nixos/hosts/shodan/auto-mount.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index f4d4834..db7c511 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -18,11 +18,11 @@ path = with pkgs; [jq coreutils udisks bash auto-mount]; enable = true; description = "Mount External Drive on %i"; + script = "auto-mount add %i"; + preStop = "auto-mount remove %i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - script = "auto-mount add %i"; - preStop = "auto-mount remove %i"; }; }; } From b62c29ec45cb799536b762e0a85794446a668ca6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:42:25 +0100 Subject: [PATCH 1526/2308] add flock as a requirement --- nixos/hosts/shodan/auto-mount.nix | 2 +- nixos/hosts/shodan/configuration.nix | 1 + pkgs/auto-mount/default.nix | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index db7c511..601fcf7 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -15,7 +15,7 @@ KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks bash auto-mount]; + path = with pkgs; [jq coreutils udisks bash flock auto-mount]; enable = true; description = "Mount External Drive on %i"; script = "auto-mount add %i"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 474e628..aa32396 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -55,6 +55,7 @@ alejandra btrfs-progs efitools + flock git git-filter-repo home-manager diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index ff231f0..c61b32c 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -4,6 +4,7 @@ jq, coreutils, udisks, + flock, writeShellApplication, }: writeShellApplication @@ -12,7 +13,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks]; + runtimeInputs = [jq coreutils udisks flock]; text = '' set -euo pipefail From f4193b5ef65fed49daf6bb026e4145003f5ceef3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:44:34 +0100 Subject: [PATCH 1527/2308] util-linux might be better --- nixos/hosts/shodan/auto-mount.nix | 2 +- nixos/hosts/shodan/configuration.nix | 1 - pkgs/auto-mount/default.nix | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 601fcf7..3ef57c0 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -15,7 +15,7 @@ KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks bash flock auto-mount]; + path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; script = "auto-mount add %i"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index aa32396..474e628 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -55,7 +55,6 @@ alejandra btrfs-progs efitools - flock git git-filter-repo home-manager diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index c61b32c..48c4ad1 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -4,7 +4,7 @@ jq, coreutils, udisks, - flock, + util-linux, writeShellApplication, }: writeShellApplication @@ -13,7 +13,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks flock]; + runtimeInputs = [jq coreutils udisks util-linux]; text = '' set -euo pipefail From 12214c45e7cd51d6f0e014bd6134c8e40ad2aff2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:50:30 +0100 Subject: [PATCH 1528/2308] Maybe this will work? --- result | 1 + 1 file changed, 1 insertion(+) create mode 120000 result diff --git a/result b/result new file mode 120000 index 0000000..ed246ab --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/a9kdf62qv1r5s0nb40a1ij9lm2vsh418-nixos-24.05.20240319.b06025f-x86_64-linux.iso \ No newline at end of file From 9982a52479b793c01a558e1e78436d201d754d7e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:50:43 +0100 Subject: [PATCH 1529/2308] Oops wrong upload --- nixos/hosts/shodan/auto-mount.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 3ef57c0..2a3601b 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -18,9 +18,9 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount add %i"; - preStop = "auto-mount remove %i"; serviceConfig = { + execStart = "auto-mount add %i"; + execStop = "auto-mount remove %i"; Type = "oneshot"; RemainAfterExit = true; }; From 442374fb10aadd132fcb2d7f049778d7ab39612e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:52:58 +0100 Subject: [PATCH 1530/2308] Capitalisation... --- nixos/hosts/shodan/auto-mount.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 2a3601b..2df391f 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -19,8 +19,8 @@ enable = true; description = "Mount External Drive on %i"; serviceConfig = { - execStart = "auto-mount add %i"; - execStop = "auto-mount remove %i"; + ExecStart = "auto-mount add %i"; + ExecStop = "auto-mount remove %i"; Type = "oneshot"; RemainAfterExit = true; }; From 7ffdcc0c93b74580d9b151dbbc52ee1ad1bdaf36 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Mar 2024 23:56:37 +0100 Subject: [PATCH 1531/2308] This is frustrating --- nixos/hosts/shodan/auto-mount.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 2df391f..4aef501 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -19,8 +19,8 @@ enable = true; description = "Mount External Drive on %i"; serviceConfig = { - ExecStart = "auto-mount add %i"; - ExecStop = "auto-mount remove %i"; + ExecStart = "${pkgs.auto-mount} add %i"; + ExecStop = "${pkgs.auto-mount} remove %i"; Type = "oneshot"; RemainAfterExit = true; }; From 84f7b0509a34269efcea8ff3d240e625df6d8b85 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:05:37 +0100 Subject: [PATCH 1532/2308] Let's try this then --- nixos/hosts/shodan/auto-mount.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 4aef501..ff638fb 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -9,20 +9,35 @@ services.udev.extraRules = '' KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-unmount@%k.service" KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-unmount@%k.service" KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" + KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-unmount@%k.service" ''; systemd.services."external-drive-mount@" = { path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; + script = "auto-mount"; + scriptArgs = "add %i"; serviceConfig = { - ExecStart = "${pkgs.auto-mount} add %i"; - ExecStop = "${pkgs.auto-mount} remove %i"; Type = "oneshot"; RemainAfterExit = true; }; }; + + systemd.services."external-drive-unmount@" = { + path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; + enable = true; + description = "Mount External Drive on %i"; + script = "auto-mount"; + scriptArgs = "remove %i"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = false; + }; + }; } From 301af9dc32300868f14b441275e486470af59bc6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:12:31 +0100 Subject: [PATCH 1533/2308] Last shot --- nixos/hosts/shodan/auto-mount.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index ff638fb..b030b21 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -21,8 +21,8 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount"; - scriptArgs = "add %i"; + script = "auto-mount add"; + scriptArgs = "%i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -33,8 +33,8 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount"; - scriptArgs = "remove %i"; + script = "auto-mount remove"; + scriptArgs = "%i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = false; From 9aaea046a2f5ee222bd0b6425a65ad7f6ae8aa56 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:27:10 +0100 Subject: [PATCH 1534/2308] Oh dope --- nixos/hosts/shodan/auto-mount.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index b030b21..ac5b56a 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -17,11 +17,12 @@ KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-unmount@%k.service" ''; + systemd.services."external-drive-mount@" = { path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount add"; + script = "auto-mount add "; scriptArgs = "%i"; serviceConfig = { Type = "oneshot"; From faca909eb0759ec0e1e997aa5199b300da76bd86 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:27:50 +0100 Subject: [PATCH 1535/2308] The other space as well --- nixos/hosts/shodan/auto-mount.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index ac5b56a..d165e06 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -34,7 +34,7 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount remove"; + script = "auto-mount remove "; scriptArgs = "%i"; serviceConfig = { Type = "oneshot"; From 9cd823818c9eacbd13e74d59c7c8dd8296cab321 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:28:26 +0100 Subject: [PATCH 1536/2308] Let's try this --- nixos/hosts/shodan/auto-mount.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index d165e06..06cf81e 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -22,8 +22,8 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount add "; - scriptArgs = "%i"; + script = "auto-mount add"; + scriptArgs = " %i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -34,8 +34,8 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount remove "; - scriptArgs = "%i"; + script = "auto-mount remove"; + scriptArgs = " %i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = false; From f89e9796fa96d01edcd86d47bd0ebfc9ce85803d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:37:07 +0100 Subject: [PATCH 1537/2308] Let's try this then --- nixos/hosts/shodan/auto-mount.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 06cf81e..dbeee45 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -22,8 +22,7 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount add"; - scriptArgs = " %i"; + script = "auto-mount add $@"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -34,8 +33,7 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount remove"; - scriptArgs = " %i"; + script = "auto-mount remove $@"; serviceConfig = { Type = "oneshot"; RemainAfterExit = false; From 585b794251e1b88800ea603fff8eff3d9ea925df Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:45:25 +0100 Subject: [PATCH 1538/2308] First argument then --- nixos/hosts/shodan/auto-mount.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index dbeee45..f223b87 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -22,7 +22,7 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount add $@"; + script = "auto-mount add $1"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -33,7 +33,7 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount remove $@"; + script = "auto-mount remove $1"; serviceConfig = { Type = "oneshot"; RemainAfterExit = false; From 92f86fdfae48a98d97c15d162bff6839b66b7464 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:47:47 +0100 Subject: [PATCH 1539/2308] try an echo --- nixos/hosts/shodan/auto-mount.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index f223b87..385f69f 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -22,7 +22,7 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; description = "Mount External Drive on %i"; - script = "auto-mount add $1"; + script = "echo auto-mount add $1 && auto-mount add $1"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; From 05d9dd368a0ecd6f6cf9844d40f879b26488f1e7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:49:37 +0100 Subject: [PATCH 1540/2308] Maybe it only digests once? --- nixos/hosts/shodan/auto-mount.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 385f69f..568bf95 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -21,8 +21,7 @@ systemd.services."external-drive-mount@" = { path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; - description = "Mount External Drive on %i"; - script = "echo auto-mount add $1 && auto-mount add $1"; + script = "echo auto-mount add $@ && auto-mount add $@"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -32,7 +31,6 @@ systemd.services."external-drive-unmount@" = { path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; - description = "Mount External Drive on %i"; script = "auto-mount remove $1"; serviceConfig = { Type = "oneshot"; From e3ae2429c77bb37befe24600cb85e9807b97fff7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:51:28 +0100 Subject: [PATCH 1541/2308] Try this again? --- nixos/hosts/shodan/auto-mount.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 568bf95..744811f 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -21,7 +21,7 @@ systemd.services."external-drive-mount@" = { path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; - script = "echo auto-mount add $@ && auto-mount add $@"; + script = "echo auto-mount add %i && auto-mount add %i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; From 19f8b887d3db517c613a74bcdd6c8814560df6fb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:53:11 +0100 Subject: [PATCH 1542/2308] Oh wait am I dumb --- nixos/hosts/shodan/auto-mount.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 744811f..23b6398 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -21,7 +21,8 @@ systemd.services."external-drive-mount@" = { path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; - script = "echo auto-mount add %i && auto-mount add %i"; + script = "echo auto-mount $@"; + scriptArgs = " %i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; From a373404b3b64061196e60d305898557928e27c2d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 00:56:04 +0100 Subject: [PATCH 1543/2308] Auto-mount for steam deck fixed --- nixos/hosts/shodan/auto-mount.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 23b6398..9d35bc2 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -22,7 +22,7 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; script = "echo auto-mount $@"; - scriptArgs = " %i"; + scriptArgs = "%i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -32,7 +32,8 @@ systemd.services."external-drive-unmount@" = { path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; - script = "auto-mount remove $1"; + script = "auto-mount remove $@"; + scriptArgs = "%i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = false; From 4a55e924c3adeec8303c37e04b348d1c4ef310dd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 01:03:53 +0100 Subject: [PATCH 1544/2308] Enable lanzaboot again on shodan --- nixos/hosts/shodan/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 474e628..6d92603 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -215,13 +215,13 @@ # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. - boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.enable = lib.mkForce false; boot.initrd.systemd.enable = true; - # boot.lanzaboote = { - # enable = true; - # pkiBundle = "/etc/secureboot"; - # }; + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; From 5dfd9aff8636fb88c942fd9235963b611d2086f4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 01:15:07 +0100 Subject: [PATCH 1545/2308] Quiet boot for shodan again --- nixos/hosts/shodan/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 6d92603..aed0c61 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -225,9 +225,9 @@ boot.loader.systemd-boot.configurationLimit = 3; boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; - #boot.consoleLogLevel = 0; - #boot.kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; - #boot.plymouth.enable = true; + boot.consoleLogLevel = 0; + boot.kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; + boot.plymouth.enable = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "unstable"; From 4178072d62a7786d06f62ee7e4b6be979693a073 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 12:09:57 +0100 Subject: [PATCH 1546/2308] Actually make the service auto mount please? --- nixos/hosts/shodan/auto-mount.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 9d35bc2..b031289 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -21,7 +21,7 @@ systemd.services."external-drive-mount@" = { path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; - script = "echo auto-mount $@"; + script = "auto-mount add $@"; scriptArgs = "%i"; serviceConfig = { Type = "oneshot"; From 5d1bd82ba4bef33e767b42f494fa1921974aec13 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 13:19:36 +0100 Subject: [PATCH 1547/2308] Try this to restart it --- nixos/hosts/shodan/auto-mount.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index b031289..a2d26db 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -22,21 +22,11 @@ path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; enable = true; script = "auto-mount add $@"; + preStop = "auto-mount remove $@"; scriptArgs = "%i"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; }; }; - - systemd.services."external-drive-unmount@" = { - path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; - enable = true; - script = "auto-mount remove $@"; - scriptArgs = "%i"; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = false; - }; - }; } From 464129a7e7b1f3c817598489dd94f23f741d81a5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 13:43:22 +0100 Subject: [PATCH 1548/2308] Make sure pgrep is available --- nixos/hosts/shodan/auto-mount.nix | 2 +- pkgs/auto-mount/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index a2d26db..bfe9b1b 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -19,7 +19,7 @@ ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks bash util-linux auto-mount]; + path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount]; enable = true; script = "auto-mount add $@"; preStop = "auto-mount remove $@"; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 48c4ad1..7801df2 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -13,7 +13,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux]; + runtimeInputs = [jq coreutils udisks util-linux toybox]; text = '' set -euo pipefail From 7dae09a986893f12e62a197e4d5ba463be5ed964 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 13:44:10 +0100 Subject: [PATCH 1549/2308] add it to inputs too --- pkgs/auto-mount/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 7801df2..c3b8347 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -4,6 +4,7 @@ jq, coreutils, udisks, + toybox, util-linux, writeShellApplication, }: From 2459cea831b641204dc86b0b18f278988ac81ae8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 13:52:07 +0100 Subject: [PATCH 1550/2308] Let's see what it does then --- nixos/hosts/shodan/auto-mount.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index bfe9b1b..6d0a527 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -22,7 +22,7 @@ path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount]; enable = true; script = "auto-mount add $@"; - preStop = "auto-mount remove $@"; + preStop = "echo auto-mount remove $@"; scriptArgs = "%i"; serviceConfig = { Type = "oneshot"; From e7baa0445536e2033a93d7171c3c87abdda368bc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 13:55:02 +0100 Subject: [PATCH 1551/2308] Try again then --- nixos/hosts/shodan/auto-mount.nix | 2 +- nixos/hosts/shodan/configuration.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 6d0a527..11b3273 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -22,7 +22,7 @@ path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount]; enable = true; script = "auto-mount add $@"; - preStop = "echo auto-mount remove $@"; + postStop = "echo auto-mount remove $@"; scriptArgs = "%i"; serviceConfig = { Type = "oneshot"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index aed0c61..3e26652 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -67,6 +67,7 @@ rsync rustdesk sbctl + toybox wget zsh From 2ba8c3f126d619b99e6ad0dbe55b3d3c91f69960 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 14:03:11 +0100 Subject: [PATCH 1552/2308] Let's try this then, echo only first --- nixos/hosts/shodan/auto-mount.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 11b3273..69b1760 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -21,10 +21,10 @@ systemd.services."external-drive-mount@" = { path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount]; enable = true; - script = "auto-mount add $@"; - postStop = "echo auto-mount remove $@"; scriptArgs = "%i"; serviceConfig = { + execStart = "echo ${pkgs.auto-mount} add $@"; + execStop = "echo ${pkgs.auto-mount} remove $@"; Type = "oneshot"; RemainAfterExit = true; }; From a0c64de181182fd9c9b092a3bb0e62f45e96df34 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 14:05:46 +0100 Subject: [PATCH 1553/2308] Fix a typo --- nixos/hosts/shodan/auto-mount.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 69b1760..9338062 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -22,9 +22,10 @@ path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount]; enable = true; scriptArgs = "%i"; + serviceConfig = { - execStart = "echo ${pkgs.auto-mount} add $@"; - execStop = "echo ${pkgs.auto-mount} remove $@"; + ExecStart = "echo ${pkgs.auto-mount} add $@"; + ExecStop = "echo ${pkgs.auto-mount} remove $@"; Type = "oneshot"; RemainAfterExit = true; }; From b52ae19a64e16ac72e63cb27567c75465715bd1d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 14:12:22 +0100 Subject: [PATCH 1554/2308] Hmm --- nixos/hosts/shodan/auto-mount.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 9338062..74a3eba 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -24,8 +24,8 @@ scriptArgs = "%i"; serviceConfig = { - ExecStart = "echo ${pkgs.auto-mount} add $@"; - ExecStop = "echo ${pkgs.auto-mount} remove $@"; + ExecStart = "${pkgs.toybox}/bin/echo ${pkgs.auto-mount} add %i"; + ExecStop = "${pkgs.toybox}/bin/echo ${pkgs.auto-mount} remove %i"; Type = "oneshot"; RemainAfterExit = true; }; From 15a24a1a61264dfff7a2374ebbb2dc261daafeb0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 14:15:16 +0100 Subject: [PATCH 1555/2308] Alrighty this should execute correctly then, auto-mount ACTUALLY fixed --- nixos/hosts/shodan/auto-mount.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 74a3eba..b323eb3 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -24,8 +24,8 @@ scriptArgs = "%i"; serviceConfig = { - ExecStart = "${pkgs.toybox}/bin/echo ${pkgs.auto-mount} add %i"; - ExecStop = "${pkgs.toybox}/bin/echo ${pkgs.auto-mount} remove %i"; + ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; + ExecStop = "${pkgs.auto-mount}/bin/auto-mount remove %i"; Type = "oneshot"; RemainAfterExit = true; }; From beefb2fb6c84d3290de1e56b662407bb5a955bb7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 14:19:08 +0100 Subject: [PATCH 1556/2308] Install the packages needed for auto-mount explicitly --- nixos/hosts/shodan/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 3e26652..136beab 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -54,6 +54,7 @@ #System: alejandra btrfs-progs + coreutils efitools git git-filter-repo @@ -68,6 +69,8 @@ rustdesk sbctl toybox + udisks + util-linux wget zsh From 9b7505fdc554a79fcff86903ded77883a5785213 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 14:33:31 +0100 Subject: [PATCH 1557/2308] Fix the steam command thing maybe --- nixos/hosts/shodan/auto-mount.nix | 4 +--- pkgs/auto-mount/default.nix | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index b323eb3..42aa919 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -19,10 +19,8 @@ ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount]; + path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount steam]; enable = true; - scriptArgs = "%i"; - serviceConfig = { ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; ExecStop = "${pkgs.auto-mount}/bin/auto-mount remove %i"; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index c3b8347..00c461d 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + steam-fsh, jq, coreutils, udisks, @@ -14,7 +15,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox]; + runtimeInputs = [jq coreutils udisks util-linux toybox steam]; text = '' set -euo pipefail @@ -73,7 +74,7 @@ writeShellApplication if pgrep -x "steam" > /dev/null; then # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess - systemd-run -M 1000@ --user --collect --wait sh -c "./.steam/root/ubuntu12_32/steam steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" From bc039480d82274d19cce03560fcbb9aaf467ed32 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 14:34:44 +0100 Subject: [PATCH 1558/2308] Add pkgs I suppose --- pkgs/auto-mount/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 00c461d..576a421 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -2,6 +2,7 @@ lib, stdenv, steam-fsh, + pkgs, jq, coreutils, udisks, From 88856b24d326790dc13e45c6648d00cc284c8095 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 14:35:15 +0100 Subject: [PATCH 1559/2308] Steam needs pkgs? --- pkgs/auto-mount/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 576a421..1f3af26 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -16,7 +16,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox steam]; + runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam]; text = '' set -euo pipefail From f75598b51423b55f1cf8b0cbbe2e4c893f614ba9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 17:11:38 +0100 Subject: [PATCH 1560/2308] Steam fhs? --- pkgs/auto-mount/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 1f3af26..d66fc7f 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -75,7 +75,7 @@ writeShellApplication if pgrep -x "steam" > /dev/null; then # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess - systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam-fhs steam://''${command}/''${encoded@Q}" echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" From f1a773498fc58d95507b89bc3b8349e0242fcbf7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 17:12:39 +0100 Subject: [PATCH 1561/2308] This then --- pkgs/auto-mount/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index d66fc7f..1d73d3f 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - steam-fsh, + steam, pkgs, jq, coreutils, @@ -16,7 +16,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam]; + runtimeInputs = [jq coreutils udisks util-linux toybox steam]; text = '' set -euo pipefail @@ -75,7 +75,7 @@ writeShellApplication if pgrep -x "steam" > /dev/null; then # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess - systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam-fhs steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "${steam}/bin/steam-fhs steam://''${command}/''${encoded@Q}" echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" From 47ac0bd975e6c08b43665e7d3d4c87c500777bc6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 17:13:40 +0100 Subject: [PATCH 1562/2308] That's a typo --- pkgs/auto-mount/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 1d73d3f..655e968 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -75,7 +75,7 @@ writeShellApplication if pgrep -x "steam" > /dev/null; then # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess - systemd-run -M 1000@ --user --collect --wait sh -c "${steam}/bin/steam-fhs steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "${steam}/bin/steam steam://''${command}/''${encoded@Q}" echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" From 6e661fd3afcbedb5d52617c8d8acaf7fd709d8b2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 17:19:33 +0100 Subject: [PATCH 1563/2308] Echo first --- pkgs/auto-mount/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 655e968..fa6b28f 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -75,8 +75,8 @@ writeShellApplication if pgrep -x "steam" > /dev/null; then # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess - systemd-run -M 1000@ --user --collect --wait sh -c "${steam}/bin/steam steam://''${command}/''${encoded@Q}" echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" + systemd-run -M 1000@ --user --collect --wait sh -c "${steam}/bin/steam steam://''${command}/''${encoded@Q}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" fi From 787a898957fa8c58190e81cb08eee2cc3522edf6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 17:23:24 +0100 Subject: [PATCH 1564/2308] Log file? --- pkgs/auto-mount/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index fa6b28f..a8a3099 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -75,7 +75,7 @@ writeShellApplication if pgrep -x "steam" > /dev/null; then # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess - echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" + echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt systemd-run -M 1000@ --user --collect --wait sh -c "${steam}/bin/steam steam://''${command}/''${encoded@Q}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" From aa361519cc38025e621dcb8cc2aa0c3c919e1a61 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 17:25:40 +0100 Subject: [PATCH 1565/2308] No send url --- pkgs/auto-mount/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index a8a3099..dc9a1e3 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -154,7 +154,7 @@ writeShellApplication options s "$OPTS") || ret=$? if (( ret != 0 )); then - send_steam_url "system/devicemountresult" "''${DEVBASE}/''${MOUNT_ERROR}" + # send_steam_url "system/devicemountresult" "''${DEVBASE}/''${MOUNT_ERROR}" echo "Error mounting ''${DEVICE} (status = $ret)" exit 1 fi @@ -192,12 +192,12 @@ writeShellApplication echo "**** Mounted ''${DEVICE} at ''${mount_point} ****" if [ -f "''${mount_point}/libraryfolder.vdf" ]; then - send_steam_url "addlibraryfolder" "''${mount_point}" + # send_steam_url "addlibraryfolder" "''${mount_point}" else #TODO check permissions are 1000 when creating new SteamLibrary mkdir -p "''${mount_point}/SteamLibrary" chown lillian:users "''${mount_point}/SteamLibrary" - send_steam_url "addlibraryfolder" "''${mount_point}/SteamLibrary" + # send_steam_url "addlibraryfolder" "''${mount_point}/SteamLibrary" fi } @@ -225,7 +225,7 @@ writeShellApplication # This is a truly gnarly way to ensure steam is ready for commands. # TODO literally anything else sleep 6 - send_steam_url "addlibraryfolder" "''${mount_point}" + # send_steam_url "addlibraryfolder" "''${mount_point}" } case "''${ACTION}" in From f14b1746e73cb7126322a0eb7435a08d1d489573 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 17:27:33 +0100 Subject: [PATCH 1566/2308] Give bodies to statements --- pkgs/auto-mount/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index dc9a1e3..393713b 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -192,6 +192,7 @@ writeShellApplication echo "**** Mounted ''${DEVICE} at ''${mount_point} ****" if [ -f "''${mount_point}/libraryfolder.vdf" ]; then + echo " send_steam_url \"addlibraryfolder\" \"''${mount_point}\"" # send_steam_url "addlibraryfolder" "''${mount_point}" else #TODO check permissions are 1000 when creating new SteamLibrary From e84b6527359750a870a71f9a8c7ee1f5e79b975c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 21 Mar 2024 17:33:23 +0100 Subject: [PATCH 1567/2308] Add steam to standard pkgs --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 136beab..29ecd92 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -68,6 +68,7 @@ rsync rustdesk sbctl + steam toybox udisks util-linux From 84b98ade1bb9c88d63147b55440fd52c5a6d70dd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 22 Mar 2024 15:52:42 +0100 Subject: [PATCH 1568/2308] This is breaking reboot --- nixos/hosts/shodan/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 29ecd92..8751969 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -54,7 +54,6 @@ #System: alejandra btrfs-progs - coreutils efitools git git-filter-repo @@ -69,7 +68,6 @@ rustdesk sbctl steam - toybox udisks util-linux wget From 38e0679b52b0d637b62c955326e853d35b0bcd24 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 23 Mar 2024 01:16:35 +0100 Subject: [PATCH 1569/2308] extest from nixkpgs --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 8751969..84cbec5 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -55,6 +55,7 @@ alejandra btrfs-progs efitools + extest git git-filter-repo home-manager From 05e0a862e361af10d5ea7f611d9d8c4b10b25598 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 23 Mar 2024 14:42:57 +0100 Subject: [PATCH 1570/2308] Make downloads a tmpfs --- disko/EDI/default.nix | 8 ++++++++ disko/GLaDOS/default.nix | 8 ++++++++ disko/shodan/default.nix | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/disko/EDI/default.nix b/disko/EDI/default.nix index f8cd5dc..9ffa0bf 100644 --- a/disko/EDI/default.nix +++ b/disko/EDI/default.nix @@ -67,5 +67,13 @@ }; }; }; + nodev = { + "/home/lillian/Downloads" = { + fsType = "tmpfs"; + mountOptions = [ + "size=2G" + ]; + }; + }; }; } diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index 98a0c8a..511b779 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -67,5 +67,13 @@ }; }; }; + nodev = { + "/home/lillian/Downloads" = { + fsType = "tmpfs"; + mountOptions = [ + "size=2G" + ]; + }; + }; }; } diff --git a/disko/shodan/default.nix b/disko/shodan/default.nix index 0ce86bc..b0560b0 100644 --- a/disko/shodan/default.nix +++ b/disko/shodan/default.nix @@ -67,5 +67,13 @@ }; }; }; + nodev = { + "/home/lillian/Downloads" = { + fsType = "tmpfs"; + mountOptions = [ + "size=2G" + ]; + }; + }; }; } From 2bb52e8e32f43a3118ea12783133899f83a2ca2a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 23 Mar 2024 14:45:56 +0100 Subject: [PATCH 1571/2308] Also add /tmp tmpfs --- disko/EDI/default.nix | 6 ++++++ disko/GLaDOS/default.nix | 6 ++++++ disko/shodan/default.nix | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/disko/EDI/default.nix b/disko/EDI/default.nix index 9ffa0bf..5e5f62e 100644 --- a/disko/EDI/default.nix +++ b/disko/EDI/default.nix @@ -74,6 +74,12 @@ "size=2G" ]; }; + "/tmp" = { + fsType = "tmpfs"; + mountOptions = [ + "size=200M" + ]; + }; }; }; } diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index 511b779..dc4710e 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -74,6 +74,12 @@ "size=2G" ]; }; + "/tmp" = { + fsType = "tmpfs"; + mountOptions = [ + "size=200M" + ]; + }; }; }; } diff --git a/disko/shodan/default.nix b/disko/shodan/default.nix index b0560b0..9889536 100644 --- a/disko/shodan/default.nix +++ b/disko/shodan/default.nix @@ -74,6 +74,12 @@ "size=2G" ]; }; + "/tmp" = { + fsType = "tmpfs"; + mountOptions = [ + "size=200M" + ]; + }; }; }; } From 3946155a159b1492f904f7284bce170781018d3a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 23 Mar 2024 14:57:52 +0100 Subject: [PATCH 1572/2308] Add the inputs to requirements --- pkgs/install-nix-no-inhibit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index ea7ffeb..ea1a1d1 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, + git, + gum, writeShellApplication, }: writeShellApplication From c7ed9539d5ed411e707ccd766af1f003ba9300c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 18:44:28 +0100 Subject: [PATCH 1573/2308] Enable unfree in own packages --- flake.nix | 6 +++++- pkgs/auto-mount/default.nix | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 0f6f07e..155b8e1 100644 --- a/flake.nix +++ b/flake.nix @@ -101,7 +101,11 @@ in { # Your custom packages # Accessible through 'nix build', 'nix shell', etc - packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + packages = forAllSystems (system: + import ./pkgs (import nixpkgs { + inherit system; + config.allowUnfree = true; + })); # Formatter for your nix files, available through 'nix fmt' # Other options beside 'alejandra' include 'nixpkgs-fmt' formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 393713b..071338f 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + system, steam, pkgs, jq, From 7dd79974ff06c0d702ec8bacb2334123eb182e9a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 18:49:15 +0100 Subject: [PATCH 1574/2308] Don't need these idle inhibits here --- pkgs/install-nix-no-inhibit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index ea1a1d1..86cf589 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -15,8 +15,8 @@ writeShellApplication # An install script for NixOS installation to /tmp set -e pushd /tmp > /dev/null - systemd-inhibit --what=idle rm -rf ./install-nix - systemd-inhibit --what=idle git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix + rm -rf ./install-nix + git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix pushd ./install-nix/nixos/hosts > /dev/null echo "Please choose the hostname you are installing to from the following list:" i=1 @@ -38,10 +38,10 @@ writeShellApplication --mode zap_create_mount \ "./disko/''${dir}/default.nix" echo "NixOS Installing..." - systemd-inhibit --what=idle sudo nixos-install --flake .#"''${dir}" + sudo nixos-install --flake .#"''${dir}" popd > /dev/null echo "Cleaning up repository in '/tmp/install-nix'..." - systemd-inhibit --what=idle rm -rf ./install-nix + rm -rf ./install-nix popd > /dev/null echo "NixOS Install Succeeded!" ''; From ad166d7e3ba08704bfe7c9529e825884ec0a0c1e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 19:00:35 +0100 Subject: [PATCH 1575/2308] Remove element add nheko --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index e9e49b3..9941781 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -56,7 +56,7 @@ kate # Chat applications: - element-desktop + nheko signal-desktop webcord-vencord From 4a157a612622e99fbb83cae0f960a65e36824652 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 19:29:21 +0100 Subject: [PATCH 1576/2308] Remove this unneeded unmount stuff --- nixos/hosts/shodan/auto-mount.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 42aa919..664322d 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -9,13 +9,10 @@ services.udev.extraRules = '' KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" - KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-unmount@%k.service" KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" - KERNEL=="mmcblk0|mmcblk0p[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-unmount@%k.service" KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" - KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-unmount@%k.service" ''; systemd.services."external-drive-mount@" = { From f3c0a84ccbf3c29716c8e1a8a6b3c18c1e0c3c38 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 20:35:25 +0100 Subject: [PATCH 1577/2308] add coTURN server --- nixos/hosts/queen/secrets/sops.yaml | 5 +- .../server/package-configs/coturn/default.nix | 63 +++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 nixos/server/package-configs/coturn/default.nix diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index 955740b..87cc66f 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -8,6 +8,7 @@ mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8 rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8uo8I8ZymVgIMKLI=,tag:Fr8rWIttLz7X8Pri6FBJBQ==,type:str] wg-private: ENC[AES256_GCM,data:6BEuNqqG//p5UhRmQ4RPEze6jZdvzK4PEXxlbX2ANYIhFpacj0aZnCr9o/A=,iv:tPlwYdV4I5oA8qG+bfVi1Dpbf7xedByantqsmylZXKQ=,tag:k1BqKqlayOWz5QW1XiAjqQ==,type:str] lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW7IUpjHMyS7YP+pmmvDCzM9afIXMxyPFHGNRwiCmxqstiiNeSeLdo6rDw==,iv:sGeu9aNTgdpThv+0Z/nZKIrat1xNgM0t/KTGPaFbsdI=,tag:kZBHF4X0KO9znog61NwU+Q==,type:str] +coturn-auth-secret: ENC[AES256_GCM,data:RYxyATuYIcrGd8h8Gc4CP9ZQ80ekuuwHehnOPYisHejmycgT8a2mWpk+5r3HkFmBNcLDeNlfnhIif5oLHGuHyw==,iv:M2GdNDxP4xpP35FJPTgljbcKpOm6DmEEnIYRItAxDVI=,tag:IiiNXeTi6Yja5PrnKRkhdA==,type:str] sops: kms: [] gcp_kms: [] @@ -23,8 +24,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-02-22T11:53:17Z" - mac: ENC[AES256_GCM,data:bOrEW/yQIgJy7Jqfj/95jtXoIeEX2JNTvsnodkrtmtUQoY8Lczb47rTLpS0CM9Gh1Do38dvoNgWY08jXj3PVPO6s7Yy995ZbtgaR8n/G190PZ+p+i7EInv/OAJe/Xw4WcZlLs1XeKPashJmoX7qZi2fVPmu5UpYD1YiCMzZsWkQ=,iv:vjEJCDX8D4relmBJs569d+sklY1bUptWBjJVS7pKB70=,tag:xsQM3cDBkHymS9t9Qyyitg==,type:str] + lastmodified: "2024-03-24T19:25:02Z" + mac: ENC[AES256_GCM,data:Bd2CcyaZk3C5hOFzCo54dKpBduR2fEr6J78pS3bBVvIDMWAL574k2mtYwzixaXPGbUdPMccRhYZcYyhq6x0A+g99kcZYqDV1lRRBUfg6mJ/eEDLcoD3rYd3XgWFzen6PKTsg/rL35EG2EVVSndZKTx4AI0213lcv6BYeb7cZt/0=,iv:UOxGbO07FTcaknwoUMBwlG+AR4EmZeAd3KJkpPwDJL4=,tag:uyoRQVZ3hM6TWsQB3Lin9g==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix new file mode 100644 index 0000000..a57148b --- /dev/null +++ b/nixos/server/package-configs/coturn/default.nix @@ -0,0 +1,63 @@ +{ + sops.secrets."coturn-auth-secret".mode = "0440"; + sops.secrets."coturn-auth-secret".owner = config.users.users.coturn.name; + services.coturn = { + enable = true; + lt-cred-mech = true; + use-auth-secret = true; + static-auth-secret-file = config.sops.secrets."coturn-auth-secret".path; + realm = "turn.gladtherescake.eu"; + relay-ips = [ + "62.171.160.195" + ]; + no-tcp-relay = true; + extraConfig = " + cipher-list=\"HIGH\" + no-loopback-peers + no-multicast-peers + "; + secure-stun = true; + cert = "/var/lib/acme/turn.gladtherescake.eu/fullchain.pem"; + pkey = "/var/lib/acme/turn.gladtherescake.eu/key.pem"; + min-port = 49152; + max-port = 49999; + }; + + # Open ports in the firewall. + networking.firewall = { + enable = true; + allowPing = false; + allowedTCPPorts = [ + 5349 # STUN tls + 5350 # STUN tls alt + 80 # http + 443 # https + ]; + allowedUDPPortRanges = [ + { + from = 49152; + to = 49999; + } # TURN relay + ]; + }; + + # setup certs + services.nginx = { + enable = true; + virtualHosts = { + "turn.gladtherescake.eu" = { + forceSSL = true; + enableACME = true; + }; + }; + }; + + # share certs with coturn and restart on renewal + security.acme.certs = { + "turn.gladtherescake.eu" = { + group = "turnserver"; + allowKeysForGroup = true; + postRun = "systemctl reload nginx.service; systemctl restart coturn.service"; + }; + }; +} From e595ac3931657b38c586d0a9ed4a3b0ccc30c2f2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 21:03:17 +0100 Subject: [PATCH 1578/2308] Enable coTURN and fix the bugs present --- nixos/hosts/queen/configuration.nix | 21 ++++++++++++--- .../server/package-configs/coturn/default.nix | 26 +++++-------------- nixos/server/package-configs/default.nix | 1 + 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 2fb5185..b9b6dcc 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -104,9 +104,24 @@ # Contabo ipv6 nameservers: "2a02:c207::1:53" "2a02:c207::2:53" - networking.firewall.enable = true; - - networking.firewall.allowedTCPPorts = [22 80 443]; + # Open ports in the firewall. + networking.firewall = { + enable = true; + allowPing = false; + allowedTCPPorts = [ + 22 # SSH + 5349 # STUN tls + 5350 # STUN tls alt + 80 # http + 443 # https + ]; + allowedUDPPortRanges = [ + { + from = 49152; + to = 49999; + } # TURN relay + ]; + }; # networking.useNetworkd = true; diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix index a57148b..e37c03d 100644 --- a/nixos/server/package-configs/coturn/default.nix +++ b/nixos/server/package-configs/coturn/default.nix @@ -1,6 +1,11 @@ { + config, + pkgs, + ... +}: { sops.secrets."coturn-auth-secret".mode = "0440"; - sops.secrets."coturn-auth-secret".owner = config.users.users.coturn.name; + sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name; + users.users.nginx.extraGroups = ["turnserver"]; services.coturn = { enable = true; lt-cred-mech = true; @@ -23,24 +28,6 @@ max-port = 49999; }; - # Open ports in the firewall. - networking.firewall = { - enable = true; - allowPing = false; - allowedTCPPorts = [ - 5349 # STUN tls - 5350 # STUN tls alt - 80 # http - 443 # https - ]; - allowedUDPPortRanges = [ - { - from = 49152; - to = 49999; - } # TURN relay - ]; - }; - # setup certs services.nginx = { enable = true; @@ -56,7 +43,6 @@ security.acme.certs = { "turn.gladtherescake.eu" = { group = "turnserver"; - allowKeysForGroup = true; postRun = "systemctl reload nginx.service; systemctl restart coturn.service"; }; }; diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 3b2ddc4..b0104c5 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -14,5 +14,6 @@ ./nextcloud ./postgres ./roundcube + ./coturn ]; } From ce1aa98f43cdba08f479824e345589fa9d3ae13f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 21:31:50 +0100 Subject: [PATCH 1579/2308] Up the tmpfs space --- disko/EDI/default.nix | 2 +- disko/GLaDOS/default.nix | 2 +- disko/shodan/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/disko/EDI/default.nix b/disko/EDI/default.nix index 5e5f62e..ec5969b 100644 --- a/disko/EDI/default.nix +++ b/disko/EDI/default.nix @@ -77,7 +77,7 @@ "/tmp" = { fsType = "tmpfs"; mountOptions = [ - "size=200M" + "size=4G" ]; }; }; diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index dc4710e..f59a834 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -77,7 +77,7 @@ "/tmp" = { fsType = "tmpfs"; mountOptions = [ - "size=200M" + "size=4G" ]; }; }; diff --git a/disko/shodan/default.nix b/disko/shodan/default.nix index 9889536..eace8ce 100644 --- a/disko/shodan/default.nix +++ b/disko/shodan/default.nix @@ -77,7 +77,7 @@ "/tmp" = { fsType = "tmpfs"; mountOptions = [ - "size=200M" + "size=4G" ]; }; }; From 0043166e05bcc93d3a622498a13c84ac757f1fd9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 21:35:32 +0100 Subject: [PATCH 1580/2308] Change conduit to conduwuit for more better --- flake.lock | 18 +++++++++--------- flake.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 21c76c4..de7d79d 100644 --- a/flake.lock +++ b/flake.lock @@ -52,17 +52,17 @@ ] }, "locked": { - "lastModified": 1710785672, - "narHash": "sha256-tEP/amp09fSKeTBrcHWAYr/tQ0g2ZxJQlnCiZDi6qtY=", - "owner": "famedly", - "repo": "conduit", - "rev": "81bc1fc4e324c4798dc7b7e3cec94495a94455e0", - "type": "gitlab" + "lastModified": 1711172967, + "narHash": "sha256-HBkYzSfFM0oMnRSjquI1CJ7a4jtIv9eRbAeJZDE8H3M=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "101cb34f9a1b94b91717af3581f35386f20d4601", + "type": "github" }, "original": { - "owner": "famedly", - "repo": "conduit", - "type": "gitlab" + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" } }, "crane": { diff --git a/flake.nix b/flake.nix index 155b8e1..eef5331 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ # Conduit fork without all the fuss and drama conduit = { - url = "gitlab:famedly/conduit"; + url = "github:girlbossceo/conduwuit"; inputs.nixpkgs.follows = "nixpkgs"; }; From 8598679e057852556ab417c621455faae33dcff7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 21:50:12 +0100 Subject: [PATCH 1581/2308] Let's try rocksdb since sqlite won't work? --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 74dc5a8..4e3778c 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -40,7 +40,7 @@ in { settings.global = { inherit server_name; - database_backend = "sqlite"; + # database_backend = "rocksdb"; allow_registration = false; }; }; From 045e950a893aa3c974d7c2cc30495fa196ac090b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 21:50:50 +0100 Subject: [PATCH 1582/2308] What that comment said, forgot to stage --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 4e3778c..34294cf 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -40,7 +40,7 @@ in { settings.global = { inherit server_name; - # database_backend = "rocksdb"; + database_backend = "rocksdb"; allow_registration = false; }; }; From 1976f74686e7933c9d3978a506dbd4b9a61f5782 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 21:52:26 +0100 Subject: [PATCH 1583/2308] Default selection? --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 34294cf..4e3778c 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -40,7 +40,7 @@ in { settings.global = { inherit server_name; - database_backend = "rocksdb"; + # database_backend = "rocksdb"; allow_registration = false; }; }; From c136f54e970375958c9e37151d43d3a20f16a1f3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 21:59:25 +0100 Subject: [PATCH 1584/2308] Why won't sqlite work? --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 4e3778c..74dc5a8 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -40,7 +40,7 @@ in { settings.global = { inherit server_name; - # database_backend = "rocksdb"; + database_backend = "sqlite"; allow_registration = false; }; }; From 838c157c87c559d16d463dc99c21301a6f962554 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 22:02:19 +0100 Subject: [PATCH 1585/2308] I would like rocksdb --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 74dc5a8..34294cf 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -40,7 +40,7 @@ in { settings.global = { inherit server_name; - database_backend = "sqlite"; + database_backend = "rocksdb"; allow_registration = false; }; }; From 3d2e2ef7e12e8e263d084b6e04cc6b0e48871c91 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 22:11:33 +0100 Subject: [PATCH 1586/2308] Reset the server, allow registration again for a sec --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 34294cf..8932e7e 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -41,7 +41,7 @@ in { settings.global = { inherit server_name; database_backend = "rocksdb"; - allow_registration = false; + allow_registration = true; }; }; From 85988c1b846c8db475dc8a6b3260f2afb1743e8a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 22:13:28 +0100 Subject: [PATCH 1587/2308] Yes I am sure --- nixos/server/package-configs/conduit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 8932e7e..9c4317a 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -32,6 +32,9 @@ in { # Configure Conduit itself services.matrix-conduit = { + settings = { + yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true; + }; enable = true; # This causes NixOS to use the flake defined in this repository instead of From 2dc4f0a5fde4f3483788ad7486731708eef99b25 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 22:15:39 +0100 Subject: [PATCH 1588/2308] OK I'll set a not so very secret token --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 9c4317a..6532999 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -33,7 +33,7 @@ in { # Configure Conduit itself services.matrix-conduit = { settings = { - yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true; + registration_token = "It's me, Lillian Violet"; }; enable = true; From 93c390118b2e4924736e2ef9705a3ba9df979e5a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 22:17:45 +0100 Subject: [PATCH 1589/2308] I guess it goes here --- nixos/server/package-configs/conduit/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 6532999..1a5e463 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -32,9 +32,6 @@ in { # Configure Conduit itself services.matrix-conduit = { - settings = { - registration_token = "It's me, Lillian Violet"; - }; enable = true; # This causes NixOS to use the flake defined in this repository instead of @@ -45,6 +42,7 @@ in { inherit server_name; database_backend = "rocksdb"; allow_registration = true; + registration_token = "It's me, Lillian Violet"; }; }; From 4e04833096f0d85296dbb1f1eccf20c21ed93888 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 22:22:00 +0100 Subject: [PATCH 1590/2308] Registrations are closed! --- nixos/server/package-configs/conduit/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 1a5e463..34294cf 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -41,8 +41,7 @@ in { settings.global = { inherit server_name; database_backend = "rocksdb"; - allow_registration = true; - registration_token = "It's me, Lillian Violet"; + allow_registration = false; }; }; From 4759a56a1ced692e6986564afbe055691fda747d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 22:53:32 +0100 Subject: [PATCH 1591/2308] Let's see if turn server works eh --- nixos/server/package-configs/conduit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 34294cf..b0d8430 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -42,6 +42,8 @@ in { inherit server_name; database_backend = "rocksdb"; allow_registration = false; + turn_uris = ["turn:turn.gladtherescake.eu.url?transport=udp" "turn:turn.gladtherescake.eu?transport=tcp"]; + turn_secret = "cPKWEn4Fo5TAJoE7iX3xeVOaMVE4afeRN1iRGWYfbkWbkaZMxTpnmazHyH6c6yXT"; }; }; From 04bf4564d81d8307acffaa4825017db18cb24f98 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 24 Mar 2024 23:30:33 +0100 Subject: [PATCH 1592/2308] update flake lock --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index de7d79d..c086c19 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1710906792, - "narHash": "sha256-kFzpfZcInLhBFWHy452NlvFuzNr0BDEkz3w9Sgg2ypo=", + "lastModified": 1711261295, + "narHash": "sha256-5DUNQl9BSmLxgGLbF05G7hi/UTk9DyZq8AuEszhQA7Q=", "owner": "nix-community", "repo": "disko", - "rev": "e9875b969086a53dff5ec4677575ad3156fc875d", + "rev": "5d2d3e421ade554b19b4dbb0d11a04023378a330", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1710820906, - "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", + "lastModified": 1711133180, + "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "022464438a85450abb23d93b91aa82e0addd71fb", + "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1710915975, - "narHash": "sha256-yOc0AD6ba7mbialNciZGzuSQLMo4CopoZGEfcUugA4I=", + "lastModified": 1711231487, + "narHash": "sha256-dRdFjStMA7GeuD/V4vzKblzuHwxMPgzEboRleVdZlUM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "179d73fbe14c5bdb835d10bcc1c783466112bfa6", + "rev": "1171169117f63f1de9ef2ea36efd8dcf377c6d5a", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1710722910, - "narHash": "sha256-P5p9+WQFuABoBXBKEK1ZYu8mD6q8j/cQwZ9OYb0oh2E=", + "lastModified": 1711108213, + "narHash": "sha256-Q8cwpA2LQOInqeXVckrfFlbzHB8HOWrYntuOxqn3A3g=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "e63df01c798b99a76dc2ec25481be7dd25cd1610", + "rev": "417a857dfb824e60930881a254dd67d6796f5884", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1710783728, - "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", + "lastModified": 1711274671, + "narHash": "sha256-19KQXya5VERUXOdeEJJN+zOqtvuE6MV3qTk9Gr4J9Uo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", + "rev": "7559df1e4af972d5f1de87975b5ef6a8d7559db2", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1710628718, - "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", + "lastModified": 1711233294, + "narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", + "rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710889954, - "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", + "lastModified": 1711231723, + "narHash": "sha256-dARJQ8AJOv6U+sdRePkbcVyVbXJTi1tReCrkkOeusiA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", + "rev": "e1d501922fd7351da4200e1275dfcf5faaad1220", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -717,11 +717,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1710534455, - "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", + "lastModified": 1711200738, + "narHash": "sha256-dkJmk/ET/tRV4007O6kU101UEg1svUwiyk/zEEX9Tdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", + "rev": "20bc93ca7b2158ebc99b8cef987a2173a81cde35", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1709982472, - "narHash": "sha256-cMPHIV7yWbve+nwiQDhVt7BBkxrGTLzSTAslv7u6HZo=", + "lastModified": 1711295162, + "narHash": "sha256-gPTTYKvdnmaLcgOSpqtKHIf8J60J3Z4jAqXTwluxxUk=", "owner": "pjones", "repo": "plasma-manager", - "rev": "26acf8f5880ae7d6e5de4ca953c8ad161b7903eb", + "rev": "8a032af55ed686ab21e60530080462a1438812b9", "type": "github" }, "original": { @@ -901,11 +901,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1710644594, - "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", + "lastModified": 1711249319, + "narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", + "rev": "405987a66cce9a4a82f321f11b205982a7127c88", "type": "github" }, "original": { From bd0da21ce36999ba1e4a7fae84c05e33f9170b30 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Mar 2024 00:10:22 +0100 Subject: [PATCH 1593/2308] Let's let tmp be done by nixos itself --- disko/EDI/default.nix | 6 ------ disko/GLaDOS/default.nix | 6 ------ disko/shodan/default.nix | 6 ------ 3 files changed, 18 deletions(-) diff --git a/disko/EDI/default.nix b/disko/EDI/default.nix index ec5969b..1c2ab31 100644 --- a/disko/EDI/default.nix +++ b/disko/EDI/default.nix @@ -69,12 +69,6 @@ }; nodev = { "/home/lillian/Downloads" = { - fsType = "tmpfs"; - mountOptions = [ - "size=2G" - ]; - }; - "/tmp" = { fsType = "tmpfs"; mountOptions = [ "size=4G" diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index f59a834..53ffd96 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -69,12 +69,6 @@ }; nodev = { "/home/lillian/Downloads" = { - fsType = "tmpfs"; - mountOptions = [ - "size=2G" - ]; - }; - "/tmp" = { fsType = "tmpfs"; mountOptions = [ "size=4G" diff --git a/disko/shodan/default.nix b/disko/shodan/default.nix index eace8ce..58e1e3d 100644 --- a/disko/shodan/default.nix +++ b/disko/shodan/default.nix @@ -69,12 +69,6 @@ }; nodev = { "/home/lillian/Downloads" = { - fsType = "tmpfs"; - mountOptions = [ - "size=2G" - ]; - }; - "/tmp" = { fsType = "tmpfs"; mountOptions = [ "size=4G" From 4a34a1147414a71049b2f39c7cce002f8288d9c8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Mar 2024 18:28:07 +0100 Subject: [PATCH 1594/2308] Let's try forcing patched steam --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 84cbec5..56f7231 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -121,7 +121,7 @@ enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - package = pkgs.steam.override { + package = lib.mkForce pkgs.steam.override { extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; }; }; From 8e760df6c8a5392e304af679b656853009a6be13 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Mar 2024 18:34:33 +0100 Subject: [PATCH 1595/2308] That didn't work, force programs.steam instead --- nixos/hosts/shodan/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 56f7231..d7bcda3 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -117,11 +117,11 @@ jovian.hardware.has.amd.gpu = true; - programs.steam = { + programs.steam = lib.mkForce { enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - package = lib.mkForce pkgs.steam.override { + package = pkgs.steam.override { extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; }; }; From 08d443f5c31575657e2673a9a1bc0718ba2f0550 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Mar 2024 18:51:21 +0100 Subject: [PATCH 1596/2308] Let's try a global overlay --- overlays/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index 54f7d69..c63d4fc 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,14 @@ # This file defines overlays {inputs, ...}: { + # This one contains whatever you want to overlay + # You can change versions, add patches, set compilation flags, anything really. + # https://nixos.wiki/wiki/Overlays + modifications = final: prev: { + steam = prev.steam.override { + extraProfile = ''export LD_PRELOAD=${inputs.extest}/lib/libextest.so:$LD_PRELOAD''; + }; + }; + # This one brings our custom packages from the 'pkgs' directory additions = final: _prev: import ../pkgs { @@ -7,15 +16,6 @@ pkgs = final; }; - # This one contains whatever you want to overlay - # You can change versions, add patches, set compilation flags, anything really. - # https://nixos.wiki/wiki/Overlays - modifications = final: prev: { - # example = prev.example.overrideAttrs (oldAttrs: rec { - # ... - # }); - }; - # When applied, the stable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.stable' pkg-sets = ( From a56395135fc883f4bc39f1bc79c48289a6c7c464 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Mar 2024 19:05:33 +0100 Subject: [PATCH 1597/2308] Will it work without steam? --- pkgs/auto-mount/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 071338f..a324850 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -2,7 +2,6 @@ lib, stdenv, system, - steam, pkgs, jq, coreutils, @@ -17,7 +16,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox steam]; + runtimeInputs = [jq coreutils udisks util-linux toybox]; text = '' set -euo pipefail From 7260d0fb5ff243cd09c6d3f5b69680c5521dfaef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Mar 2024 19:09:39 +0100 Subject: [PATCH 1598/2308] Let's try this to use correct steam in auto-mount --- pkgs/auto-mount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index a324850..ba26487 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -16,7 +16,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox]; + runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam]; text = '' set -euo pipefail @@ -76,7 +76,7 @@ writeShellApplication # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt - systemd-run -M 1000@ --user --collect --wait sh -c "${steam}/bin/steam steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" fi From af60be340166ee38794f8d4cdd730db35a62664a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Mar 2024 19:33:58 +0100 Subject: [PATCH 1599/2308] Add lillian to input group --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index d7bcda3..341f55a 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -195,7 +195,7 @@ enable = true; }; - users.users.lillian.extraGroups = ["decky" "tss"]; + users.users.lillian.extraGroups = ["decky" "tss" "input"]; # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; From b07af0ef60b4328942834ed191e79f2b669a6369 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Mar 2024 19:42:19 +0100 Subject: [PATCH 1600/2308] Let's try and LD preload in auto-mount too --- pkgs/auto-mount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index ba26487..37a8ef2 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -16,7 +16,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam]; + runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest]; text = '' set -euo pipefail @@ -76,7 +76,7 @@ writeShellApplication # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt - systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD ${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" fi From 82dfea8f7c3dee00feb18e2e3689db5377e4d8fc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Mar 2024 10:18:36 +0100 Subject: [PATCH 1601/2308] update flake lock --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index c086c19..3e9cd2c 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1710003968, - "narHash": "sha256-g8+K+mLiNG5uch35Oy9oDQBAmGSkCcqrd0Jjme7xiG0=", + "lastModified": 1711299236, + "narHash": "sha256-6/JsyozOMKN8LUGqWMopKTSiK8N79T8Q+hcxu2KkTXg=", "owner": "ipetkov", "repo": "crane", - "rev": "10484f86201bb94bd61ecc5335b1496794fedb78", + "rev": "880573f80d09e18a11713f402b9e6172a085449f", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1710837180, - "narHash": "sha256-WVkLclGrUliLJUl+XaJplo09VdxyqHxZtkEmmDW2QYY=", + "lastModified": 1711442573, + "narHash": "sha256-/A3YzcY5erYOPojp5Ffwgxv4X5MTnRiWwuaXfgXbK2g=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "ded8d23709f94aedb1407bee9e26581f258e9e3a", + "rev": "df7ac26bd24fac8baa94d60a02c3e0f0d4d16368", "type": "github" }, "original": { @@ -506,11 +506,11 @@ }, "nixlib": { "locked": { - "lastModified": 1710636348, - "narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=", + "lastModified": 1711241261, + "narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "fa827dda806c5aa98f454da4c567991ab8ce422c", + "rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1711108213, - "narHash": "sha256-Q8cwpA2LQOInqeXVckrfFlbzHB8HOWrYntuOxqn3A3g=", + "lastModified": 1711375484, + "narHash": "sha256-+d4HqehyQvuHUKR8Nv9HGGd/SP5wjg3MA/hEYJBWQq0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "417a857dfb824e60930881a254dd67d6796f5884", + "rev": "2b3720c7af2271be8cee713cd2f69c5127b0a8e4", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1711274671, - "narHash": "sha256-19KQXya5VERUXOdeEJJN+zOqtvuE6MV3qTk9Gr4J9Uo=", + "lastModified": 1711352745, + "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7559df1e4af972d5f1de87975b5ef6a8d7559db2", + "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", "type": "github" }, "original": { @@ -590,11 +590,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711231723, - "narHash": "sha256-dARJQ8AJOv6U+sdRePkbcVyVbXJTi1tReCrkkOeusiA=", + "lastModified": 1711370797, + "narHash": "sha256-2xu0jVSjuKhN97dqc4bVtvEH52Rwh6+uyI1XCnzoUyI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1d501922fd7351da4200e1275dfcf5faaad1220", + "rev": "c726225724e681b3626acc941c6f95d2b0602087", "type": "github" }, "original": { @@ -670,11 +670,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1710672219, - "narHash": "sha256-Bp3Jsq1Jn8q4EesBlcOVNwnEipNpzYs73kvR3+3EUC4=", + "lastModified": 1711297276, + "narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f471be9644f3ab2f3cb868de1787ab70a537b0e7", + "rev": "3d41d1087707826b3a90685ab69147f8dc8145d5", "type": "github" }, "original": { @@ -798,11 +798,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1710923068, + "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "type": "github" }, "original": { @@ -860,11 +860,11 @@ ] }, "locked": { - "lastModified": 1710641527, - "narHash": "sha256-R9JZEevtSyg7++LEryYJRrfyEe45azJxmu2k9VezEW0=", + "lastModified": 1711246447, + "narHash": "sha256-g9TOluObcOEKewFo2fR4cn51Y/jSKhRRo4QZckHLop0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "50db54295d3922a3b7a40d580b84d75150b36c34", + "rev": "dcc802a6ec4e9cc6a1c8c393327f0c42666f22e4", "type": "github" }, "original": { From 45fc46cb9f4bdae23180c8f3fa420e3dabce0674 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Mar 2024 13:48:55 +0100 Subject: [PATCH 1602/2308] fcast --- pkgs/fcast/default.nix | 202 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 pkgs/fcast/default.nix diff --git a/pkgs/fcast/default.nix b/pkgs/fcast/default.nix new file mode 100644 index 0000000..3919a72 --- /dev/null +++ b/pkgs/fcast/default.nix @@ -0,0 +1,202 @@ +{ + lib, + buildNpmPackage, + cargo, + copyDesktopItems, + dbus, + electron_28, + fetchFromGitLab, + glib, + gnome, + gtk3, + jq, + libsecret, + makeDesktopItem, + makeWrapper, + moreutils, + napi-rs-cli, + nodejs_18, + patchutils_0_4_2, + pkg-config, + python3, + runCommand, + rustc, + rustPlatform, +}: let + description = "A secure and free password manager for all of your devices"; + icon = "bitwarden"; + electron = electron_28; +in + buildNpmPackage rec { + pname = "bitwarden-desktop"; + version = "2024.3.0"; + + src = fetchFromGitLab { + owner = "videostreaming"; + repo = "fcast"; + rev = "b13d0f7e8150c279d377a78f89d338b7fc0f5539"; + hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g="; + }; + + patches = [ + ./electron-builder-package-lock.patch + ]; + + # The nested package-lock.json from upstream is out-of-date, so copy the + # lock metadata from the root package-lock.json. + postPatch = '' + cat {,apps/desktop/src/}package-lock.json \ + | ${lib.getExe jq} -s ' + .[1].packages."".dependencies.argon2 = .[0].packages."".dependencies.argon2 + | .[0].packages."" = .[1].packages."" + | .[1].packages = .[0].packages + | .[1] + ' \ + | ${moreutils}/bin/sponge apps/desktop/src/package-lock.json + ''; + + nodejs = nodejs_18; + + makeCacheWritable = true; + npmFlags = ["--legacy-peer-deps"]; + npmWorkspace = "apps/desktop"; + npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc="; + + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}"; + inherit src; + patches = + map + ( + patch: + runCommand + (builtins.baseNameOf patch) + {nativeBuildInputs = [patchutils_0_4_2];} + '' + < ${patch} filterdiff -p1 --include=${lib.escapeShellArg cargoRoot}'/*' > $out + '' + ) + patches; + patchFlags = ["-p4"]; + sourceRoot = "${src.name}/${cargoRoot}"; + hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI="; + }; + cargoRoot = "apps/desktop/desktop_native"; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + nativeBuildInputs = [ + cargo + copyDesktopItems + jq + makeWrapper + moreutils + napi-rs-cli + pkg-config + python3 + rustc + rustPlatform.cargoCheckHook + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + glib + gtk3 + libsecret + ]; + + preBuild = '' + if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then + echo 'ERROR: electron version mismatch' + exit 1 + fi + ''; + + postBuild = '' + pushd apps/desktop + + # desktop_native/index.js loads a file of that name regarldess of the libc being used + mv desktop_native/desktop_native.* desktop_native/desktop_native.linux-x64-musl.node + + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${electron}/libexec/electron \ + -c.electronVersion=${electron.version} + + popd + ''; + + doCheck = true; + + nativeCheckInputs = [ + dbus + (gnome.gnome-keyring.override {useWrappedDaemon = false;}) + ]; + + checkFlags = [ + "--skip=password::password::tests::test" + ]; + + checkPhase = '' + runHook preCheck + + pushd ${cargoRoot} + export HOME=$(mktemp -d) + export -f cargoCheckHook runHook _eval _callImplicitHook + export cargoCheckType=release + dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + -- bash -e -c cargoCheckHook + popd + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + + pushd apps/desktop/dist/linux-unpacked + mkdir -p $out/opt/Bitwarden + cp -r locales resources{,.pak} $out/opt/Bitwarden + popd + + makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \ + --add-flags $out/opt/Bitwarden/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + pushd apps/desktop/resources/icons + for icon in *.png; do + dir=$out/share/icons/hicolor/"''${icon%.png}"/apps + mkdir -p "$dir" + cp "$icon" "$dir"/${icon}.png + done + popd + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "bitwarden"; + exec = "bitwarden %U"; + inherit icon; + comment = description; + desktopName = "Bitwarden"; + categories = ["Utility"]; + }) + ]; + + meta = { + changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; + inherit description; + homepage = "https://bitwarden.com"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [amarshall kiwi]; + platforms = ["x86_64-linux"]; + mainProgram = "bitwarden"; + }; + } From b5be1009cf14167edb82a2bb2cb596de3f02e142 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Mar 2024 14:13:35 +0100 Subject: [PATCH 1603/2308] added grafana to queen --- .../package-configs/dashboard/default.nix | 14 +++++++++++ .../dashboard/grafana/default.nix | 25 +++++++++++++++++++ nixos/server/package-configs/default.nix | 1 + 3 files changed, 40 insertions(+) create mode 100644 nixos/server/package-configs/dashboard/default.nix create mode 100644 nixos/server/package-configs/dashboard/grafana/default.nix diff --git a/nixos/server/package-configs/dashboard/default.nix b/nixos/server/package-configs/dashboard/default.nix new file mode 100644 index 0000000..71b377b --- /dev/null +++ b/nixos/server/package-configs/dashboard/default.nix @@ -0,0 +1,14 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + ./grafana + #./loki + #./prometheus + ]; +} diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix new file mode 100644 index 0000000..11305d1 --- /dev/null +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -0,0 +1,25 @@ +{ + config, + pkgs, + ... +}: { + # grafana configuration + services.grafana = { + enable = true; + domain = "grafana.lillianviolet.dev"; + http_port = 2342; + http_addr = "127.0.0.1"; + }; + + # nginx reverse proxy + services.nginx.virtualHosts.${config.services.grafana.domain} = { + ## Force HTTP redirect to HTTPS + forceSSL = true; + ## LetsEncrypt + enableACME = true; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString config.services.grafana.port}"; + proxyWebsockets = true; + }; + }; +} diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index b0104c5..ff7d535 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -15,5 +15,6 @@ ./postgres ./roundcube ./coturn + ./dashboard ]; } From fe1dbd4f95c03895fd73109aa94c7bbc90c55dc4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Mar 2024 14:34:28 +0100 Subject: [PATCH 1604/2308] Enable prometheus, add loki config example, we don't have a global log system so it's not useful though --- .../package-configs/dashboard/default.nix | 2 +- .../dashboard/grafana/default.nix | 18 +++++++++ .../dashboard/loki/default.nix | 10 +++++ .../package-configs/dashboard/loki/loki.yaml | 40 +++++++++++++++++++ .../dashboard/prometheus/default.nix | 38 ++++++++++++++++++ 5 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 nixos/server/package-configs/dashboard/loki/default.nix create mode 100644 nixos/server/package-configs/dashboard/loki/loki.yaml create mode 100644 nixos/server/package-configs/dashboard/prometheus/default.nix diff --git a/nixos/server/package-configs/dashboard/default.nix b/nixos/server/package-configs/dashboard/default.nix index 71b377b..5bbfb09 100644 --- a/nixos/server/package-configs/dashboard/default.nix +++ b/nixos/server/package-configs/dashboard/default.nix @@ -9,6 +9,6 @@ imports = [ ./grafana #./loki - #./prometheus + ./prometheus ]; } diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix index 11305d1..e2f53ab 100644 --- a/nixos/server/package-configs/dashboard/grafana/default.nix +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -9,6 +9,24 @@ domain = "grafana.lillianviolet.dev"; http_port = 2342; http_addr = "127.0.0.1"; + provision = { + datasources = [ + { + name = "Prometheus"; + type = "prometheus"; + access = "proxy"; + url = "http://localhost:${config.services.prometheus.port}"; + isDefault = true; + } + { + name = "Loki"; + type = "loki"; + access = "proxy"; + url = "http://localhost:${config.services.loki.port}"; + isDefault = true; + } + ]; + }; }; # nginx reverse proxy diff --git a/nixos/server/package-configs/dashboard/loki/default.nix b/nixos/server/package-configs/dashboard/loki/default.nix new file mode 100644 index 0000000..6e68716 --- /dev/null +++ b/nixos/server/package-configs/dashboard/loki/default.nix @@ -0,0 +1,10 @@ +{ + config, + pkgs, + ... +}: { + services.loki = { + enable = true; + configFile = ./loki.yaml; + }; +} diff --git a/nixos/server/package-configs/dashboard/loki/loki.yaml b/nixos/server/package-configs/dashboard/loki/loki.yaml new file mode 100644 index 0000000..d0e9699 --- /dev/null +++ b/nixos/server/package-configs/dashboard/loki/loki.yaml @@ -0,0 +1,40 @@ +# Enables authentication through the X-Scope-OrgID header, which must be present +# if true. If false, the OrgID will always be set to "fake". +auth_enabled: false + +server: + http_listen_address: "0.0.0.0" + http_listen_port: 3100 + +ingester: + lifecycler: + address: "127.0.0.1" + ring: + kvstore: + store: inmemory + replication_factor: 1 + final_sleep: 0s + chunk_idle_period: 5m + chunk_retain_period: 30s + +schema_config: + configs: + - from: 2020-05-15 + store: boltdb + object_store: filesystem + schema: v11 + index: + prefix: index_ + period: 168h + +storage_config: + boltdb: + directory: /tmp/loki/index + + filesystem: + directory: /tmp/loki/chunks + +limits_config: + enforce_metric_name: false + reject_old_samples: true + reject_old_samples_max_age: 168h \ No newline at end of file diff --git a/nixos/server/package-configs/dashboard/prometheus/default.nix b/nixos/server/package-configs/dashboard/prometheus/default.nix new file mode 100644 index 0000000..5ea9535 --- /dev/null +++ b/nixos/server/package-configs/dashboard/prometheus/default.nix @@ -0,0 +1,38 @@ +{ + config, + pkgs, + ... +}: { + services.prometheus = { + enable = true; + port = 9001; + # Export the current system metrics + exporters = { + node = { + enable = true; + enabledCollectors = ["systemd"]; + port = 9002; + }; + }; + scrapeConfigs = [ + # Scrape the current system + { + job_name = "GrafanaService system"; + static_configs = [ + { + targets = ["127.0.0.1:9002"]; + } + ]; + } + # Scrape the Loki service + # { + # job_name = "Loki service"; + # static_configs = [ + # { + # targets = ["127.0.0.1:3100"]; + # } + # ]; + # } + ]; + }; +} From ea9aa2eddd6a5341b8335c0c95a25ef93309b386 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Mar 2024 14:35:54 +0100 Subject: [PATCH 1605/2308] That's where that is supposed to go for grafana --- .../server/package-configs/dashboard/grafana/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix index e2f53ab..de45e01 100644 --- a/nixos/server/package-configs/dashboard/grafana/default.nix +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -6,9 +6,11 @@ # grafana configuration services.grafana = { enable = true; - domain = "grafana.lillianviolet.dev"; - http_port = 2342; - http_addr = "127.0.0.1"; + server = { + domain = "grafana.lillianviolet.dev"; + http_port = 2342; + http_addr = "127.0.0.1"; + }; provision = { datasources = [ { From 2c33f7d0693a176213af0ae0de5b0b1df51e494c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Mar 2024 14:37:02 +0100 Subject: [PATCH 1606/2308] Disable loki in grafana, settings.server not just server --- .../dashboard/grafana/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix index de45e01..2bde79a 100644 --- a/nixos/server/package-configs/dashboard/grafana/default.nix +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -6,7 +6,7 @@ # grafana configuration services.grafana = { enable = true; - server = { + settings.server = { domain = "grafana.lillianviolet.dev"; http_port = 2342; http_addr = "127.0.0.1"; @@ -20,13 +20,13 @@ url = "http://localhost:${config.services.prometheus.port}"; isDefault = true; } - { - name = "Loki"; - type = "loki"; - access = "proxy"; - url = "http://localhost:${config.services.loki.port}"; - isDefault = true; - } + # { + # name = "Loki"; + # type = "loki"; + # access = "proxy"; + # url = "http://localhost:${config.services.loki.port}"; + # isDefault = true; + # } ]; }; }; From 9dacc2172eb1d0f5aadd49a6ecd2fa46cc5a9284 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Mar 2024 14:40:05 +0100 Subject: [PATCH 1607/2308] Let's change those in nginx too --- nixos/server/package-configs/dashboard/grafana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix index 2bde79a..b952195 100644 --- a/nixos/server/package-configs/dashboard/grafana/default.nix +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -32,13 +32,13 @@ }; # nginx reverse proxy - services.nginx.virtualHosts.${config.services.grafana.domain} = { + services.nginx.virtualHosts.${config.services.grafana.settings.server.domain} = { ## Force HTTP redirect to HTTPS forceSSL = true; ## LetsEncrypt enableACME = true; locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.grafana.port}"; + proxyPass = "http://127.0.0.1:${toString config.services.grafana.settings.server.port}"; proxyWebsockets = true; }; }; From 3c830bc6c467f73d6e7aeb2d33b1405cdd6bdbe8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Mar 2024 14:52:15 +0100 Subject: [PATCH 1608/2308] Had to do a toString, thanks for the great error message nixos, fixed some other typos --- .../dashboard/grafana/default.nix | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix index b952195..5589873 100644 --- a/nixos/server/package-configs/dashboard/grafana/default.nix +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -12,22 +12,25 @@ http_addr = "127.0.0.1"; }; provision = { - datasources = [ - { - name = "Prometheus"; - type = "prometheus"; - access = "proxy"; - url = "http://localhost:${config.services.prometheus.port}"; - isDefault = true; - } - # { - # name = "Loki"; - # type = "loki"; - # access = "proxy"; - # url = "http://localhost:${config.services.loki.port}"; - # isDefault = true; - # } - ]; + datasources.settings = { + apiVersion = 1; + datasources = [ + { + name = "Prometheus"; + type = "prometheus"; + access = "proxy"; + url = "http://localhost:${toString config.services.prometheus.port}"; + isDefault = true; + } + # { + # name = "Loki"; + # type = "loki"; + # access = "proxy"; + # url = "http://localhost:${config.services.loki.port}"; + # isDefault = true; + # } + ]; + }; }; }; @@ -38,7 +41,7 @@ ## LetsEncrypt enableACME = true; locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.grafana.settings.server.port}"; + proxyPass = "http://${toString config.services.grafana.settings.server.http_addr}:${toString config.services.grafana.settings.server.http_port}"; proxyWebsockets = true; }; }; From 70a717311a0609fd5640b7e90697453290623b82 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Mar 2024 17:27:53 +0100 Subject: [PATCH 1609/2308] Update plasma manager --- .../desktop/plasma-desktop/default.nix | 1343 +++++++++-------- 1 file changed, 679 insertions(+), 664 deletions(-) diff --git a/home-manager/desktop/plasma-desktop/default.nix b/home-manager/desktop/plasma-desktop/default.nix index 48e77cf..6324947 100644 --- a/home-manager/desktop/plasma-desktop/default.nix +++ b/home-manager/desktop/plasma-desktop/default.nix @@ -239,672 +239,687 @@ "plasmashell"."switch to next activity" = []; "plasmashell"."switch to previous activity" = []; "plasmashell"."toggle do not disturb" = []; - "services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; - "services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; - "services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; - "services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; - "services.org.kde.spectacle.desktop"."_launch" = "Print"; - "services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "Meta+Print" "Ctrl+!"]; - "services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "Ctrl+$" "Shift+Print"]; - "services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "Ctrl+@" "Meta+Shift+Print"]; - "services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "Meta+Ctrl+Print" "Ctrl+%"]; - "services.services.org.kde.spectacle.desktop"."_launch" = "Print"; + "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/org.kde.spectacle.desktop"."RecordWindow" = []; + "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "services/org.kde.spectacle.desktop"."_launch" = "Print"; + "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; + "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { - "baloofilerc"."General"."dbVersion" = 2; - "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; - "baloofilerc"."General"."exclude filters version" = 8; - "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; - "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; - "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; - "dolphinrc"."General"."RememberOpenedTabs" = false; - "dolphinrc"."IconsMode"."PreviewSize" = 80; - "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; - "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; - "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; - "dolphinrc"."PreviewSettings"."Plugins" = "mobithumbnail,fontthumbnail,ebookthumbnail,kraorathumbnail,jpegthumbnail,windowsexethumbnail,comicbookthumbnail,djvuthumbnail,opendocumentthumbnail,windowsimagethumbnail,exrthumbnail,audiothumbnail,cursorthumbnail,svgthumbnail,blenderthumbnail,gsthumbnail,rawthumbnail,ffmpegthumbs,imagethumbnail,directorythumbnail"; - "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; - "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; - "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; - "kded5rc"."Module-browserintegrationreminder"."autoload" = false; - "kded5rc"."Module-device_automounter"."autoload" = false; - "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; - "kdeglobals"."General"."AccentColor" = "184,117,220"; - "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; - "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; - "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; - "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; - "kdeglobals"."KDE"."ShowDeleteCommand" = false; - "kdeglobals"."KDE"."SingleClick" = false; - "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; - "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; - "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; - "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; - "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; - "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; - "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; - "kdeglobals"."KFileDialog Settings"."Show Preview" = false; - "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; - "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; - "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; - "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; - "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; - "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; - "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; - "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; - "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; - "kdeglobals"."PreviewSettings"."MaximumRemoteSize" = 0; - "kdeglobals"."WM"."activeBackground" = "49,54,59"; - "kdeglobals"."WM"."activeBlend" = "252,252,252"; - "kdeglobals"."WM"."activeForeground" = "252,252,252"; - "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; - "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; - "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; - "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; - "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; - "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; - "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; - "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; - "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; - "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; - "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; - "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; - "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "KDE Power Management System"; - "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "plasmashell"; - "khotkeysrc"."Data"."DataCount" = 3; - "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; - "khotkeysrc"."Data_1"."DataCount" = 1; - "khotkeysrc"."Data_1"."Enabled" = true; - "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; - "khotkeysrc"."Data_1"."SystemGroup" = 1; - "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1"."Comment" = "Comment"; - "khotkeysrc"."Data_1_1"."Enabled" = true; - "khotkeysrc"."Data_1_1"."Name" = "Search"; - "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; - "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; - "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; - "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; - "khotkeysrc"."Data_2"."DataCount" = 8; - "khotkeysrc"."Data_2"."Enabled" = false; - "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; - "khotkeysrc"."Data_2"."Name" = "Examples"; - "khotkeysrc"."Data_2"."SystemGroup" = 0; - "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; - "khotkeysrc"."Data_2_1"."Enabled" = false; - "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; - "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; - "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; - "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; - "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; - "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; - "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; - "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; - "khotkeysrc"."Data_2_2"."Enabled" = false; - "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; - "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; - "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; - "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; - "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; - "khotkeysrc"."Data_2_3"."Enabled" = false; - "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; - "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; - "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; - "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; - "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; - "khotkeysrc"."Data_2_4"."Enabled" = false; - "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; - "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; - "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; - "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; - "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; - "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; - "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; - "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; - "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; - "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; - "khotkeysrc"."Data_2_5"."Enabled" = false; - "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; - "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; - "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; - "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; - "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; - "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; - "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; - "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; - "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; - "khotkeysrc"."Data_2_6"."Enabled" = false; - "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; - "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; - "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; - "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; - "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; - "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; - "khotkeysrc"."Data_2_7"."DataCount" = 4; - "khotkeysrc"."Data_2_7"."Enabled" = false; - "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; - "khotkeysrc"."Data_2_7"."SystemGroup" = 0; - "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_7_1"."Comment" = ""; - "khotkeysrc"."Data_2_7_1"."Enabled" = false; - "khotkeysrc"."Data_2_7_1"."Name" = "Back"; - "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2"."Comment" = ""; - "khotkeysrc"."Data_2_7_2"."Enabled" = false; - "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; - "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3"."Comment" = ""; - "khotkeysrc"."Data_2_7_3"."Enabled" = false; - "khotkeysrc"."Data_2_7_3"."Name" = "Up"; - "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4"."Comment" = ""; - "khotkeysrc"."Data_2_7_4"."Enabled" = false; - "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; - "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; - "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; - "khotkeysrc"."Data_2_8"."Enabled" = false; - "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; - "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; - "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; - "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; - "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; - "khotkeysrc"."Data_3"."DataCount" = 14; - "khotkeysrc"."Data_3"."Enabled" = true; - "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; - "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; - "khotkeysrc"."Data_3"."SystemGroup" = 0; - "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konquerors"; - "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; - "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; - "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; - "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; - "khotkeysrc"."Data_3_1"."Enabled" = true; - "khotkeysrc"."Data_3_1"."Name" = "Back"; - "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; - "khotkeysrc"."Data_3_10"."Enabled" = false; - "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; - "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; - "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; - "khotkeysrc"."Data_3_11"."Enabled" = true; - "khotkeysrc"."Data_3_11"."Name" = "Up"; - "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; - "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; - "khotkeysrc"."Data_3_12"."Enabled" = false; - "khotkeysrc"."Data_3_12"."Name" = "Up #2"; - "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; - "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; - "khotkeysrc"."Data_3_13"."Enabled" = true; - "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; - "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; - "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; - "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; - "khotkeysrc"."Data_3_14"."Enabled" = true; - "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; - "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; - "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; - "khotkeysrc"."Data_3_2"."Enabled" = true; - "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; - "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; - "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; - "khotkeysrc"."Data_3_3"."Enabled" = true; - "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; - "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; - "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; - "khotkeysrc"."Data_3_4"."Enabled" = true; - "khotkeysrc"."Data_3_4"."Name" = "Forward"; - "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; - "khotkeysrc"."Data_3_5"."Enabled" = true; - "khotkeysrc"."Data_3_5"."Name" = "Home"; - "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; - "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; - "khotkeysrc"."Data_3_6"."Enabled" = true; - "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; - "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; - "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; - "khotkeysrc"."Data_3_7"."Enabled" = true; - "khotkeysrc"."Data_3_7"."Name" = "New Tab"; - "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; - "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; - "khotkeysrc"."Data_3_8"."Enabled" = true; - "khotkeysrc"."Data_3_8"."Name" = "New Window"; - "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; - "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; - "khotkeysrc"."Data_3_9"."Enabled" = true; - "khotkeysrc"."Data_3_9"."Name" = "Reload"; - "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; - "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions[$d]" = ""; - "khotkeysrc"."General"."BrowserApplication[$d]" = ""; - "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; - "khotkeysrc"."General"."ColorScheme[$d]" = ""; - "khotkeysrc"."Gestures"."Disabled" = true; - "khotkeysrc"."Gestures"."MouseButton" = 2; - "khotkeysrc"."Gestures"."Timeout" = 300; - "khotkeysrc"."GesturesExclude"."Comment" = ""; - "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; - "khotkeysrc"."Icons"."Theme[$d]" = ""; - "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; - "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; - "khotkeysrc"."KDE"."ShowDeleteCommand[$d]" = ""; - "khotkeysrc"."KDE"."SingleClick[$d]" = ""; - "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; - "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; - "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; - "khotkeysrc"."Main"."Disabled" = false; - "khotkeysrc"."PreviewSettings"."MaximumRemoteSize[$d]" = ""; - "khotkeysrc"."Voice"."Shortcut" = ""; - "khotkeysrc"."WM"."activeBackground[$d]" = ""; - "khotkeysrc"."WM"."activeBlend[$d]" = ""; - "khotkeysrc"."WM"."activeForeground[$d]" = ""; - "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; - "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; - "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; - "kiorc"."Confirmations"."ConfirmDelete" = true; - "kiorc"."Confirmations"."ConfirmEmptyTrash" = true; - "kiorc"."Confirmations"."ConfirmTrash" = false; - "kiorc"."Executable scripts"."behaviourOnLaunch" = "alwaysAsk"; - "krunnerrc"."Plugins"."baloosearchEnabled" = false; - "krunnerrc"."Plugins"."locationsEnabled" = true; - "krunnerrc"."Plugins"."placesEnabled" = true; - "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; - "kservicemenurc"."Show"."compressfileitemaction" = true; - "kservicemenurc"."Show"."extractfileitemaction" = true; - "kservicemenurc"."Show"."forgetfileitemaction" = true; - "kservicemenurc"."Show"."installFont" = true; - "kservicemenurc"."Show"."kactivitymanagerd_fileitem_linking_plugin" = true; - "kservicemenurc"."Show"."kdeconnectfileitemaction" = true; - "kservicemenurc"."Show"."kio-admin" = true; - "kservicemenurc"."Show"."mountisoaction" = true; - "kservicemenurc"."Show"."nextclouddolphinactionplugin" = true; - "kservicemenurc"."Show"."runInKonsole" = true; - "kservicemenurc"."Show"."setAsWallpaper" = true; - "kservicemenurc"."Show"."slideshowfileitemaction" = true; - "kservicemenurc"."Show"."tagsfileitemaction" = true; - "kwalletrc"."Wallet"."First Use" = false; - "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; - "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; - "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; - "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; - "kwinrc"."Desktops"."Number" = 4; - "kwinrc"."Desktops"."Rows" = 2; - "kwinrc"."Effect-diminactive"."Strength" = 15; - "kwinrc"."Effect-magiclamp"."AnimationDuration" = 20; - "kwinrc"."NightColor"."Active" = true; - "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; - "kwinrc"."NightColor"."LongitudeFixed" = 5.44; - "kwinrc"."NightColor"."Mode" = "Location"; - "kwinrc"."NightColor"."NightTemperature" = 1400; - "kwinrc"."Plugins"."diminactiveEnabled" = true; - "kwinrc"."Plugins"."dimscreenEnabled" = true; - "kwinrc"."Plugins"."wobblywindowsEnabled" = true; - "kwinrc"."Tiling"."padding" = 4; - "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}],\"width\":1}]}"; - "kwinrc"."Xwayland"."Scale" = 1; - "kxkbrc"."Layout"."Options" = "compose:caps"; - "kxkbrc"."Layout"."ResetOldOptions" = true; - "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; - "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; - "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "baloofilerc"."General"."dbVersion".value = 2; + "baloofilerc"."General"."exclude filters".value = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version".value = 8; + "dolphinrc"."ExtractDialog"."1536x864 screen: Height".value = 560; + "dolphinrc"."ExtractDialog"."1536x864 screen: Width".value = 1024; + "dolphinrc"."ExtractDialog"."DirHistory[$e]".value = "/home/"; + "dolphinrc"."General"."RememberOpenedTabs".value = false; + "dolphinrc"."IconsMode"."PreviewSize".value = 80; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize".value = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size".value = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize".value = 16; + "dolphinrc"."PreviewSettings"."Plugins".value = "mobithumbnail,fontthumbnail,ebookthumbnail,kraorathumbnail,jpegthumbnail,windowsexethumbnail,comicbookthumbnail,djvuthumbnail,opendocumentthumbnail,windowsimagethumbnail,exrthumbnail,audiothumbnail,cursorthumbnail,svgthumbnail,blenderthumbnail,gsthumbnail,rawthumbnail,ffmpegthumbs,imagethumbnail,directorythumbnail"; + "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12".value = "Default"; + "kactivitymanagerdrc"."main"."currentActivity".value = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation".value = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll".value = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick".value = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation".value = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."NaturalScroll".value = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."TapToClick".value = true; + "kcminputrc"."Tmp"."update_info".value = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload".value = false; + "kded5rc"."Module-device_automounter"."autoload".value = false; + "kded5rc"."PlasmaBrowserIntegration"."shownCount".value = 1; + "kdeglobals"."General"."AccentColor".value = "184,117,220"; + "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions".value = true; + "kdeglobals"."General"."BrowserApplication".value = "firefox.desktop"; + "kdeglobals"."General"."LastUsedCustomAccentColor".value = "184,117,220"; + "kdeglobals"."KDE"."AnimationDurationFactor".value = 0.7071067811865475; + "kdeglobals"."KDE"."ShowDeleteCommand".value = false; + "kdeglobals"."KDE"."SingleClick".value = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion".value = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension".value = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation".value = false; + "kdeglobals"."KFileDialog Settings"."Decoration position".value = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode".value = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode".value = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks".value = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path".value = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews".value = true; + "kdeglobals"."KFileDialog Settings"."Show Preview".value = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar".value = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files".value = false; + "kdeglobals"."KFileDialog Settings"."Sort by".value = "Date"; + "kdeglobals"."KFileDialog Settings"."Sort directories first".value = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last".value = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed".value = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width".value = 138; + "kdeglobals"."KFileDialog Settings"."View Style".value = "DetailTree"; + "kdeglobals"."KShortcutsDialog Settings"."Dialog Size".value = "600,480"; + "kdeglobals"."PreviewSettings"."MaximumRemoteSize".value = 0; + "kdeglobals"."WM"."activeBackground".value = "49,54,59"; + "kdeglobals"."WM"."activeBlend".value = "252,252,252"; + "kdeglobals"."WM"."activeForeground".value = "252,252,252"; + "kdeglobals"."WM"."inactiveBackground".value = "42,46,50"; + "kdeglobals"."WM"."inactiveBlend".value = "161,169,177"; + "kdeglobals"."WM"."inactiveForeground".value = "161,169,177"; + "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name".value = "Activity Manager"; + "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name".value = "Keyboard Layout Switcher"; + "kglobalshortcutsrc"."kaccess"."_k_friendly_name".value = "Accessibility"; + "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name".value = "Touchpad"; + "kglobalshortcutsrc"."khotkeys"."_k_friendly_name".value = "Custom Shortcuts Service"; + "kglobalshortcutsrc"."kmix"."_k_friendly_name".value = "Audio Volume"; + "kglobalshortcutsrc"."ksmserver"."_k_friendly_name".value = "Session Management"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name".value = "KWin"; + "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name".value = "Media Controller"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name".value = "KDE Power Management System"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name".value = "plasmashell"; + "khotkeysrc"."Data"."DataCount".value = 3; + "khotkeysrc"."Data_1"."Comment".value = "KMenuEdit Global Shortcuts"; + "khotkeysrc"."Data_1"."DataCount".value = 1; + "khotkeysrc"."Data_1"."Enabled".value = true; + "khotkeysrc"."Data_1"."Name".value = "KMenuEdit"; + "khotkeysrc"."Data_1"."SystemGroup".value = 1; + "khotkeysrc"."Data_1"."Type".value = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_1Conditions"."Comment".value = ""; + "khotkeysrc"."Data_1Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_1_1"."Comment".value = "Comment"; + "khotkeysrc"."Data_1_1"."Enabled".value = true; + "khotkeysrc"."Data_1_1"."Name".value = "Search"; + "khotkeysrc"."Data_1_1"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_1_1Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_1_1Actions0"."CommandURL".value = "http://google.com"; + "khotkeysrc"."Data_1_1Actions0"."Type".value = "COMMAND_URL"; + "khotkeysrc"."Data_1_1Conditions"."Comment".value = ""; + "khotkeysrc"."Data_1_1Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_1_1Triggers"."Comment".value = "Simple_action"; + "khotkeysrc"."Data_1_1Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_1_1Triggers0"."Key".value = ""; + "khotkeysrc"."Data_1_1Triggers0"."Type".value = "SHORTCUT"; + "khotkeysrc"."Data_1_1Triggers0"."Uuid".value = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; + "khotkeysrc"."Data_2"."Comment".value = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; + "khotkeysrc"."Data_2"."DataCount".value = 8; + "khotkeysrc"."Data_2"."Enabled".value = false; + "khotkeysrc"."Data_2"."ImportId".value = "kde32b1"; + "khotkeysrc"."Data_2"."Name".value = "Examples"; + "khotkeysrc"."Data_2"."SystemGroup".value = 0; + "khotkeysrc"."Data_2"."Type".value = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_1"."Comment".value = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; + "khotkeysrc"."Data_2_1"."Enabled".value = false; + "khotkeysrc"."Data_2_1"."Name".value = "Activate KSIRC Window"; + "khotkeysrc"."Data_2_1"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_1Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_1Actions0"."Type".value = "ACTIVATE_WINDOW"; + "khotkeysrc"."Data_2_1Actions0Window"."Comment".value = "KSIRC window"; + "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount".value = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Class".value = "ksirc"; + "khotkeysrc"."Data_2_1Actions0Window0"."ClassType".value = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Comment".value = "KSIRC"; + "khotkeysrc"."Data_2_1Actions0Window0"."Role".value = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."RoleType".value = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Title".value = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."TitleType".value = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Type".value = "SIMPLE"; + "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes".value = 33; + "khotkeysrc"."Data_2_1Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_1Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_1Triggers"."Comment".value = "Simple_action"; + "khotkeysrc"."Data_2_1Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_2_1Triggers0"."Key".value = "Ctrl+Alt+I"; + "khotkeysrc"."Data_2_1Triggers0"."Type".value = "SHORTCUT"; + "khotkeysrc"."Data_2_1Triggers0"."Uuid".value = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; + "khotkeysrc"."Data_2_2"."Comment".value = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; + "khotkeysrc"."Data_2_2"."Enabled".value = false; + "khotkeysrc"."Data_2_2"."Name".value = "Type 'Hello'"; + "khotkeysrc"."Data_2_2"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_2Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_2Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_2_2Actions0"."Input".value = "Shift+H:E:L:L:O\n"; + "khotkeysrc"."Data_2_2Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_2Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_2Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_2Triggers"."Comment".value = "Simple_action"; + "khotkeysrc"."Data_2_2Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_2_2Triggers0"."Key".value = "Ctrl+Alt+H"; + "khotkeysrc"."Data_2_2Triggers0"."Type".value = "SHORTCUT"; + "khotkeysrc"."Data_2_2Triggers0"."Uuid".value = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; + "khotkeysrc"."Data_2_3"."Comment".value = "This action runs Konsole, after pressing Ctrl+Alt+T."; + "khotkeysrc"."Data_2_3"."Enabled".value = false; + "khotkeysrc"."Data_2_3"."Name".value = "Run Konsole"; + "khotkeysrc"."Data_2_3"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_3Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_3Actions0"."CommandURL".value = "konsole"; + "khotkeysrc"."Data_2_3Actions0"."Type".value = "COMMAND_URL"; + "khotkeysrc"."Data_2_3Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_3Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_3Triggers"."Comment".value = "Simple_action"; + "khotkeysrc"."Data_2_3Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_2_3Triggers0"."Key".value = "Ctrl+Alt+T"; + "khotkeysrc"."Data_2_3Triggers0"."Type".value = "SHORTCUT"; + "khotkeysrc"."Data_2_3Triggers0"."Uuid".value = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; + "khotkeysrc"."Data_2_4"."Comment".value = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; + "khotkeysrc"."Data_2_4"."Enabled".value = false; + "khotkeysrc"."Data_2_4"."Name".value = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; + "khotkeysrc"."Data_2_4"."Type".value = "GENERIC_ACTION_DATA"; + "khotkeysrc"."Data_2_4Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_4Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_2_4Actions0"."Input".value = "Ctrl+F4"; + "khotkeysrc"."Data_2_4Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_4Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_4Conditions"."ConditionsCount".value = 1; + "khotkeysrc"."Data_2_4Conditions0"."Type".value = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_4Conditions0Window"."Comment".value = "Qt Designer"; + "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount".value = 1; + "khotkeysrc"."Data_2_4Conditions0Window0"."Class".value = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType".value = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Comment".value = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."Role".value = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType".value = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Title".value = "Qt Designer by Trolltech"; + "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType".value = 2; + "khotkeysrc"."Data_2_4Conditions0Window0"."Type".value = "SIMPLE"; + "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes".value = 33; + "khotkeysrc"."Data_2_4Triggers"."Comment".value = ""; + "khotkeysrc"."Data_2_4Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_2_4Triggers0"."Key".value = "Ctrl+W"; + "khotkeysrc"."Data_2_4Triggers0"."Type".value = "SHORTCUT"; + "khotkeysrc"."Data_2_4Triggers0"."Uuid".value = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; + "khotkeysrc"."Data_2_5"."Comment".value = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; + "khotkeysrc"."Data_2_5"."Enabled".value = false; + "khotkeysrc"."Data_2_5"."Name".value = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; + "khotkeysrc"."Data_2_5"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_5Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_5Actions0"."Arguments".value = ""; + "khotkeysrc"."Data_2_5Actions0"."Call".value = "popupExecuteCommand"; + "khotkeysrc"."Data_2_5Actions0"."RemoteApp".value = "org.kde.krunner"; + "khotkeysrc"."Data_2_5Actions0"."RemoteObj".value = "/App"; + "khotkeysrc"."Data_2_5Actions0"."Type".value = "DBUS"; + "khotkeysrc"."Data_2_5Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_5Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_5Triggers"."Comment".value = "Simple_action"; + "khotkeysrc"."Data_2_5Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_2_5Triggers0"."Key".value = "Ctrl+Alt+W"; + "khotkeysrc"."Data_2_5Triggers0"."Type".value = "SHORTCUT"; + "khotkeysrc"."Data_2_5Triggers0"."Uuid".value = "{04f1cf14-2324-43a4-854e-867e289623db}"; + "khotkeysrc"."Data_2_6"."Comment".value = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; + "khotkeysrc"."Data_2_6"."Enabled".value = false; + "khotkeysrc"."Data_2_6"."Name".value = "Next in XMMS"; + "khotkeysrc"."Data_2_6"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_6Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_6Actions0"."DestinationWindow".value = 1; + "khotkeysrc"."Data_2_6Actions0"."Input".value = "B"; + "khotkeysrc"."Data_2_6Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment".value = "XMMS window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount".value = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class".value = "XMMS_Player"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType".value = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment".value = "XMMS Player window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role".value = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType".value = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title".value = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType".value = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type".value = "SIMPLE"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes".value = 33; + "khotkeysrc"."Data_2_6Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_6Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_6Triggers"."Comment".value = "Simple_action"; + "khotkeysrc"."Data_2_6Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_2_6Triggers0"."Key".value = "Ctrl+Alt+B"; + "khotkeysrc"."Data_2_6Triggers0"."Type".value = "SHORTCUT"; + "khotkeysrc"."Data_2_6Triggers0"."Uuid".value = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; + "khotkeysrc"."Data_2_7"."Comment".value = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; + "khotkeysrc"."Data_2_7"."DataCount".value = 4; + "khotkeysrc"."Data_2_7"."Enabled".value = false; + "khotkeysrc"."Data_2_7"."Name".value = "Konqi Gestures"; + "khotkeysrc"."Data_2_7"."SystemGroup".value = 0; + "khotkeysrc"."Data_2_7"."Type".value = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2_7Conditions"."Comment".value = "Konqueror window"; + "khotkeysrc"."Data_2_7Conditions"."ConditionsCount".value = 1; + "khotkeysrc"."Data_2_7Conditions0"."Type".value = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_7Conditions0Window"."Comment".value = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount".value = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Class".value = "konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType".value = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Comment".value = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."Role".value = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType".value = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Title".value = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType".value = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Type".value = "SIMPLE"; + "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes".value = 33; + "khotkeysrc"."Data_2_7_1"."Comment".value = ""; + "khotkeysrc"."Data_2_7_1"."Enabled".value = false; + "khotkeysrc"."Data_2_7_1"."Name".value = "Back"; + "khotkeysrc"."Data_2_7_1"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_1Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_2_7_1Actions0"."Input".value = "Alt+Left"; + "khotkeysrc"."Data_2_7_1Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_1Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_7_1Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount".value = 3; + "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData".value = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData".value = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers1"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData".value = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_1Triggers2"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_2"."Comment".value = ""; + "khotkeysrc"."Data_2_7_2"."Enabled".value = false; + "khotkeysrc"."Data_2_7_2"."Name".value = "Forward"; + "khotkeysrc"."Data_2_7_2"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_2Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_2_7_2Actions0"."Input".value = "Alt+Right"; + "khotkeysrc"."Data_2_7_2Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_2Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_7_2Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount".value = 3; + "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData".value = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData".value = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers1"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData".value = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_2Triggers2"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_3"."Comment".value = ""; + "khotkeysrc"."Data_2_7_3"."Enabled".value = false; + "khotkeysrc"."Data_2_7_3"."Name".value = "Up"; + "khotkeysrc"."Data_2_7_3"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_3Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_2_7_3Actions0"."Input".value = "Alt+Up"; + "khotkeysrc"."Data_2_7_3Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_3Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_7_3Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount".value = 3; + "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData".value = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData".value = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_3Triggers1"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData".value = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers2"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_4"."Comment".value = ""; + "khotkeysrc"."Data_2_7_4"."Enabled".value = false; + "khotkeysrc"."Data_2_7_4"."Name".value = "Reload"; + "khotkeysrc"."Data_2_7_4"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_4Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_2_7_4Actions0"."Input".value = "F5"; + "khotkeysrc"."Data_2_7_4Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_4Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_7_4Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount".value = 3; + "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData".value = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData".value = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_4Triggers1"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData".value = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers2"."Type".value = "GESTURE"; + "khotkeysrc"."Data_2_8"."Comment".value = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; + "khotkeysrc"."Data_2_8"."Enabled".value = false; + "khotkeysrc"."Data_2_8"."Name".value = "Go to KDE Website"; + "khotkeysrc"."Data_2_8"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_8Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_2_8Actions0"."CommandURL".value = "http://www.kde.org"; + "khotkeysrc"."Data_2_8Actions0"."Type".value = "COMMAND_URL"; + "khotkeysrc"."Data_2_8Conditions"."Comment".value = ""; + "khotkeysrc"."Data_2_8Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_2_8Triggers"."Comment".value = "Simple_action"; + "khotkeysrc"."Data_2_8Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_2_8Triggers0"."Key".value = "Meta+E"; + "khotkeysrc"."Data_2_8Triggers0"."Type".value = "SHORTCUT"; + "khotkeysrc"."Data_2_8Triggers0"."Uuid".value = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; + "khotkeysrc"."Data_3"."Comment".value = "Basic Konqueror gestures."; + "khotkeysrc"."Data_3"."DataCount".value = 14; + "khotkeysrc"."Data_3"."Enabled".value = true; + "khotkeysrc"."Data_3"."ImportId".value = "konqueror_gestures_kde321"; + "khotkeysrc"."Data_3"."Name".value = "Konqueror Gestures"; + "khotkeysrc"."Data_3"."SystemGroup".value = 0; + "khotkeysrc"."Data_3"."Type".value = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_3Conditions"."Comment".value = "Konqueror window"; + "khotkeysrc"."Data_3Conditions"."ConditionsCount".value = 1; + "khotkeysrc"."Data_3Conditions0"."Type".value = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_3Conditions0Window"."Comment".value = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window"."WindowsCount".value = 1; + "khotkeysrc"."Data_3Conditions0Window0"."Class".value = "^konquerors"; + "khotkeysrc"."Data_3Conditions0Window0"."ClassType".value = 3; + "khotkeysrc"."Data_3Conditions0Window0"."Comment".value = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."Role".value = "konqueror-mainwindow#1"; + "khotkeysrc"."Data_3Conditions0Window0"."RoleType".value = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Title".value = "file:/ - Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."TitleType".value = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Type".value = "SIMPLE"; + "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes".value = 1; + "khotkeysrc"."Data_3_1"."Comment".value = "Press, move left, release."; + "khotkeysrc"."Data_3_1"."Enabled".value = true; + "khotkeysrc"."Data_3_1"."Name".value = "Back"; + "khotkeysrc"."Data_3_1"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10"."Comment".value = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; + "khotkeysrc"."Data_3_10"."Enabled".value = false; + "khotkeysrc"."Data_3_10"."Name".value = "Stop Loading"; + "khotkeysrc"."Data_3_10"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_10Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_10Actions0"."Input".value = "Escape\n"; + "khotkeysrc"."Data_3_10Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_10Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_10Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_10Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_10Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_10Triggers0"."GesturePointData".value = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_10Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_11"."Comment".value = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; + "khotkeysrc"."Data_3_11"."Enabled".value = true; + "khotkeysrc"."Data_3_11"."Name".value = "Up"; + "khotkeysrc"."Data_3_11"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_11Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_11Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_11Actions0"."Input".value = "Alt+Up"; + "khotkeysrc"."Data_3_11Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_11Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_11Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_11Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_11Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_11Triggers0"."GesturePointData".value = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; + "khotkeysrc"."Data_3_11Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_12"."Comment".value = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; + "khotkeysrc"."Data_3_12"."Enabled".value = false; + "khotkeysrc"."Data_3_12"."Name".value = "Up #2"; + "khotkeysrc"."Data_3_12"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_12Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_12Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_12Actions0"."Input".value = "Alt+Up\n"; + "khotkeysrc"."Data_3_12Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_12Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_12Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_12Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_12Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_12Triggers0"."GesturePointData".value = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_12Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_13"."Comment".value = "Press, move up, move right, release."; + "khotkeysrc"."Data_3_13"."Enabled".value = true; + "khotkeysrc"."Data_3_13"."Name".value = "Activate Next Tab"; + "khotkeysrc"."Data_3_13"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_13Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_13Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_13Actions0"."Input".value = "Ctrl+.\n"; + "khotkeysrc"."Data_3_13Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_13Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_13Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_13Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_13Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_13Triggers0"."GesturePointData".value = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; + "khotkeysrc"."Data_3_13Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_14"."Comment".value = "Press, move up, move left, release."; + "khotkeysrc"."Data_3_14"."Enabled".value = true; + "khotkeysrc"."Data_3_14"."Name".value = "Activate Previous Tab"; + "khotkeysrc"."Data_3_14"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_14Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_14Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_14Actions0"."Input".value = "Ctrl+,"; + "khotkeysrc"."Data_3_14Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_14Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_14Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_14Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_14Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_14Triggers0"."GesturePointData".value = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_14Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_1Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_1Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_1Actions0"."Input".value = "Alt+Left"; + "khotkeysrc"."Data_3_1Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_1Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_1Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_1Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_1Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_1Triggers0"."GesturePointData".value = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_3_1Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_2"."Comment".value = "Press, move down, move up, move down, release."; + "khotkeysrc"."Data_3_2"."Enabled".value = true; + "khotkeysrc"."Data_3_2"."Name".value = "Duplicate Tab"; + "khotkeysrc"."Data_3_2"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_2Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_2Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_2Actions0"."Input".value = "Ctrl+Shift+D\n"; + "khotkeysrc"."Data_3_2Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_2Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_2Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_2Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_2Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_2Triggers0"."GesturePointData".value = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_2Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_3"."Comment".value = "Press, move down, move up, release."; + "khotkeysrc"."Data_3_3"."Enabled".value = true; + "khotkeysrc"."Data_3_3"."Name".value = "Duplicate Window"; + "khotkeysrc"."Data_3_3"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_3Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_3Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_3Actions0"."Input".value = "Ctrl+D\n"; + "khotkeysrc"."Data_3_3Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_3Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_3Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_3Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_3Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_3Triggers0"."GesturePointData".value = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_3Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_4"."Comment".value = "Press, move right, release."; + "khotkeysrc"."Data_3_4"."Enabled".value = true; + "khotkeysrc"."Data_3_4"."Name".value = "Forward"; + "khotkeysrc"."Data_3_4"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_4Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_4Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_4Actions0"."Input".value = "Alt+Right"; + "khotkeysrc"."Data_3_4Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_4Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_4Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_4Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_4Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_4Triggers0"."GesturePointData".value = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_3_4Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_5"."Comment".value = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; + "khotkeysrc"."Data_3_5"."Enabled".value = true; + "khotkeysrc"."Data_3_5"."Name".value = "Home"; + "khotkeysrc"."Data_3_5"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_5Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_5Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_5Actions0"."Input".value = "Alt+Home\n"; + "khotkeysrc"."Data_3_5Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_5Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_5Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_5Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_5Triggers"."TriggersCount".value = 2; + "khotkeysrc"."Data_3_5Triggers0"."GesturePointData".value = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_5Triggers1"."GesturePointData".value = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers1"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_6"."Comment".value = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; + "khotkeysrc"."Data_3_6"."Enabled".value = true; + "khotkeysrc"."Data_3_6"."Name".value = "Close Tab"; + "khotkeysrc"."Data_3_6"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_6Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_6Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_6Actions0"."Input".value = "Ctrl+W\n"; + "khotkeysrc"."Data_3_6Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_6Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_6Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_6Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_6Triggers"."TriggersCount".value = 2; + "khotkeysrc"."Data_3_6Triggers0"."GesturePointData".value = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_6Triggers1"."GesturePointData".value = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers1"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_7"."Comment".value = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; + "khotkeysrc"."Data_3_7"."Enabled".value = true; + "khotkeysrc"."Data_3_7"."Name".value = "New Tab"; + "khotkeysrc"."Data_3_7"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_7Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_7Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_7Actions0"."Input".value = "Ctrl+Shift+N"; + "khotkeysrc"."Data_3_7Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_7Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_7Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_7Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_7Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_7Triggers0"."GesturePointData".value = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_7Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_8"."Comment".value = "Press, move down, release."; + "khotkeysrc"."Data_3_8"."Enabled".value = true; + "khotkeysrc"."Data_3_8"."Name".value = "New Window"; + "khotkeysrc"."Data_3_8"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_8Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_8Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_8Actions0"."Input".value = "Ctrl+N\n"; + "khotkeysrc"."Data_3_8Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_8Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_8Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_8Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_8Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_8Triggers0"."GesturePointData".value = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_8Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."Data_3_9"."Comment".value = "Press, move up, move down, release."; + "khotkeysrc"."Data_3_9"."Enabled".value = true; + "khotkeysrc"."Data_3_9"."Name".value = "Reload"; + "khotkeysrc"."Data_3_9"."Type".value = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_9Actions"."ActionsCount".value = 1; + "khotkeysrc"."Data_3_9Actions0"."DestinationWindow".value = 2; + "khotkeysrc"."Data_3_9Actions0"."Input".value = "F5"; + "khotkeysrc"."Data_3_9Actions0"."Type".value = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_9Conditions"."Comment".value = ""; + "khotkeysrc"."Data_3_9Conditions"."ConditionsCount".value = 0; + "khotkeysrc"."Data_3_9Triggers"."Comment".value = "Gesture_triggers"; + "khotkeysrc"."Data_3_9Triggers"."TriggersCount".value = 1; + "khotkeysrc"."Data_3_9Triggers0"."GesturePointData".value = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_9Triggers0"."Type".value = "GESTURE"; + "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions[$d]".value = ""; + "khotkeysrc"."General"."BrowserApplication[$d]".value = ""; + "khotkeysrc"."General"."ColorSchemeHash[$d]".value = ""; + "khotkeysrc"."General"."ColorScheme[$d]".value = ""; + "khotkeysrc"."Gestures"."Disabled".value = true; + "khotkeysrc"."Gestures"."MouseButton".value = 2; + "khotkeysrc"."Gestures"."Timeout".value = 300; + "khotkeysrc"."GesturesExclude"."Comment".value = ""; + "khotkeysrc"."GesturesExclude"."WindowsCount".value = 0; + "khotkeysrc"."Icons"."Theme[$d]".value = ""; + "khotkeysrc"."KDE"."AnimationDurationFactor[$d]".value = ""; + "khotkeysrc"."KDE"."LookAndFeelPackage[$d]".value = ""; + "khotkeysrc"."KDE"."ShowDeleteCommand[$d]".value = ""; + "khotkeysrc"."KDE"."SingleClick[$d]".value = ""; + "khotkeysrc"."KDE"."widgetStyle[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]".value = ""; + "khotkeysrc"."KFileDialog Settings"."View Style[$d]".value = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]".value = ""; + "khotkeysrc"."Main"."AlreadyImported".value = "defaults,kde32b1,konqueror_gestures_kde321"; + "khotkeysrc"."Main"."Disabled".value = false; + "khotkeysrc"."PreviewSettings"."MaximumRemoteSize[$d]".value = ""; + "khotkeysrc"."Voice"."Shortcut".value = ""; + "khotkeysrc"."WM"."activeBackground[$d]".value = ""; + "khotkeysrc"."WM"."activeBlend[$d]".value = ""; + "khotkeysrc"."WM"."activeForeground[$d]".value = ""; + "khotkeysrc"."WM"."inactiveBackground[$d]".value = ""; + "khotkeysrc"."WM"."inactiveBlend[$d]".value = ""; + "khotkeysrc"."WM"."inactiveForeground[$d]".value = ""; + "kiorc"."Confirmations"."ConfirmDelete".value = true; + "kiorc"."Confirmations"."ConfirmEmptyTrash".value = true; + "kiorc"."Confirmations"."ConfirmTrash".value = false; + "kiorc"."Executable scripts"."behaviourOnLaunch".value = "alwaysAsk"; + "krunnerrc"."Plugins"."baloosearchEnabled".value = false; + "krunnerrc"."Plugins"."locationsEnabled".value = true; + "krunnerrc"."Plugins"."placesEnabled".value = true; + "krunnerrc"."Plugins"."recentdocumentsEnabled".value = true; + "kservicemenurc"."Show"."compressfileitemaction".value = true; + "kservicemenurc"."Show"."extractfileitemaction".value = true; + "kservicemenurc"."Show"."forgetfileitemaction".value = true; + "kservicemenurc"."Show"."installFont".value = true; + "kservicemenurc"."Show"."kactivitymanagerd_fileitem_linking_plugin".value = true; + "kservicemenurc"."Show"."kdeconnectfileitemaction".value = true; + "kservicemenurc"."Show"."kio-admin".value = true; + "kservicemenurc"."Show"."mountisoaction".value = true; + "kservicemenurc"."Show"."nextclouddolphinactionplugin".value = true; + "kservicemenurc"."Show"."runInKonsole".value = true; + "kservicemenurc"."Show"."setAsWallpaper".value = true; + "kservicemenurc"."Show"."slideshowfileitemaction".value = true; + "kservicemenurc"."Show"."tagsfileitemaction".value = true; + "kwalletrc"."Wallet"."First Use".value = false; + "kwinrc"."Desktops"."Id_1".value = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; + "kwinrc"."Desktops"."Id_2".value = "389927fc-9c76-4f84-ae0d-011cf76868e6"; + "kwinrc"."Desktops"."Id_3".value = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; + "kwinrc"."Desktops"."Id_4".value = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; + "kwinrc"."Desktops"."Number".value = 4; + "kwinrc"."Desktops"."Rows".value = 2; + "kwinrc"."Effect-diminactive"."Strength".value = 15; + "kwinrc"."Effect-magiclamp"."AnimationDuration".value = 20; + "kwinrc"."NightColor"."Active".value = true; + "kwinrc"."NightColor"."LatitudeFixed".value = 52.31865273558926; + "kwinrc"."NightColor"."LongitudeFixed".value = 5.44; + "kwinrc"."NightColor"."Mode".value = "Location"; + "kwinrc"."NightColor"."NightTemperature".value = 1400; + "kwinrc"."Plugins"."diminactiveEnabled".value = true; + "kwinrc"."Plugins"."dimscreenEnabled".value = true; + "kwinrc"."Plugins"."wobblywindowsEnabled".value = true; + "kwinrc"."Tiling"."padding".value = 4; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}],\"width\":1}]}"; + "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5231481481481481,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.4979166666666667},{\"width\":0.5020833333333333}]},{\"height\":0.47685185185185075,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.49895833333333334},{\"width\":0.5010416666666666}]}],\"width\":1}]}"; + "kwinrc"."Xwayland"."Scale".value = 1; + "kxkbrc"."Layout"."Options".value = "compose:caps"; + "kxkbrc"."Layout"."ResetOldOptions".value = true; + "plasma-localerc"."Formats"."LANG".value = "en_US.UTF-8"; + "plasma-localerc"."Formats"."LC_ADDRESS".value = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MEASUREMENT".value = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY".value = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NAME".value = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NUMERIC".value = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_PAPER".value = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TELEPHONE".value = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TIME".value = "en_DK.UTF-8"; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize".value = 16; }; }; } From f73d7b51e7d35fff4ad9c31881fd370e0e88201f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Mar 2024 17:32:38 +0100 Subject: [PATCH 1610/2308] Change update to hopefully use the new flake with the check --- pkgs/update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix index 94d98d6..76f5760 100644 --- a/pkgs/update/default.nix +++ b/pkgs/update/default.nix @@ -18,9 +18,9 @@ writeShellApplication pushd ./update > /dev/null echo "Updating flake lock..." nix flake update - git add flake.lock - sudo nix flake check + git stage ./flake.lock git commit -m "update flake lock" + sudo nix flake check git push popd > /dev/null echo "Cleaning up repository in '/tmp/update'..." From 6c0896c5a1999b747bbd1fb608c69a1b04acb301 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Mar 2024 17:32:52 +0100 Subject: [PATCH 1611/2308] update flake lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 3e9cd2c..622bb36 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1711172967, - "narHash": "sha256-HBkYzSfFM0oMnRSjquI1CJ7a4jtIv9eRbAeJZDE8H3M=", + "lastModified": 1711506264, + "narHash": "sha256-GaQJvPyEkZu3YMdV9m1UENoeE10fkV6PcnLUtzPmuOY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "101cb34f9a1b94b91717af3581f35386f20d4601", + "rev": "051668b62b76270dc8ad3b011c6adbfe8ee8bde2", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1711261295, - "narHash": "sha256-5DUNQl9BSmLxgGLbF05G7hi/UTk9DyZq8AuEszhQA7Q=", + "lastModified": 1711462743, + "narHash": "sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng=", "owner": "nix-community", "repo": "disko", - "rev": "5d2d3e421ade554b19b4dbb0d11a04023378a330", + "rev": "a6717b1afee7ae955c61eefdf0ce8f864ef78115", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1711554349, + "narHash": "sha256-RypwcWEIFePBI0Hubfj4chanbM/G2yzJzC6wgz+dmS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "179f6acaf7c068c7870542cdae72afec9427a5b0", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711333969, + "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711370797, - "narHash": "sha256-2xu0jVSjuKhN97dqc4bVtvEH52Rwh6+uyI1XCnzoUyI=", + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c726225724e681b3626acc941c6f95d2b0602087", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711333969, + "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1711295162, - "narHash": "sha256-gPTTYKvdnmaLcgOSpqtKHIf8J60J3Z4jAqXTwluxxUk=", + "lastModified": 1711549217, + "narHash": "sha256-O9fCqmgrlRyNpApIVqhYyVSjKWfVzrw9qsEzeTYfBEc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "8a032af55ed686ab21e60530080462a1438812b9", + "rev": "298f345f3ca9528ca88dbbbdcadfc270b7582ded", "type": "github" }, "original": { From 53c1656d6bda8728cf1d129d7f65eae03f51e0cb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Mar 2024 18:22:58 +0100 Subject: [PATCH 1612/2308] Replace nheko with cinny --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 9941781..f0f6833 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -56,7 +56,7 @@ kate # Chat applications: - nheko + cinny signal-desktop webcord-vencord From 98481672784b2d14a0995118de4516d4f35f26bc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Mar 2024 18:24:49 +0100 Subject: [PATCH 1613/2308] Desktop version though please --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index f0f6833..c5b237e 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -56,7 +56,7 @@ kate # Chat applications: - cinny + cinny-desktop signal-desktop webcord-vencord From 8d022bb9de27b12fccab503353ae02e38337b21d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 10:00:15 +0100 Subject: [PATCH 1614/2308] Replace teams-for-linux with teams --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index c5b237e..0eec6d0 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -70,7 +70,7 @@ # Office applications: onlyoffice-bin - teams-for-linux + teams gimp thunderbird From 7611eb763ff16aa0e28a4adca908868ee13ac78c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 10:01:02 +0100 Subject: [PATCH 1615/2308] Never mind that's only for darwin --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 0eec6d0..c5b237e 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -70,7 +70,7 @@ # Office applications: onlyoffice-bin - teams + teams-for-linux gimp thunderbird From 740e79cc9f94539a30d570c0cc57476b6ef7562c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 11:12:02 +0100 Subject: [PATCH 1616/2308] Add telegraf logging to queen (hardware logging) --- .../package-configs/dashboard/default.nix | 1 + .../dashboard/telegraf/default.nix | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 nixos/server/package-configs/dashboard/telegraf/default.nix diff --git a/nixos/server/package-configs/dashboard/default.nix b/nixos/server/package-configs/dashboard/default.nix index 5bbfb09..6cb610e 100644 --- a/nixos/server/package-configs/dashboard/default.nix +++ b/nixos/server/package-configs/dashboard/default.nix @@ -10,5 +10,6 @@ ./grafana #./loki ./prometheus + ./telegraf ]; } diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix new file mode 100644 index 0000000..dd9df4d --- /dev/null +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -0,0 +1,53 @@ +{ + inputs, + lib, + config, + pkgs, + user, + ... +}: { + services.telegraf = { + enable = true; + extraConfig = { + agent = { + interval = "10s"; + round_interval = true; + metric_batch_size = 1000; + metric_buffer_limit = 10000; + collection_jitter = "0s"; + flush_interval = "10s"; + flush_jitter = "0s"; + precision = ""; + debug = false; + quiet = false; + logfile = ""; + hostname = "queen"; + omit_hostname = false; + }; + inputs = { + cpu = { + percpu = true; + totalcpu = true; + collect_cpu_time = false; + report_active = false; + core_tags = false; + }; + disk = { + ignore_fs = ["tmpfs" "devtmpfs" "devfs" "overlay" "aufs" "squashfs"]; + }; + diskio = {}; + kernel = {}; + mem = {}; + system = {}; + }; + # outputs = { + # influxdb_v2 = { + # urls = ["http://monitoringvm:8086"]; + # token = "\${influx_token}"; + # organization = "home"; + # bucket = "tigstack"; + # }; + # }; + }; + }; +} From 37d5223f3202a048d97241ed5809777712d7221d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 11:19:01 +0100 Subject: [PATCH 1617/2308] Set up influxdb as output --- .../dashboard/telegraf/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index dd9df4d..efddb65 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -40,14 +40,14 @@ mem = {}; system = {}; }; - # outputs = { - # influxdb_v2 = { - # urls = ["http://monitoringvm:8086"]; - # token = "\${influx_token}"; - # organization = "home"; - # bucket = "tigstack"; - # }; - # }; + outputs = { + influxdb_v2 = { + database = "telegraf"; + urls = ["localhost:8086"]; + }; + }; }; }; + + services.influxdb.enable = true; } From abba99a2b39c6bfe295ba1bb9b1ded441b0c59a0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 11:21:01 +0100 Subject: [PATCH 1618/2308] no v2 --- nixos/server/package-configs/dashboard/telegraf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index efddb65..d9b380c 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -41,7 +41,7 @@ system = {}; }; outputs = { - influxdb_v2 = { + influxdb = { database = "telegraf"; urls = ["localhost:8086"]; }; From 4e05dfccf498644e9f34a857cc1d8409ac532786 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 11:37:35 +0100 Subject: [PATCH 1619/2308] link telegraf to grafana --- nixos/hosts/queen/secrets/sops.yaml | 5 +++-- .../package-configs/dashboard/telegraf/default.nix | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index 87cc66f..28ef94f 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -9,6 +9,7 @@ rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8u wg-private: ENC[AES256_GCM,data:6BEuNqqG//p5UhRmQ4RPEze6jZdvzK4PEXxlbX2ANYIhFpacj0aZnCr9o/A=,iv:tPlwYdV4I5oA8qG+bfVi1Dpbf7xedByantqsmylZXKQ=,tag:k1BqKqlayOWz5QW1XiAjqQ==,type:str] lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW7IUpjHMyS7YP+pmmvDCzM9afIXMxyPFHGNRwiCmxqstiiNeSeLdo6rDw==,iv:sGeu9aNTgdpThv+0Z/nZKIrat1xNgM0t/KTGPaFbsdI=,tag:kZBHF4X0KO9znog61NwU+Q==,type:str] coturn-auth-secret: ENC[AES256_GCM,data:RYxyATuYIcrGd8h8Gc4CP9ZQ80ekuuwHehnOPYisHejmycgT8a2mWpk+5r3HkFmBNcLDeNlfnhIif5oLHGuHyw==,iv:M2GdNDxP4xpP35FJPTgljbcKpOm6DmEEnIYRItAxDVI=,tag:IiiNXeTi6Yja5PrnKRkhdA==,type:str] +grafana-telegraf-key: ENC[AES256_GCM,data:agpUzG1/n2NAKDt45IgelmDf0CUlC82fmD4f7JdcszNuUg7uCNA7XeaJ6PZtHQ==,iv:keo3i+qSbtXkA5fyCr2S5z9nJS9bXUn5WDiPgWocPU8=,tag:p/nDff10PRhi9pOszp1PnA==,type:str] sops: kms: [] gcp_kms: [] @@ -24,8 +25,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-03-24T19:25:02Z" - mac: ENC[AES256_GCM,data:Bd2CcyaZk3C5hOFzCo54dKpBduR2fEr6J78pS3bBVvIDMWAL574k2mtYwzixaXPGbUdPMccRhYZcYyhq6x0A+g99kcZYqDV1lRRBUfg6mJ/eEDLcoD3rYd3XgWFzen6PKTsg/rL35EG2EVVSndZKTx4AI0213lcv6BYeb7cZt/0=,iv:UOxGbO07FTcaknwoUMBwlG+AR4EmZeAd3KJkpPwDJL4=,tag:uyoRQVZ3hM6TWsQB3Lin9g==,type:str] + lastmodified: "2024-03-28T10:35:21Z" + mac: ENC[AES256_GCM,data:LAcaqwQ3GjFSFNVMfg84ljcB4Lb4Kzqgs9WFdi2sXJWeIs+G1/2/Ij4mMSfplirftG6uhU0DJyfP0IEgRvG0oxFOnidsrueWMQ5q1tHmxuOEus7wGeNbvKlNPzb8bMeeVnhTUyvJkeFMb2HPlEIaND15RCF4WoLz56egnPYt0Jg=,iv:8NfgonzySTn+h3c7OCZYWBvfk2TxE5QCNjeSUIUTLi4=,tag:xhbPJkFpxXUn2TpAVrU6Mw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index d9b380c..ca94709 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -6,6 +6,8 @@ user, ... }: { + sops.secrets."grafana-telegraf-key".mode = "0440"; + sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name; services.telegraf = { enable = true; extraConfig = { @@ -41,13 +43,12 @@ system = {}; }; outputs = { - influxdb = { - database = "telegraf"; - urls = ["localhost:8086"]; + http = { + url = "http://localhost:${toString config.services.prometheus.port}/api/live/push/custom_stream_id"; + data_format = "influx"; + headers = "Authorization: Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398"; }; }; }; }; - - services.influxdb.enable = true; } From 1ef1e10abedb7fd40fe0814f7c272c3dc213fd48 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 11:42:00 +0100 Subject: [PATCH 1620/2308] Maybe this? --- nixos/server/package-configs/dashboard/telegraf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index ca94709..1da8ba7 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -46,7 +46,7 @@ http = { url = "http://localhost:${toString config.services.prometheus.port}/api/live/push/custom_stream_id"; data_format = "influx"; - headers = "Authorization: Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398"; + outputs.http.headers = "Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398"; }; }; }; From 59d33d4274266f3aabf6f70bd36d6b83a4c09ac8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 11:45:20 +0100 Subject: [PATCH 1621/2308] Maybe websockets? --- nixos/server/package-configs/dashboard/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index 1da8ba7..705a10b 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -43,10 +43,10 @@ system = {}; }; outputs = { - http = { - url = "http://localhost:${toString config.services.prometheus.port}/api/live/push/custom_stream_id"; + websocket = { + url = "ws://localhost:${toString config.services.prometheus.port}/api/live/push/custom_stream_id"; data_format = "influx"; - outputs.http.headers = "Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398"; + outputs.websocket.headers = "Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398"; }; }; }; From 09923e93ff011231228e7f0dbe1975f69a59e932 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 11:47:55 +0100 Subject: [PATCH 1622/2308] Last go --- nixos/server/package-configs/dashboard/telegraf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index 705a10b..ecef2f6 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -46,7 +46,7 @@ websocket = { url = "ws://localhost:${toString config.services.prometheus.port}/api/live/push/custom_stream_id"; data_format = "influx"; - outputs.websocket.headers = "Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398"; + headers = "Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398"; }; }; }; From 2d3538be4f2b1475396181e190ad3f4a7afb5bdb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 11:52:19 +0100 Subject: [PATCH 1623/2308] Maybe this then? --- nixos/server/package-configs/dashboard/telegraf/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index ecef2f6..8704bbc 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -46,7 +46,9 @@ websocket = { url = "ws://localhost:${toString config.services.prometheus.port}/api/live/push/custom_stream_id"; data_format = "influx"; - headers = "Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398"; + headers = { + Authorisation = "Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398"; + }; }; }; }; From e70a27ec79569bc9e64da4f1c1ac0496fa0114d0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 11:53:28 +0100 Subject: [PATCH 1624/2308] Use telegraf as the steam ID --- nixos/server/package-configs/dashboard/telegraf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index 8704bbc..0c6e6ba 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -44,7 +44,7 @@ }; outputs = { websocket = { - url = "ws://localhost:${toString config.services.prometheus.port}/api/live/push/custom_stream_id"; + url = "ws://localhost:${toString config.services.prometheus.port}/api/live/push/telegraf"; data_format = "influx"; headers = { Authorisation = "Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398"; From 1199eeb960f5d8e553a52cf6ea842467a1222efd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 13:47:41 +0100 Subject: [PATCH 1625/2308] Let's try this ipv6 again --- nixos/hosts/queen/configuration.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index b9b6dcc..24a412a 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -100,7 +100,14 @@ networking.nat.internalInterfaces = ["ve-+"]; networking.nat.externalInterface = "ens18"; networking.enableIPv6 = lib.mkForce true; - networking.nameservers = ["1.1.1.1"]; + networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; + + networking.interfaces.ens18.ipv6 = [ + { + address = "2a02:c207:2063:2448::1"; + prefixLength = 64; + } + ]; # Contabo ipv6 nameservers: "2a02:c207::1:53" "2a02:c207::2:53" From d4037d5739da33aa84bc64beecd1225c75cf52f1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 13:49:44 +0100 Subject: [PATCH 1626/2308] addresses might be important there --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 24a412a..70a7f2e 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -102,7 +102,7 @@ networking.enableIPv6 = lib.mkForce true; networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; - networking.interfaces.ens18.ipv6 = [ + networking.interfaces.ens18.ipv6.addresses = [ { address = "2a02:c207:2063:2448::1"; prefixLength = 64; From 32e4cbd4e0650645ae6c0cdd7fbecbab4cd3681c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 13:54:25 +0100 Subject: [PATCH 1627/2308] Re-enable ipv4 --- nixos/hosts/queen/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 70a7f2e..3b19614 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -102,6 +102,12 @@ networking.enableIPv6 = lib.mkForce true; networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; + networking.interfaces.ens18.ipv4.addresses = [ + { + address = "62.171.160.195"; + } + ]; + networking.interfaces.ens18.ipv6.addresses = [ { address = "2a02:c207:2063:2448::1"; From 126f5dbe2fb55f1d97b09a4b99eb34cfbe9af27f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Mar 2024 14:00:06 +0100 Subject: [PATCH 1628/2308] Add prefixLength to ipv4 --- nixos/hosts/queen/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 3b19614..e8fbf46 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -105,6 +105,7 @@ networking.interfaces.ens18.ipv4.addresses = [ { address = "62.171.160.195"; + prefixLength = 32; } ]; From bac26bc9c3782a9332416ba9d814871805d7377e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 29 Mar 2024 21:53:54 +0100 Subject: [PATCH 1629/2308] update flake lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 622bb36..781e006 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1711462743, - "narHash": "sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng=", + "lastModified": 1711588700, + "narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=", "owner": "nix-community", "repo": "disko", - "rev": "a6717b1afee7ae955c61eefdf0ce8f864ef78115", + "rev": "502241afa3de2a24865ddcbe4c122f4546e32092", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1711554349, - "narHash": "sha256-RypwcWEIFePBI0Hubfj4chanbM/G2yzJzC6wgz+dmS4=", + "lastModified": 1711625603, + "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "179f6acaf7c068c7870542cdae72afec9427a5b0", + "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1711375484, - "narHash": "sha256-+d4HqehyQvuHUKR8Nv9HGGd/SP5wjg3MA/hEYJBWQq0=", + "lastModified": 1711626141, + "narHash": "sha256-0qV1pHeIyUZ18cp8ijQnMf7uV+Uk4+UqTCC6yGSGWvk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "2b3720c7af2271be8cee713cd2f69c5127b0a8e4", + "rev": "63194fceafbfe583a9eb7d16ab499adc0a6c0bc2", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1711333969, - "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "lastModified": 1711715736, + "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1711333969, - "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { From 168d84170436c4f4147344cb77141f0c853aec79 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Mar 2024 17:59:43 +0200 Subject: [PATCH 1630/2308] update flake lock --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 781e006..4b69ef8 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1711506264, - "narHash": "sha256-GaQJvPyEkZu3YMdV9m1UENoeE10fkV6PcnLUtzPmuOY=", + "lastModified": 1711850778, + "narHash": "sha256-LUctBrbSTAZ6TRtXsWju4AuNf9OhcbxNni0PRBGKE1c=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "051668b62b76270dc8ad3b011c6adbfe8ee8bde2", + "rev": "00ddc1c88ec9137225840d9d788db0bc6f6939d1", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1709619709, - "narHash": "sha256-l6EPVJfwfelWST7qWQeP6t/TDK3HHv5uUB1b2vw4mOQ=", + "lastModified": 1711606966, + "narHash": "sha256-nTaO7ZDL4D02dVC5ktqnXNiNuODBUHyE4qEcFjAUCQY=", "owner": "nix-community", "repo": "fenix", - "rev": "c8943ea9e98d41325ff57d4ec14736d330b321b2", + "rev": "aa45c3e901ea42d6633af083c0c555efaf948b17", "type": "github" }, "original": { @@ -312,11 +312,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1711625603, - "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", + "lastModified": 1711868868, + "narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", + "rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab", "type": "github" }, "original": { @@ -469,11 +469,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1711233294, - "narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=", + "lastModified": 1711819797, + "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68", + "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -717,11 +717,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1711200738, - "narHash": "sha256-dkJmk/ET/tRV4007O6kU101UEg1svUwiyk/zEEX9Tdg=", + "lastModified": 1711715736, + "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20bc93ca7b2158ebc99b8cef987a2173a81cde35", + "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1711549217, - "narHash": "sha256-O9fCqmgrlRyNpApIVqhYyVSjKWfVzrw9qsEzeTYfBEc=", + "lastModified": 1711880258, + "narHash": "sha256-4lcNTaKYxKXqAD+OrTC68T2W/Cr69VSogS+R5tjdn+M=", "owner": "pjones", "repo": "plasma-manager", - "rev": "298f345f3ca9528ca88dbbbdcadfc270b7582ded", + "rev": "22b423b9c6f157373d56413835d1d65ea4c5f481", "type": "github" }, "original": { @@ -834,11 +834,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1709571018, - "narHash": "sha256-ISFrxHxE0J5g7lDAscbK88hwaT5uewvWoma9TlFmRzM=", + "lastModified": 1711562745, + "narHash": "sha256-s/YOyBM0vumhkqCFi8CnV5imFlC5JJrGia8CmEXyQkM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9f14343f9ee24f53f17492c5f9b653427e2ad15e", + "rev": "ad51a17c627b4ca57f83f0dc1f3bb5f3f17e6d0b", "type": "github" }, "original": { @@ -901,11 +901,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1711249319, - "narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=", + "lastModified": 1711855048, + "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "405987a66cce9a4a82f321f11b205982a7127c88", + "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10", "type": "github" }, "original": { From be53c14edcbf3fbd090d0c7a7c62886617246265 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Mar 2024 19:52:23 +0200 Subject: [PATCH 1631/2308] Use steamcmd instead of steam --- pkgs/auto-mount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 37a8ef2..8f44c02 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -16,7 +16,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest]; + runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steamPackages.steamcmd]; text = '' set -euo pipefail @@ -76,7 +76,7 @@ writeShellApplication # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt - systemd-run -M 1000@ --user --collect --wait sh -c "export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD ${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steamPackages.steamcmd}/bin/steamcmd steam://''${command}/''${encoded@Q}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" fi From 540cdc9b91d3241cca4d4f19dbfd6109765ddad9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Mar 2024 20:11:22 +0200 Subject: [PATCH 1632/2308] That isn't what I thought it was --- pkgs/auto-mount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 8f44c02..37a8ef2 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -16,7 +16,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steamPackages.steamcmd]; + runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest]; text = '' set -euo pipefail @@ -76,7 +76,7 @@ writeShellApplication # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt - systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steamPackages.steamcmd}/bin/steamcmd steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD ${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" fi From 208ebdddd1e11d156681986b76dd13894abf8ef0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Mar 2024 20:15:13 +0200 Subject: [PATCH 1633/2308] Remove a comment from queen, enable x11 on shodan for steam input workaround... --- nixos/hosts/queen/configuration.nix | 2 -- nixos/hosts/shodan/configuration.nix | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index e8fbf46..ee40678 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -116,8 +116,6 @@ } ]; - # Contabo ipv6 nameservers: "2a02:c207::1:53" "2a02:c207::2:53" - # Open ports in the firewall. networking.firewall = { enable = true; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 341f55a..a11f1df 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -134,9 +134,10 @@ services.desktopManager.plasma6.enable = true; programs.kdeconnect.enable = true; + services.xserver.displayManager.defaultSession = "plasmax11"; services.xserver.displayManager.sddm.settings = { Autologin = { - Session = "plasma.desktop"; + Session = "plasmax11.desktop"; User = "lillian"; }; }; From ae1e57b209c3d185804421760a1205456052c6d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Mar 2024 20:15:54 +0200 Subject: [PATCH 1634/2308] Force disable sddm wayland too --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index a11f1df..9fad544 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -135,6 +135,7 @@ programs.kdeconnect.enable = true; services.xserver.displayManager.defaultSession = "plasmax11"; + services.xserver.displayManager.sddm.wayland.enable = lib.mkForce false; services.xserver.displayManager.sddm.settings = { Autologin = { Session = "plasmax11.desktop"; From 0fe6c445a14c5f0c6a028627fc5423c5ac63b345 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Mar 2024 21:03:16 +0200 Subject: [PATCH 1635/2308] Plasmax11 for desktop for now, look at https://invent.kde.org/plasma/xdg-desktop-portal-kde/-/issues/12 for updates on cursor fix in wayland --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 9fad544..e5bbadb 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -100,7 +100,7 @@ jovian.steam.autoStart = true; #What desktop to start when switching to desktop session - jovian.steam.desktopSession = "plasma"; + jovian.steam.desktopSession = "plasmax11"; jovian.steam.user = "lillian"; From a200642072bcfe74fcc352c9cd15bdd671fb26e0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Mar 2024 22:06:47 +0200 Subject: [PATCH 1636/2308] Enable cinny web server via docker --- .../server/package-configs/cinny/default.nix | 31 +++++++++++++++++++ nixos/server/package-configs/default.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 nixos/server/package-configs/cinny/default.nix diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix new file mode 100644 index 0000000..5f7d160 --- /dev/null +++ b/nixos/server/package-configs/cinny/default.nix @@ -0,0 +1,31 @@ +{ + config, + pkgs, + inputs, + lib, + ... +}: let + port = 2143; +in { + virtualisation.oci-containers.containers."cinny" = { + autoStart = true; + ports = ["${toString port}:80"]; + image = "cinny:latest"; + }; + + services.nginx = { + enable = true; + virtualHosts = { + "cinny.gladtherescake.eu" = { + ## Force HTTP redirect to HTTPS + forceSSL = true; + ## LetsEncrypt + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${toString port}"; + proxyWebsockets = true; + }; + }; + }; + }; +} diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index ff7d535..4263264 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -16,5 +16,6 @@ ./roundcube ./coturn ./dashboard + ./cinny ]; } From 0402d804f30ea50e8fe8b3aa13faa61fa202ad47 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Mar 2024 22:19:45 +0200 Subject: [PATCH 1637/2308] Tried to change the format of the image pull, this might work --- nixos/server/package-configs/cinny/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index 5f7d160..6b18ddf 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -10,7 +10,7 @@ in { virtualisation.oci-containers.containers."cinny" = { autoStart = true; ports = ["${toString port}:80"]; - image = "cinny:latest"; + image = "ajbura/cinny:latest"; }; services.nginx = { From 8ac96dcb1aa19fdf59a96bd2b58ce71f193d3219 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Mar 2024 22:28:45 +0200 Subject: [PATCH 1638/2308] Added todo comment to cinny --- nixos/server/package-configs/cinny/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index 6b18ddf..f81163e 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -7,6 +7,7 @@ }: let port = 2143; in { + #TODO: set default server and disable changing that virtualisation.oci-containers.containers."cinny" = { autoStart = true; ports = ["${toString port}:80"]; From 9de3525b14c6a399aed9ce309e08dcc14aac1681 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 31 Mar 2024 23:52:03 +0200 Subject: [PATCH 1639/2308] Add firefox-pwa to desktops --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 660e2ec..818137a 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -36,6 +36,7 @@ aha bcachefs-tools direnv + firefoxpwa git-filter-repo gnupg pciutils From 8942d9f06253602ceb8303306667f5b805f24ac2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 00:09:56 +0200 Subject: [PATCH 1640/2308] Maybe this will make firefox-pwa work, in home manager now, with an override --- home-manager/desktop/default.nix | 3 ++- nixos/desktop/default.nix | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index c5b237e..cfa99f2 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -88,7 +88,8 @@ zsh # Web browsing: - firefox + (firefox.override {nativeMessagingHosts = [pkgs.firefoxpwa];}) + firefox-pwa librewolf ungoogled-chromium ]; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 818137a..660e2ec 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -36,7 +36,6 @@ aha bcachefs-tools direnv - firefoxpwa git-filter-repo gnupg pciutils From ae6f52e427b8cb60b6f08cf56675eb332090810f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 00:11:01 +0200 Subject: [PATCH 1641/2308] Not firefox-pwa but firefoxpwa --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index cfa99f2..617220a 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -89,7 +89,7 @@ # Web browsing: (firefox.override {nativeMessagingHosts = [pkgs.firefoxpwa];}) - firefox-pwa + firefoxpwa librewolf ungoogled-chromium ]; From 09639dcc45792403ae796fcf26699b16100dd223 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 14:59:04 +0200 Subject: [PATCH 1642/2308] Add some informational tools to desktops --- nixos/desktop/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 660e2ec..96f7834 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -35,6 +35,7 @@ # System tools aha bcachefs-tools + clinfo direnv git-filter-repo gnupg @@ -44,7 +45,10 @@ sbctl tpm2-tools tpm2-tss + virtualgl + vulkan-tools waydroid + wayland-utils xwaylandvideobridge yubikey-personalization zsh From 3f386b84500c48797aae6ddcd399cfe249d7f8f3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 18:14:57 +0200 Subject: [PATCH 1643/2308] Change cinny config to only use my server! --- nixos/server/package-configs/cinny/config.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 nixos/server/package-configs/cinny/config.json diff --git a/nixos/server/package-configs/cinny/config.json b/nixos/server/package-configs/cinny/config.json new file mode 100644 index 0000000..508b2ba --- /dev/null +++ b/nixos/server/package-configs/cinny/config.json @@ -0,0 +1,7 @@ +{ + "defaultHomeserver": 2, + "homeserverList": [ + "matrix.gladtherescake.eu" + ], + "allowCustomHomeservers": false +} \ No newline at end of file From 406ef2fd37206a08acc6b844ba780a174a012696 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 18:15:08 +0200 Subject: [PATCH 1644/2308] And that part too --- nixos/server/package-configs/cinny/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index f81163e..827d627 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -11,6 +11,9 @@ in { virtualisation.oci-containers.containers."cinny" = { autoStart = true; ports = ["${toString port}:80"]; + volumes = [ + "./config.json:/app/config.json" + ]; image = "ajbura/cinny:latest"; }; From f57c4f03b42e242a7b3150df72aefd20ed9b06e8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 18:24:56 +0200 Subject: [PATCH 1645/2308] Maybe I have to write the file with nix? --- nixos/server/package-configs/cinny/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index 827d627..41175e3 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -6,13 +6,24 @@ ... }: let port = 2143; + configFile = + pkgs.writeText "config.json" + '' + { + "defaultHomeserver": 2, + "homeserverList": [ + "matrix.gladtherescake.eu" + ], + "allowCustomHomeservers": false + } + ''; in { #TODO: set default server and disable changing that virtualisation.oci-containers.containers."cinny" = { autoStart = true; ports = ["${toString port}:80"]; volumes = [ - "./config.json:/app/config.json" + "${configFile}:/app/config.json" ]; image = "ajbura/cinny:latest"; }; From 99468bfad3574cbdd85fd1ed2094936f1b860d6b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 18:30:19 +0200 Subject: [PATCH 1646/2308] Let's try changing the defaultHomeserver setting --- nixos/server/package-configs/cinny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index 41175e3..1cbfc4a 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -9,8 +9,8 @@ configFile = pkgs.writeText "config.json" '' - { - "defaultHomeserver": 2, + { + "defaultHomeserver": 0, "homeserverList": [ "matrix.gladtherescake.eu" ], From 260f9021606d5dd5213cfdc2a70a0515ad62c282 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 18:34:48 +0200 Subject: [PATCH 1647/2308] Remove todo, we done that --- nixos/server/package-configs/cinny/config.json | 7 ------- nixos/server/package-configs/cinny/default.nix | 1 - 2 files changed, 8 deletions(-) delete mode 100644 nixos/server/package-configs/cinny/config.json diff --git a/nixos/server/package-configs/cinny/config.json b/nixos/server/package-configs/cinny/config.json deleted file mode 100644 index 508b2ba..0000000 --- a/nixos/server/package-configs/cinny/config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "defaultHomeserver": 2, - "homeserverList": [ - "matrix.gladtherescake.eu" - ], - "allowCustomHomeservers": false -} \ No newline at end of file diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index 1cbfc4a..6c06e4a 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -18,7 +18,6 @@ } ''; in { - #TODO: set default server and disable changing that virtualisation.oci-containers.containers."cinny" = { autoStart = true; ports = ["${toString port}:80"]; From 9429c349352d47b5b231398eef482665adefea89 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 21:14:33 +0200 Subject: [PATCH 1648/2308] Add ipv6 to coturn --- nixos/server/package-configs/coturn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix index e37c03d..4371ea1 100644 --- a/nixos/server/package-configs/coturn/default.nix +++ b/nixos/server/package-configs/coturn/default.nix @@ -14,6 +14,7 @@ realm = "turn.gladtherescake.eu"; relay-ips = [ "62.171.160.195" + "2a02:c207:2063:2448::1" ]; no-tcp-relay = true; extraConfig = " From 5446fb64fb6ceffb11da863b5edee20dfe8c637a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 21:42:59 +0200 Subject: [PATCH 1649/2308] Small update to turn server --- nixos/server/package-configs/coturn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix index 4371ea1..24b3794 100644 --- a/nixos/server/package-configs/coturn/default.nix +++ b/nixos/server/package-configs/coturn/default.nix @@ -8,10 +8,10 @@ users.users.nginx.extraGroups = ["turnserver"]; services.coturn = { enable = true; - lt-cred-mech = true; use-auth-secret = true; - static-auth-secret-file = config.sops.secrets."coturn-auth-secret".path; + static-auth-secret = "cPKWEn4Fo5TAJoE7iX3xeVOaMVE4afeRN1iRGWYfbkWbkaZMxTpnmazHyH6c6yXT"; realm = "turn.gladtherescake.eu"; + name = "turn.gladtherescake.eu"; relay-ips = [ "62.171.160.195" "2a02:c207:2063:2448::1" From 41304da00dda51dcc9ec8420dba921198e995931 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 21:44:31 +0200 Subject: [PATCH 1650/2308] Name doesn't exist, remove that --- nixos/server/package-configs/coturn/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix index 24b3794..84ac288 100644 --- a/nixos/server/package-configs/coturn/default.nix +++ b/nixos/server/package-configs/coturn/default.nix @@ -11,7 +11,6 @@ use-auth-secret = true; static-auth-secret = "cPKWEn4Fo5TAJoE7iX3xeVOaMVE4afeRN1iRGWYfbkWbkaZMxTpnmazHyH6c6yXT"; realm = "turn.gladtherescake.eu"; - name = "turn.gladtherescake.eu"; relay-ips = [ "62.171.160.195" "2a02:c207:2063:2448::1" From 814091bfa7f8f3751345936590b5cc0c6b0eab2a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Apr 2024 21:54:15 +0200 Subject: [PATCH 1651/2308] Enable tcp coturn route --- nixos/server/package-configs/coturn/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix index 84ac288..4539247 100644 --- a/nixos/server/package-configs/coturn/default.nix +++ b/nixos/server/package-configs/coturn/default.nix @@ -15,7 +15,6 @@ "62.171.160.195" "2a02:c207:2063:2448::1" ]; - no-tcp-relay = true; extraConfig = " cipher-list=\"HIGH\" no-loopback-peers From 3fcdc11ed65a2d5d778bacd9b6096e0425803230 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Apr 2024 19:59:31 +0200 Subject: [PATCH 1652/2308] update flake lock --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 4b69ef8..4fed6e6 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1711850778, - "narHash": "sha256-LUctBrbSTAZ6TRtXsWju4AuNf9OhcbxNni0PRBGKE1c=", + "lastModified": 1712163166, + "narHash": "sha256-Al0RdDZF8DM1uZ5m1tmOxtPNvFrRpoczHWGbJ57KfuI=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "00ddc1c88ec9137225840d9d788db0bc6f6939d1", + "rev": "bd69d9b565fb403fc78fbeb633fb374ec3f4b49c", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1711588700, - "narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=", + "lastModified": 1711934712, + "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", "owner": "nix-community", "repo": "disko", - "rev": "502241afa3de2a24865ddcbe4c122f4546e32092", + "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1711868868, - "narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=", + "lastModified": 1712093955, + "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=", "owner": "nix-community", "repo": "home-manager", - "rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab", + "rev": "80546b220e95a575c66c213af1b09fe255299438", "type": "github" }, "original": { @@ -506,11 +506,11 @@ }, "nixlib": { "locked": { - "lastModified": 1711241261, - "narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=", + "lastModified": 1711846064, + "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc", + "rev": "90b1a963ff84dc532db92f678296ff2499a60a87", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1711626141, - "narHash": "sha256-0qV1pHeIyUZ18cp8ijQnMf7uV+Uk4+UqTCC6yGSGWvk=", + "lastModified": 1711932680, + "narHash": "sha256-CEpVtyB7uyRprTuiG+lpWWMvM/C0CbY/dbBuxT5BDwM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "63194fceafbfe583a9eb7d16ab499adc0a6c0bc2", + "rev": "1f4c32ca4295bb7cca1e48a2f39b65490b249b0b", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1712122226, + "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", + "lastModified": 1712059183, + "narHash": "sha256-I/xinxexiKuaIsGBaHstfm8Y51lmKdTAvDwzB2CmACc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", + "rev": "4b455dc2048f73a79eb3713f342369ff58f93e0b", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1712122226, + "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1711880258, - "narHash": "sha256-4lcNTaKYxKXqAD+OrTC68T2W/Cr69VSogS+R5tjdn+M=", + "lastModified": 1712081763, + "narHash": "sha256-+xImkX19gde0Qac6kbJtJAXKXTOgcUE5z3RsBxVtseo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "22b423b9c6f157373d56413835d1d65ea4c5f481", + "rev": "96a90a7f5ce6b29e01d7da83d082e870e4462174", "type": "github" }, "original": { From 2d0bc89b69c42e15c8c46a2758238f79526e7197 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Apr 2024 18:44:53 +0200 Subject: [PATCH 1653/2308] Add firefox sync to server --- nixos/hosts/queen/secrets/sops.yaml | 5 +++-- nixos/server/package-configs/default.nix | 1 + .../package-configs/firefox-sync/default.nix | 21 +++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 nixos/server/package-configs/firefox-sync/default.nix diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index 28ef94f..d8c5ab7 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -10,6 +10,7 @@ wg-private: ENC[AES256_GCM,data:6BEuNqqG//p5UhRmQ4RPEze6jZdvzK4PEXxlbX2ANYIhFpac lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW7IUpjHMyS7YP+pmmvDCzM9afIXMxyPFHGNRwiCmxqstiiNeSeLdo6rDw==,iv:sGeu9aNTgdpThv+0Z/nZKIrat1xNgM0t/KTGPaFbsdI=,tag:kZBHF4X0KO9znog61NwU+Q==,type:str] coturn-auth-secret: ENC[AES256_GCM,data:RYxyATuYIcrGd8h8Gc4CP9ZQ80ekuuwHehnOPYisHejmycgT8a2mWpk+5r3HkFmBNcLDeNlfnhIif5oLHGuHyw==,iv:M2GdNDxP4xpP35FJPTgljbcKpOm6DmEEnIYRItAxDVI=,tag:IiiNXeTi6Yja5PrnKRkhdA==,type:str] grafana-telegraf-key: ENC[AES256_GCM,data:agpUzG1/n2NAKDt45IgelmDf0CUlC82fmD4f7JdcszNuUg7uCNA7XeaJ6PZtHQ==,iv:keo3i+qSbtXkA5fyCr2S5z9nJS9bXUn5WDiPgWocPU8=,tag:p/nDff10PRhi9pOszp1PnA==,type:str] +sync-secrets: ENC[AES256_GCM,data:AwCgqfSXmYVGnCV5PJ5Ql44IiutTS76F1H7Ow7gB4mQQ8PtiAsmArzpAXd7LzsXedm55X04U+GvkcbM9cwPcF+psyb3Zi8EnI/mjnI9MgFyySSEcosJZVAtCpXGIMyYgRXtF5OBh5CzupAG059d1TDAqrSpLXMuSDdypTaOMHxnlq5q1swfpzhhY3PVgUKVFXdjZLX8aF3JTE9ceVxFsB+traLzOQsl+QKty0x0mpuqR97zkMCchX7bTwgUgbl7phzTvmwV8Qw==,iv:gkZs5NB9+CLfz4kfV4ha2llZQPP81uuXRKqUlASgpiA=,tag:DXkiG0ZFHLHlVhwLwtv/XQ==,type:str] sops: kms: [] gcp_kms: [] @@ -25,8 +26,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-03-28T10:35:21Z" - mac: ENC[AES256_GCM,data:LAcaqwQ3GjFSFNVMfg84ljcB4Lb4Kzqgs9WFdi2sXJWeIs+G1/2/Ij4mMSfplirftG6uhU0DJyfP0IEgRvG0oxFOnidsrueWMQ5q1tHmxuOEus7wGeNbvKlNPzb8bMeeVnhTUyvJkeFMb2HPlEIaND15RCF4WoLz56egnPYt0Jg=,iv:8NfgonzySTn+h3c7OCZYWBvfk2TxE5QCNjeSUIUTLi4=,tag:xhbPJkFpxXUn2TpAVrU6Mw==,type:str] + lastmodified: "2024-04-04T16:38:10Z" + mac: ENC[AES256_GCM,data:KqkNjZe/rMhiWNS3SeYHm+b23u1LD1jq3f0+jB/BVmy6pDQDTNgA/wWHF/HcorU2Z7TOdjofJPuvRuF6C8ec4RCtTxX2ubIYWV4H3BynYxrEuEsIN8EnPJDcFFc92n9PKzoWnHo2NK1a4ZX+DxYVjDDdjhOMWj/kqWRWZRU+qEw=,iv:rarq3mCSfDFzbIdSIe+3mTNTnoZwFZ2uPkYMGt/xqos=,tag:rCD6SUpwOktRo7fM3Irv7g==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 4263264..39f76ab 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -17,5 +17,6 @@ ./coturn ./dashboard ./cinny + ./firefox-sync ]; } diff --git a/nixos/server/package-configs/firefox-sync/default.nix b/nixos/server/package-configs/firefox-sync/default.nix new file mode 100644 index 0000000..3d8f71e --- /dev/null +++ b/nixos/server/package-configs/firefox-sync/default.nix @@ -0,0 +1,21 @@ +{ + config, + pkgs, + ... +}: let + port = 5126; +in { + sops.secrets."sync-secrets".mode = "0440"; + sops.secrets."sync-secrets".owner = config.users.users.firefox-syncserver.name; + services.firefox-syncserver = { + enable = true; + secrets = config.sops.secrets."sync-secrets".path; + singleNode = { + enable = true; + hostname = "sync.gladtherescake.eu"; + url = "http://localhost:${toString port}"; + enableNginx = true; + enableTLS = true; + }; + }; +} From 4e588c545b021b55ef5b0ea40e29bb2c672caee3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Apr 2024 18:47:07 +0200 Subject: [PATCH 1654/2308] Need to add mariadb --- nixos/server/package-configs/firefox-sync/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/server/package-configs/firefox-sync/default.nix b/nixos/server/package-configs/firefox-sync/default.nix index 3d8f71e..89614a3 100644 --- a/nixos/server/package-configs/firefox-sync/default.nix +++ b/nixos/server/package-configs/firefox-sync/default.nix @@ -7,6 +7,8 @@ in { sops.secrets."sync-secrets".mode = "0440"; sops.secrets."sync-secrets".owner = config.users.users.firefox-syncserver.name; + + services.mysql.package = pkgs.mariadb; services.firefox-syncserver = { enable = true; secrets = config.sops.secrets."sync-secrets".path; From 78b80a4bbcb9b7a7ef9ba0a41b162a78d5fb1882 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Apr 2024 18:54:53 +0200 Subject: [PATCH 1655/2308] That should be the user's name no --- nixos/server/package-configs/firefox-sync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/firefox-sync/default.nix b/nixos/server/package-configs/firefox-sync/default.nix index 89614a3..060f02f 100644 --- a/nixos/server/package-configs/firefox-sync/default.nix +++ b/nixos/server/package-configs/firefox-sync/default.nix @@ -6,7 +6,7 @@ port = 5126; in { sops.secrets."sync-secrets".mode = "0440"; - sops.secrets."sync-secrets".owner = config.users.users.firefox-syncserver.name; + sops.secrets."sync-secrets".owner = config.users.users."firefox-syncserver".name; services.mysql.package = pkgs.mariadb; services.firefox-syncserver = { From 34dcbeb8626b5b6a9eedae231efc6945fa4f3d2a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Apr 2024 18:57:13 +0200 Subject: [PATCH 1656/2308] Maybe it needs to set up the user first? --- nixos/server/package-configs/firefox-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/firefox-sync/default.nix b/nixos/server/package-configs/firefox-sync/default.nix index 060f02f..b6bbb61 100644 --- a/nixos/server/package-configs/firefox-sync/default.nix +++ b/nixos/server/package-configs/firefox-sync/default.nix @@ -5,13 +5,13 @@ }: let port = 5126; in { - sops.secrets."sync-secrets".mode = "0440"; - sops.secrets."sync-secrets".owner = config.users.users."firefox-syncserver".name; + # sops.secrets."sync-secrets".mode = "0440"; + # sops.secrets."sync-secrets".owner = config.users.users."firefox-syncserver".name; services.mysql.package = pkgs.mariadb; services.firefox-syncserver = { enable = true; - secrets = config.sops.secrets."sync-secrets".path; + # secrets = config.sops.secrets."sync-secrets".path; singleNode = { enable = true; hostname = "sync.gladtherescake.eu"; From aa057a0bd7a385619616e13615bfcef538fc0fa9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Apr 2024 18:58:36 +0200 Subject: [PATCH 1657/2308] Let's test it with a bad insecure secret FIXME --- nixos/server/package-configs/firefox-sync/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/server/package-configs/firefox-sync/default.nix b/nixos/server/package-configs/firefox-sync/default.nix index b6bbb61..5906950 100644 --- a/nixos/server/package-configs/firefox-sync/default.nix +++ b/nixos/server/package-configs/firefox-sync/default.nix @@ -12,6 +12,10 @@ in { services.firefox-syncserver = { enable = true; # secrets = config.sops.secrets."sync-secrets".path; + # FIXME: change secret to sops correctly + secrets = builtins.toFile "sync-secrets" '' + SYNC_MASTER_SECRET=InsecureSecretToTest + ''; singleNode = { enable = true; hostname = "sync.gladtherescake.eu"; From 9756668b8c110a42303b84aeca726e96e854fe78 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Apr 2024 19:02:40 +0200 Subject: [PATCH 1658/2308] Let's try this user now, it should now exist --- nixos/server/package-configs/firefox-sync/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nixos/server/package-configs/firefox-sync/default.nix b/nixos/server/package-configs/firefox-sync/default.nix index 5906950..060f02f 100644 --- a/nixos/server/package-configs/firefox-sync/default.nix +++ b/nixos/server/package-configs/firefox-sync/default.nix @@ -5,17 +5,13 @@ }: let port = 5126; in { - # sops.secrets."sync-secrets".mode = "0440"; - # sops.secrets."sync-secrets".owner = config.users.users."firefox-syncserver".name; + sops.secrets."sync-secrets".mode = "0440"; + sops.secrets."sync-secrets".owner = config.users.users."firefox-syncserver".name; services.mysql.package = pkgs.mariadb; services.firefox-syncserver = { enable = true; - # secrets = config.sops.secrets."sync-secrets".path; - # FIXME: change secret to sops correctly - secrets = builtins.toFile "sync-secrets" '' - SYNC_MASTER_SECRET=InsecureSecretToTest - ''; + secrets = config.sops.secrets."sync-secrets".path; singleNode = { enable = true; hostname = "sync.gladtherescake.eu"; From ab517e34e57d157b0aa164d0595df1f4f6ed5ea0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Apr 2024 19:04:39 +0200 Subject: [PATCH 1659/2308] Let's try defining this first then --- nixos/server/package-configs/firefox-sync/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/firefox-sync/default.nix b/nixos/server/package-configs/firefox-sync/default.nix index 060f02f..2566296 100644 --- a/nixos/server/package-configs/firefox-sync/default.nix +++ b/nixos/server/package-configs/firefox-sync/default.nix @@ -6,7 +6,9 @@ port = 5126; in { sops.secrets."sync-secrets".mode = "0440"; - sops.secrets."sync-secrets".owner = config.users.users."firefox-syncserver".name; + sops.secrets."sync-secrets".owner = config.users.users.firefox-syncserver.name; + + users.users.firefox-syncserver.extraGroups = [config.users.groups.keys.name]; services.mysql.package = pkgs.mariadb; services.firefox-syncserver = { From 361ecd00529a0f10cfa9feb118a0621d528ec544 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Apr 2024 19:05:50 +0200 Subject: [PATCH 1660/2308] Let's make the user then --- nixos/server/package-configs/firefox-sync/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/firefox-sync/default.nix b/nixos/server/package-configs/firefox-sync/default.nix index 2566296..6b83ed9 100644 --- a/nixos/server/package-configs/firefox-sync/default.nix +++ b/nixos/server/package-configs/firefox-sync/default.nix @@ -8,7 +8,10 @@ in { sops.secrets."sync-secrets".mode = "0440"; sops.secrets."sync-secrets".owner = config.users.users.firefox-syncserver.name; - users.users.firefox-syncserver.extraGroups = [config.users.groups.keys.name]; + users.users.firefox-syncserver = { + isSystemUser = true; + extraGroups = [config.users.groups.keys.name]; + }; services.mysql.package = pkgs.mariadb; services.firefox-syncserver = { From c1dd0cd0707bef50760a4d78e23528e179e2f899 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Apr 2024 19:06:26 +0200 Subject: [PATCH 1661/2308] Add a group --- nixos/server/package-configs/firefox-sync/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/firefox-sync/default.nix b/nixos/server/package-configs/firefox-sync/default.nix index 6b83ed9..db2b6ed 100644 --- a/nixos/server/package-configs/firefox-sync/default.nix +++ b/nixos/server/package-configs/firefox-sync/default.nix @@ -10,6 +10,7 @@ in { users.users.firefox-syncserver = { isSystemUser = true; + group = "firefox-syncserver"; extraGroups = [config.users.groups.keys.name]; }; From 157247ecf1f7959decbeae515fa7e1228072d5e7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Apr 2024 19:07:07 +0200 Subject: [PATCH 1662/2308] And make the group too --- nixos/server/package-configs/firefox-sync/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/firefox-sync/default.nix b/nixos/server/package-configs/firefox-sync/default.nix index db2b6ed..a97abf3 100644 --- a/nixos/server/package-configs/firefox-sync/default.nix +++ b/nixos/server/package-configs/firefox-sync/default.nix @@ -8,6 +8,7 @@ in { sops.secrets."sync-secrets".mode = "0440"; sops.secrets."sync-secrets".owner = config.users.users.firefox-syncserver.name; + users.groups.firefox-syncserver = {}; users.users.firefox-syncserver = { isSystemUser = true; group = "firefox-syncserver"; From c003bac9b6f41da99c0d4145b6912037f14519ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Apr 2024 23:04:59 +0200 Subject: [PATCH 1663/2308] Add phanpy --- pkgs/default.nix | 1 + pkgs/phanpy/default.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/phanpy/default.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 17b7a02..ab1792b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -11,4 +11,5 @@ pkgs: { update = pkgs.callPackage ./update {}; upgrade = pkgs.callPackage ./upgrade {}; restart = pkgs.callPackage ./restart {}; + phanpy = pkgs.callPackage ./phanpy {}; } diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix new file mode 100644 index 0000000..c651620 --- /dev/null +++ b/pkgs/phanpy/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: +buildNpmPackage rec { + pname = "phanpy"; + version = "2024.04.04.65d51b0"; + + src = fetchFromGitHub { + owner = "cheeaun"; + repo = pname; + rev = "v${version}"; + hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM="; + }; + + npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw="; + + # The prepack script runs the build script, which we'd rather do in the build phase. + npmPackFlags = ["--ignore-scripts"]; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + meta = with lib; { + description = "Minimalistic opinionated Mastodon web client."; + homepage = "https://phanpy.social/"; + license = licenses.mit; + maintainers = with maintainers; [Lillian-Violet]; + }; +} From 3076f17e8a50d538b5b5b40a1ea2a5e9ff6dc706 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Apr 2024 23:22:03 +0200 Subject: [PATCH 1664/2308] Add phanpy to queen --- nixos/hosts/queen/configuration.nix | 2 +- pkgs/phanpy/default.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index ee40678..106db20 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -52,7 +52,6 @@ sops.defaultSopsFile = ./secrets/sops.yaml; environment.systemPackages = with pkgs; [ - akkoma fzf matrix-conduit docker @@ -70,6 +69,7 @@ nextcloud28 nginx onlyoffice-documentserver + phanpy postgresql_16 python3 python311Packages.nbconvert diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index c651620..e92a022 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -19,8 +19,6 @@ buildNpmPackage rec { # The prepack script runs the build script, which we'd rather do in the build phase. npmPackFlags = ["--ignore-scripts"]; - NODE_OPTIONS = "--openssl-legacy-provider"; - meta = with lib; { description = "Minimalistic opinionated Mastodon web client."; homepage = "https://phanpy.social/"; From 34ff8db23584bef7099b6035ab28944cb8bcca77 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Apr 2024 23:27:10 +0200 Subject: [PATCH 1665/2308] no v like you you fucking virgin ass --- pkgs/phanpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index e92a022..860d79d 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -10,7 +10,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "cheeaun"; repo = pname; - rev = "v${version}"; + rev = "${version}"; hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM="; }; From 61344adb1eeac3d1a755bca61963d7735b13b62c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Apr 2024 23:28:24 +0200 Subject: [PATCH 1666/2308] Fix hash #1 --- pkgs/phanpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index 860d79d..795cd77 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { owner = "cheeaun"; repo = pname; rev = "${version}"; - hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM="; + hash = "sha256-sp7ihOgPYpP78M+IQ/QNjne0nw+PdcYJdEJ1m/ozZkE="; }; npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw="; From 0396b58228120b158c8bf953a08c865653232136 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Apr 2024 23:29:27 +0200 Subject: [PATCH 1667/2308] And hash #2 --- pkgs/phanpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index 795cd77..755da75 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -14,7 +14,7 @@ buildNpmPackage rec { hash = "sha256-sp7ihOgPYpP78M+IQ/QNjne0nw+PdcYJdEJ1m/ozZkE="; }; - npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw="; + npmDepsHash = "sha256-I4rZuk0Hn5R6rMu/QZvSuaGrCtG8Z61R7gjbhLnje2E="; # The prepack script runs the build script, which we'd rather do in the build phase. npmPackFlags = ["--ignore-scripts"]; From cfbe33f6e615839923225428aa939d6ab59e5720 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Apr 2024 23:42:35 +0200 Subject: [PATCH 1668/2308] enable phanpy webserver --- nixos/server/package-configs/default.nix | 1 + .../server/package-configs/phanpy/default.nix | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 nixos/server/package-configs/phanpy/default.nix diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 39f76ab..3d72d65 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -12,6 +12,7 @@ ./gotosocial ./mail-server ./nextcloud + ./phanpy ./postgres ./roundcube ./coturn diff --git a/nixos/server/package-configs/phanpy/default.nix b/nixos/server/package-configs/phanpy/default.nix new file mode 100644 index 0000000..314c1e5 --- /dev/null +++ b/nixos/server/package-configs/phanpy/default.nix @@ -0,0 +1,23 @@ +{ + config, + pkgs, + inputs, + lib, + ... +}: { + services.nginx = { + enable = true; + virtualHosts = { + "phanpy.gladtherescake.eu" = { + root = "${pkgs.phanpy}/lib/node_modules/phanpy/"; + ## Force HTTP redirect to HTTPS + forceSSL = true; + ## LetsEncrypt + enableACME = true; + locations."/" = { + index = "index.html"; + }; + }; + }; + }; +} From 303646311323da794f6af3a7ce38df11635e01d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Apr 2024 23:51:19 +0200 Subject: [PATCH 1669/2308] Set the website variables correctly for phanpy --- pkgs/phanpy/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index 755da75..1c63541 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -7,6 +7,12 @@ buildNpmPackage rec { pname = "phanpy"; version = "2024.04.04.65d51b0"; + shellHook = '' + export PHANPY_DEFAULT_INSTANCE="social.gladtherescake.eu" + export PHANPY_CLIENT_NAME="Phanpy on gladtherescake.eu" + export PHANPY_WEBSITE="phanpy.gladtherescake.eu" + ''; + src = fetchFromGitHub { owner = "cheeaun"; repo = pname; From 5824e00999fd198439ead179db7ab8ae527e0f06 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Apr 2024 14:01:28 +0200 Subject: [PATCH 1670/2308] update flake lock --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 4fed6e6..9b799d8 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1712163166, - "narHash": "sha256-Al0RdDZF8DM1uZ5m1tmOxtPNvFrRpoczHWGbJ57KfuI=", + "lastModified": 1712369716, + "narHash": "sha256-9zs+0GTfSyGHdpiA6dPJXnDKAHmfr01OE9FxDE9KvPI=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "bd69d9b565fb403fc78fbeb633fb374ec3f4b49c", + "rev": "2516d44cb178547194a66fa9c44930ab9bddd910", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1711934712, - "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", + "lastModified": 1712356478, + "narHash": "sha256-kTcEtrQIRnexu5lAbLsmUcfR2CrmsACF1s3ZFw1NEVA=", "owner": "nix-community", "repo": "disko", - "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", + "rev": "0a17298c0d96190ef3be729d594ba202b9c53beb", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1712093955, - "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=", + "lastModified": 1712390667, + "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", "owner": "nix-community", "repo": "home-manager", - "rev": "80546b220e95a575c66c213af1b09fe255299438", + "rev": "b787726a8413e11b074cde42704b4af32d95545c", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1711231487, - "narHash": "sha256-dRdFjStMA7GeuD/V4vzKblzuHwxMPgzEboRleVdZlUM=", + "lastModified": 1712296875, + "narHash": "sha256-Cmyer1n39J5IucCiyy84kf1XLr1Gdz/i5HKbzzEOQYM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1171169117f63f1de9ef2ea36efd8dcf377c6d5a", + "rev": "9b0e8712f1a9e5569036b227d539b745fcf54aad", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1711442573, - "narHash": "sha256-/A3YzcY5erYOPojp5Ffwgxv4X5MTnRiWwuaXfgXbK2g=", + "lastModified": 1712261512, + "narHash": "sha256-qsBZ3tJj/3LR8jNYyCKjyCe0ePj4cMynSWBMC1OEDtc=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "df7ac26bd24fac8baa94d60a02c3e0f0d4d16368", + "rev": "999c0cb03f748fe311bca78961dbf0562dc91659", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1711932680, - "narHash": "sha256-CEpVtyB7uyRprTuiG+lpWWMvM/C0CbY/dbBuxT5BDwM=", + "lastModified": 1712191720, + "narHash": "sha256-xXtSSnVHURHsxLQO30dzCKW5NJVGV/umdQPmFjPFMVA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "1f4c32ca4295bb7cca1e48a2f39b65490b249b0b", + "rev": "0c15e76bed5432d7775a22e8d22059511f59d23a", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1711352745, - "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", + "lastModified": 1712324865, + "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", + "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712122226, - "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712059183, - "narHash": "sha256-I/xinxexiKuaIsGBaHstfm8Y51lmKdTAvDwzB2CmACc=", + "lastModified": 1712328247, + "narHash": "sha256-cswxdMQH0fATfonhXgVfxliuZMfkdrCQQud4cO76eDw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4b455dc2048f73a79eb3713f342369ff58f93e0b", + "rev": "8311011fcea909e0cc9684ada784dae080fbfb60", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708984720, - "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", + "lastModified": 1712122226, + "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", + "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1712122226, - "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { From 9e566f5d5084196b225a6faf4cbb6bf9c6f55aae Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Apr 2024 16:03:44 +0200 Subject: [PATCH 1671/2308] Let's try adding install phase steps to phanpy --- pkgs/phanpy/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index 1c63541..9b5fd09 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -25,6 +25,12 @@ buildNpmPackage rec { # The prepack script runs the build script, which we'd rather do in the build phase. npmPackFlags = ["--ignore-scripts"]; + installPhase = '' + mkdir $out + npm run build + cp dist/index.html $out + ''; + meta = with lib; { description = "Minimalistic opinionated Mastodon web client."; homepage = "https://phanpy.social/"; From a302ba2fc4dc0029b8718efcd14f97fcaab2ab02 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Apr 2024 16:10:08 +0200 Subject: [PATCH 1672/2308] Maybe I need to copy more things? --- pkgs/phanpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index 9b5fd09..7824746 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -28,7 +28,7 @@ buildNpmPackage rec { installPhase = '' mkdir $out npm run build - cp dist/index.html $out + cp -r dist/* $out ''; meta = with lib; { From c4401797c0a3a7a27a01b538ec6d52094451a6b1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Apr 2024 16:14:34 +0200 Subject: [PATCH 1673/2308] Fix the nginx pointer for phanpy --- nixos/server/package-configs/phanpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/phanpy/default.nix b/nixos/server/package-configs/phanpy/default.nix index 314c1e5..216412e 100644 --- a/nixos/server/package-configs/phanpy/default.nix +++ b/nixos/server/package-configs/phanpy/default.nix @@ -9,7 +9,7 @@ enable = true; virtualHosts = { "phanpy.gladtherescake.eu" = { - root = "${pkgs.phanpy}/lib/node_modules/phanpy/"; + root = "${pkgs.phanpy}"; ## Force HTTP redirect to HTTPS forceSSL = true; ## LetsEncrypt From 3fb363e0b55b4146290e70cbaf35d88e089a165f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Apr 2024 21:00:46 +0200 Subject: [PATCH 1674/2308] Auto-mount conflicts with the update now so let's remove it --- nixos/hosts/shodan/configuration.nix | 4 ++-- pkgs/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index e5bbadb..b191fce 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -24,7 +24,7 @@ ../../../disko/shodan - ./auto-mount.nix + # ./auto-mount.nix ]; boot.tmp.cleanOnBoot = true; @@ -49,7 +49,7 @@ environment.systemPackages = with pkgs; [ # Custom tools - auto-mount + # auto-mount #System: alejandra diff --git a/pkgs/default.nix b/pkgs/default.nix index 25f4744..dd4c2cc 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -12,5 +12,5 @@ pkgs: { upgrade = pkgs.callPackage ./upgrade {}; restart = pkgs.callPackage ./restart {}; phanpy = pkgs.callPackage ./phanpy {}; - auto-mount = pkgs.callPackage ./auto-mount {}; + # auto-mount = pkgs.callPackage ./auto-mount {}; } From ada8538b9c890694d3404227325c7b71848ba507 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Apr 2024 23:16:30 +0200 Subject: [PATCH 1675/2308] Re-enable wayland on shodan --- nixos/hosts/shodan/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b191fce..09c9f3c 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -134,11 +134,11 @@ services.desktopManager.plasma6.enable = true; programs.kdeconnect.enable = true; - services.xserver.displayManager.defaultSession = "plasmax11"; - services.xserver.displayManager.sddm.wayland.enable = lib.mkForce false; + services.xserver.displayManager.defaultSession = "plasma"; + services.xserver.displayManager.sddm.wayland.enable = lib.mkForce true; services.xserver.displayManager.sddm.settings = { Autologin = { - Session = "plasmax11.desktop"; + Session = "plasma.desktop"; User = "lillian"; }; }; From 6d32697a658d777e9098bd44e43fa874ad1a0f45 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Apr 2024 23:25:51 +0200 Subject: [PATCH 1676/2308] Let's also start wayland with jovian --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 09c9f3c..0f1fbda 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -100,7 +100,7 @@ jovian.steam.autoStart = true; #What desktop to start when switching to desktop session - jovian.steam.desktopSession = "plasmax11"; + jovian.steam.desktopSession = "plasma"; jovian.steam.user = "lillian"; From d11c042bc840ea109a3d120373476b5c232c4fcf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 7 Apr 2024 22:52:11 +0200 Subject: [PATCH 1677/2308] Extest is in nixpkgs now, let's use that option instead --- flake.lock | 70 ++++------------------------ flake.nix | 1 - nixos/desktop/default.nix | 1 + nixos/hosts/shodan/configuration.nix | 7 +-- overlays/default.nix | 6 +-- 5 files changed, 14 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index 9b799d8..bbb7e87 100644 --- a/flake.lock +++ b/flake.lock @@ -150,41 +150,6 @@ "type": "github" } }, - "extest": { - "inputs": { - "extest": "extest_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1706332837, - "narHash": "sha256-6jwCjD6hLVRkPHyl/2K+5ZEoQV3C5BgWlDroUx/9ru8=", - "owner": "chaorace", - "repo": "extest-nix", - "rev": "a9dbc41a7ba6723d8598cd699bbb163630b646b3", - "type": "github" - }, - "original": { - "owner": "chaorace", - "repo": "extest-nix", - "type": "github" - } - }, - "extest_2": { - "flake": false, - "locked": { - "lastModified": 1703711841, - "narHash": "sha256-ZCHOyAACYoV3wW7en374Kfj0STmi0+72INKGNQkO/rU=", - "owner": "Supreeeme", - "repo": "extest", - "rev": "2a0a1f27239f6307b333a68ca7023ccf90215f3e", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "extest", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -407,7 +372,7 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1712296875, @@ -429,7 +394,7 @@ "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -637,22 +602,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1712328247, - "narHash": "sha256-cswxdMQH0fATfonhXgVfxliuZMfkdrCQQud4cO76eDw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8311011fcea909e0cc9684ada784dae080fbfb60", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1712122226, "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", @@ -668,7 +617,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1711297276, "narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=", @@ -684,7 +633,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1712163089, "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", @@ -700,7 +649,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1709703039, "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", @@ -715,7 +664,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1711715736, "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", @@ -815,7 +764,6 @@ "inputs": { "conduit": "conduit", "disko": "disko", - "extest": "extest", "flake-utils": "flake-utils_3", "home-manager": "home-manager", "jovian": "jovian", @@ -823,7 +771,7 @@ "linger": "linger", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "pihole": "pihole", "plasma-manager": "plasma-manager", @@ -877,7 +825,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -897,7 +845,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { diff --git a/flake.nix b/flake.nix index eef5331..0e95bd7 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,6 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Fix for steam cursor not being visible under wayland - extest.url = "github:chaorace/extest-nix"; # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 96f7834..018410c 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -87,6 +87,7 @@ enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + extest.enable = true; }; hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 0f1fbda..db89bc9 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -35,7 +35,6 @@ nixpkgs = { # You can add overlays here overlays = [ - inputs.extest.overlays.default ]; # Configure your nixpkgs instance config = { @@ -55,7 +54,6 @@ alejandra btrfs-progs efitools - extest git git-filter-repo home-manager @@ -68,7 +66,6 @@ rsync rustdesk sbctl - steam udisks util-linux wget @@ -121,9 +118,7 @@ enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - package = pkgs.steam.override { - extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD''; - }; + extest.enable = true; }; hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses diff --git a/overlays/default.nix b/overlays/default.nix index c63d4fc..267ba4c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,9 +4,9 @@ # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays modifications = final: prev: { - steam = prev.steam.override { - extraProfile = ''export LD_PRELOAD=${inputs.extest}/lib/libextest.so:$LD_PRELOAD''; - }; + # steam = prev.steam.override { + # extraProfile = ''export LD_PRELOAD=${inputs.extest}/lib/libextest.so:$LD_PRELOAD''; + # }; }; # This one brings our custom packages from the 'pkgs' directory From d6a90a0853a61950d8f631d8a46f430f7c091df4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 7 Apr 2024 22:59:21 +0200 Subject: [PATCH 1678/2308] refactor to remove some redundant stuff --- nixos/hosts/shodan/configuration.nix | 10 +--------- nixos/shared/packages/default.nix | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index db89bc9..11042ee 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -15,7 +15,7 @@ # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default - # Import the locale settings + # Import the shared settings ../../shared # You can also split up your configuration and import pieces of it here: @@ -51,25 +51,17 @@ # auto-mount #System: - alejandra btrfs-progs efitools - git - git-filter-repo - home-manager - htop jq noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji oh-my-zsh - rsync rustdesk sbctl udisks util-linux - wget - zsh #KDE: krunner-translator diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 4577fb9..5cfe20d 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -32,7 +32,6 @@ home-manager htop killall - libnotify neofetch oh-my-zsh rsync From 2e6d9aec606ffec2609704fc92f0346b648c0f86 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 7 Apr 2024 23:00:56 +0200 Subject: [PATCH 1679/2308] Missed one package --- nixos/hosts/shodan/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 11042ee..d479c9d 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -57,7 +57,6 @@ noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji - oh-my-zsh rustdesk sbctl udisks From 797a05a51cefd39f943bf05c8aa39c54fb0ae735 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Apr 2024 16:51:07 +0200 Subject: [PATCH 1680/2308] Try and build phanpy with path commands in installphase --- pkgs/phanpy/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index 7824746..07a426e 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -7,12 +7,6 @@ buildNpmPackage rec { pname = "phanpy"; version = "2024.04.04.65d51b0"; - shellHook = '' - export PHANPY_DEFAULT_INSTANCE="social.gladtherescake.eu" - export PHANPY_CLIENT_NAME="Phanpy on gladtherescake.eu" - export PHANPY_WEBSITE="phanpy.gladtherescake.eu" - ''; - src = fetchFromGitHub { owner = "cheeaun"; repo = pname; @@ -26,6 +20,9 @@ buildNpmPackage rec { npmPackFlags = ["--ignore-scripts"]; installPhase = '' + export PHANPY_DEFAULT_INSTANCE="social.gladtherescake.eu" + export PHANPY_CLIENT_NAME="Phanpy on gladtherescake.eu" + export PHANPY_WEBSITE="phanpy.gladtherescake.eu" mkdir $out npm run build cp -r dist/* $out From d5a0dc5fea4f6d64fe2983beb3425d8f042ea566 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Apr 2024 09:56:29 +0200 Subject: [PATCH 1681/2308] update flake lock --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index bbb7e87..75e73d4 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1712369716, - "narHash": "sha256-9zs+0GTfSyGHdpiA6dPJXnDKAHmfr01OE9FxDE9KvPI=", + "lastModified": 1712690805, + "narHash": "sha256-5/gL5CM1MeuHh3zoSyt07lhJTb5GBGRTIGFqONyJl9g=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "2516d44cb178547194a66fa9c44930ab9bddd910", + "rev": "6345742e8b83a528353beb0fbb0e5b54aa39191d", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1712356478, - "narHash": "sha256-kTcEtrQIRnexu5lAbLsmUcfR2CrmsACF1s3ZFw1NEVA=", + "lastModified": 1712612224, + "narHash": "sha256-Tv4C8OSPVmm4LbpJGLFSODyvJy6DqrisEGPCQdNVOeY=", "owner": "nix-community", "repo": "disko", - "rev": "0a17298c0d96190ef3be729d594ba202b9c53beb", + "rev": "79eab0e82cb126bf4ac170f44af82479f0895ab5", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1712390667, - "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", + "lastModified": 1712730572, + "narHash": "sha256-rAVvdP77rEmgobvSgybqPAcHefv5dCXPH/ge6Ds+JtU=", "owner": "nix-community", "repo": "home-manager", - "rev": "b787726a8413e11b074cde42704b4af32d95545c", + "rev": "18f89ef74f0d48635488ccd6a5e30dc9d48a3a87", "type": "github" }, "original": { @@ -375,11 +375,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1712296875, - "narHash": "sha256-Cmyer1n39J5IucCiyy84kf1XLr1Gdz/i5HKbzzEOQYM=", + "lastModified": 1712521891, + "narHash": "sha256-qJRkB7QZo2mdR/nABeHQKi3xkQxUsSGjVVQXTSHQocI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9b0e8712f1a9e5569036b227d539b745fcf54aad", + "rev": "ec53086c76303dc8880fa7ba06c45abcae8b3398", "type": "github" }, "original": { @@ -471,11 +471,11 @@ }, "nixlib": { "locked": { - "lastModified": 1711846064, - "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=", + "lastModified": 1712450863, + "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "90b1a963ff84dc532db92f678296ff2499a60a87", + "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1712191720, - "narHash": "sha256-xXtSSnVHURHsxLQO30dzCKW5NJVGV/umdQPmFjPFMVA=", + "lastModified": 1712537332, + "narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0c15e76bed5432d7775a22e8d22059511f59d23a", + "rev": "d942db8df8ee860556a38754f15b8d03bf7e6933", "type": "github" }, "original": { @@ -507,11 +507,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712324865, - "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=", + "lastModified": 1712695607, + "narHash": "sha256-rXb3onsPMiv00FrGSpIJyYa8x53W0dlbJ5Ka3xvje/c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c", + "rev": "05aa46a1f3b5ac92bfe84807868ba9670d48b031", "type": "github" }, "original": { @@ -571,11 +571,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1711819797, - "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=", + "lastModified": 1712437997, + "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c", + "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920", "type": "github" }, "original": { @@ -587,11 +587,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -635,11 +635,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -666,11 +666,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", + "lastModified": 1712420723, + "narHash": "sha256-VnG0Eu394Ga2FCe8Q66m6OEQF8iAqjDYsjmtl+N2omk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", + "rev": "9e7f26f82acb057498335362905fde6fea4ca50a", "type": "github" }, "original": { @@ -716,11 +716,11 @@ ] }, "locked": { - "lastModified": 1712081763, - "narHash": "sha256-+xImkX19gde0Qac6kbJtJAXKXTOgcUE5z3RsBxVtseo=", + "lastModified": 1712484920, + "narHash": "sha256-wNwv12U/QYYgZanycZ32A41cEDa2zPwYuMKK6AJYNJk=", "owner": "pjones", "repo": "plasma-manager", - "rev": "96a90a7f5ce6b29e01d7da83d082e870e4462174", + "rev": "4b127a5ede004f5c6d7c41938c2986b599dc0bf3", "type": "github" }, "original": { @@ -849,11 +849,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1711855048, - "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=", + "lastModified": 1712617241, + "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10", + "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c", "type": "github" }, "original": { From 3cbedd4ba3c27364cb08ecfd9a4d814bb63e18c5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Apr 2024 19:26:06 +0200 Subject: [PATCH 1682/2308] update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 75e73d4..ae4803e 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1712690805, - "narHash": "sha256-5/gL5CM1MeuHh3zoSyt07lhJTb5GBGRTIGFqONyJl9g=", + "lastModified": 1712765734, + "narHash": "sha256-HakehmZVdhbXHNaTzoSwIHdvy1A3A7XXEIUHV2cC7d8=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "6345742e8b83a528353beb0fbb0e5b54aa39191d", + "rev": "7d92cad55f58ef55d5c95ecf3753e0fa75ab11e1", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1712612224, - "narHash": "sha256-Tv4C8OSPVmm4LbpJGLFSODyvJy6DqrisEGPCQdNVOeY=", + "lastModified": 1712765858, + "narHash": "sha256-gWRdIXmNsgOKFNiFOAzo4hleJsl03vu9nLPrkmwmTwY=", "owner": "nix-community", "repo": "disko", - "rev": "79eab0e82cb126bf4ac170f44af82479f0895ab5", + "rev": "53c4cc48b71bbd98d65fb4c7bc0e2ea22d9a6672", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1712730572, - "narHash": "sha256-rAVvdP77rEmgobvSgybqPAcHefv5dCXPH/ge6Ds+JtU=", + "lastModified": 1712759992, + "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", "owner": "nix-community", "repo": "home-manager", - "rev": "18f89ef74f0d48635488ccd6a5e30dc9d48a3a87", + "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", "type": "github" }, "original": { @@ -507,11 +507,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712695607, - "narHash": "sha256-rXb3onsPMiv00FrGSpIJyYa8x53W0dlbJ5Ka3xvje/c=", + "lastModified": 1712760404, + "narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "05aa46a1f3b5ac92bfe84807868ba9670d48b031", + "rev": "e1c4bac14beb8c409d0534382cf967171706b9d9", "type": "github" }, "original": { From fa4a633142b7adad787f45977a396224caa728e4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Apr 2024 10:39:28 +0200 Subject: [PATCH 1683/2308] update flake lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ae4803e..a61fecb 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1712765858, - "narHash": "sha256-gWRdIXmNsgOKFNiFOAzo4hleJsl03vu9nLPrkmwmTwY=", + "lastModified": 1712798444, + "narHash": "sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh+sk=", "owner": "nix-community", "repo": "disko", - "rev": "53c4cc48b71bbd98d65fb4c7bc0e2ea22d9a6672", + "rev": "a297cb1cb0337ee10a7a0f9517954501d8f6f74d", "type": "github" }, "original": { From f35cd13dff90fd0ca8c622a8c0cb6bebeb2c6d17 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Apr 2024 10:25:41 +0200 Subject: [PATCH 1684/2308] Let's try the video loopback things again --- nixos/desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 018410c..8d99a78 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -155,10 +155,10 @@ boot.bootspec.enable = true; boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; boot.supportedFilesystems = ["bcachefs"]; - # boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; + boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; boot.kernelModules = [ # Virtual Camera - # "v4l2loopback" + "v4l2loopback" # Virtual Microphone, built-in "snd-aloop" ]; @@ -167,7 +167,7 @@ # exclusive_caps: Skype, Zoom, Teams etc. will only show device when actually streaming # card_label: Name of virtual camera, how it'll show up in Skype, Zoom, Teams # https://github.com/umlaeute/v4l2loopback - # options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" + options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" ''; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.efi.canTouchEfiVariables = true; From c1ce91bcd17223855823f2f7f2b6a373b08c3f8e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Apr 2024 16:06:45 +0200 Subject: [PATCH 1685/2308] Delete teams --- home-manager/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 617220a..95e9e23 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -70,7 +70,6 @@ # Office applications: onlyoffice-bin - teams-for-linux gimp thunderbird From de419af27161ffe5d9e66f56d6cc37f6c6186c0f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Apr 2024 16:49:21 +0200 Subject: [PATCH 1686/2308] update flake lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index a61fecb..4118846 100644 --- a/flake.lock +++ b/flake.lock @@ -375,11 +375,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1712521891, - "narHash": "sha256-qJRkB7QZo2mdR/nABeHQKi3xkQxUsSGjVVQXTSHQocI=", + "lastModified": 1712909442, + "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ec53086c76303dc8880fa7ba06c45abcae8b3398", + "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", "type": "github" }, "original": { @@ -507,11 +507,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712760404, - "narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=", + "lastModified": 1712909959, + "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1c4bac14beb8c409d0534382cf967171706b9d9", + "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", "type": "github" }, "original": { @@ -587,11 +587,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -603,11 +603,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712122226, - "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -635,11 +635,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -716,11 +716,11 @@ ] }, "locked": { - "lastModified": 1712484920, - "narHash": "sha256-wNwv12U/QYYgZanycZ32A41cEDa2zPwYuMKK6AJYNJk=", + "lastModified": 1712907244, + "narHash": "sha256-uLNzw3ZRWob9/FfOXUNhlzKNCPWNtWfF4QYoc3Hs1Fw=", "owner": "pjones", "repo": "plasma-manager", - "rev": "4b127a5ede004f5c6d7c41938c2986b599dc0bf3", + "rev": "27014d611e79bba47d5ee12f5790baf121045506", "type": "github" }, "original": { From 3d33f4710ffe42e0caf91763aa1fcbbafbda7060 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Apr 2024 16:56:15 +0200 Subject: [PATCH 1687/2308] Some sddm options changed name, refactor --- nixos/desktop/default.nix | 8 +++++--- nixos/hosts/shodan/configuration.nix | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 8d99a78..9153254 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -98,10 +98,12 @@ services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.wayland.enable = true; - services.xserver.displayManager.sddm.enable = true; + services.displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + services.displayManager.defaultSession = "plasma"; services.desktopManager.plasma6.enable = true; - services.xserver.displayManager.defaultSession = "plasma"; programs.kdeconnect.enable = true; # Enable flatpak support diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index d479c9d..676c61b 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -120,9 +120,9 @@ services.desktopManager.plasma6.enable = true; programs.kdeconnect.enable = true; - services.xserver.displayManager.defaultSession = "plasma"; - services.xserver.displayManager.sddm.wayland.enable = lib.mkForce true; - services.xserver.displayManager.sddm.settings = { + services.displayManager.defaultSession = "plasma"; + services.displayManager.sddm.wayland.enable = lib.mkForce true; + services.displayManager.sddm.settings = { Autologin = { Session = "plasma.desktop"; User = "lillian"; From 2ad060e3232d9fb4cc589bbbfafac4d24d199669 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Apr 2024 17:10:46 +0200 Subject: [PATCH 1688/2308] Make stateversion 24.05 --- nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index dc673a8..44c00d4 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -58,5 +58,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "24.05"; } diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index c7dff7e..ac4a843 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -87,5 +87,5 @@ networking.hostName = "GLaDOS"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "24.05"; } diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 106db20..673b614 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -180,5 +180,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "24.05"; } diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 676c61b..53cd124 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -222,5 +222,5 @@ boot.plymouth.enable = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "24.05"; } From 2d459ad09aea2c04db3c4dc0af392b87a4c06023 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Apr 2024 19:22:11 +0200 Subject: [PATCH 1689/2308] Update servo --- pkgs/servo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servo/default.nix b/pkgs/servo/default.nix index 3c948fc..4f91f97 100644 --- a/pkgs/servo/default.nix +++ b/pkgs/servo/default.nix @@ -17,7 +17,7 @@ }: stdenv.mkDerivation rec { pname = "servo"; - version = "2024-01-05"; + version = "2024-04-12"; src = fetchurl { url = "https://github.com/servo/servo-nightly-builds/releases/download/${version}/servo-latest.tar.gz"; From 1481313b9982b64a40ce709d3fb694164b36cc5b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Apr 2024 19:24:22 +0200 Subject: [PATCH 1690/2308] Update hash too --- pkgs/servo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servo/default.nix b/pkgs/servo/default.nix index 4f91f97..7640928 100644 --- a/pkgs/servo/default.nix +++ b/pkgs/servo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/servo/servo-nightly-builds/releases/download/${version}/servo-latest.tar.gz"; - hash = "sha256-IlmoYIFk0QO0CieJ49m8PnEou1Q3w+Tk9rypI0ya2WQ="; + hash = "sha256-b0caa39c5ac9be5bb70dc93f1ddc8a573a8c671bcc6ad96df7fe5c1eace3bac2"; }; nativeBuildInputs = [ From c457b0ec297bd94e77daac4433f59c2f08a371c1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Apr 2024 19:25:29 +0200 Subject: [PATCH 1691/2308] Wrong hash I guess --- pkgs/servo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servo/default.nix b/pkgs/servo/default.nix index 7640928..ce55b3a 100644 --- a/pkgs/servo/default.nix +++ b/pkgs/servo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/servo/servo-nightly-builds/releases/download/${version}/servo-latest.tar.gz"; - hash = "sha256-b0caa39c5ac9be5bb70dc93f1ddc8a573a8c671bcc6ad96df7fe5c1eace3bac2"; + hash = "sha25600000000000000000000000000000000000000000000="; }; nativeBuildInputs = [ From ea643b690dc683761f848ceb24323c9979651ea0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Apr 2024 19:26:03 +0200 Subject: [PATCH 1692/2308] Gotta use the right format --- pkgs/servo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servo/default.nix b/pkgs/servo/default.nix index ce55b3a..c598365 100644 --- a/pkgs/servo/default.nix +++ b/pkgs/servo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/servo/servo-nightly-builds/releases/download/${version}/servo-latest.tar.gz"; - hash = "sha25600000000000000000000000000000000000000000000="; + hash = "sha256-0000000000000000000000000000000000000000000="; }; nativeBuildInputs = [ From adab08168aff4fb7bbd2508d32f15e2b22f585b1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Apr 2024 19:26:50 +0200 Subject: [PATCH 1693/2308] Actually correct hash --- pkgs/servo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servo/default.nix b/pkgs/servo/default.nix index c598365..6c140d2 100644 --- a/pkgs/servo/default.nix +++ b/pkgs/servo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/servo/servo-nightly-builds/releases/download/${version}/servo-latest.tar.gz"; - hash = "sha256-0000000000000000000000000000000000000000000="; + hash = "sha256-sMqjnFrJvlu3Dck/HdyKVzqMZxvMatlt9/5cHqzjusI="; }; nativeBuildInputs = [ From 21e6937a925111c17d005512bda46b02c1aa5e5d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 14 Apr 2024 14:18:20 +0200 Subject: [PATCH 1694/2308] update flake lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 4118846..2f0f5e2 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1712798444, - "narHash": "sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh+sk=", + "lastModified": 1712947906, + "narHash": "sha256-T0eT2lMbcK7RLelkx0qx4SiFpOS/0dt0aSfLB+WsGV8=", "owner": "nix-community", "repo": "disko", - "rev": "a297cb1cb0337ee10a7a0f9517954501d8f6f74d", + "rev": "8d4ae698eaac8bd717e23507da2ca8b345bec4b5", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1712759992, - "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", + "lastModified": 1713077896, + "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=", "owner": "nix-community", "repo": "home-manager", - "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", + "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0", "type": "github" }, "original": { @@ -571,11 +571,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1712437997, - "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=", + "lastModified": 1713042715, + "narHash": "sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920", + "rev": "c27f3b6d8e29346af16eecc0e9d54b1071eae27e", "type": "github" }, "original": { @@ -666,11 +666,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1712420723, - "narHash": "sha256-VnG0Eu394Ga2FCe8Q66m6OEQF8iAqjDYsjmtl+N2omk=", + "lastModified": 1712883908, + "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e7f26f82acb057498335362905fde6fea4ca50a", + "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", "type": "github" }, "original": { @@ -716,11 +716,11 @@ ] }, "locked": { - "lastModified": 1712907244, - "narHash": "sha256-uLNzw3ZRWob9/FfOXUNhlzKNCPWNtWfF4QYoc3Hs1Fw=", + "lastModified": 1713085647, + "narHash": "sha256-UkY2rK6f5OgwH2pvRQwm9QeueC5C37Nzm+R2/iNjHtU=", "owner": "pjones", "repo": "plasma-manager", - "rev": "27014d611e79bba47d5ee12f5790baf121045506", + "rev": "5af3d8f504d1d63aef73eda65c7a946c3fe3ac7a", "type": "github" }, "original": { @@ -829,11 +829,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1710449465, - "narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=", + "lastModified": 1713012165, + "narHash": "sha256-z/soXKDnz+w4Nw0LkRaM73YqolhSmIYy6cpg1F2ps8I=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "79c8cfcd5873a85559da6201b116fb38b490d030", + "rev": "9f6635a0351c190179dc6904545f950108a23dd8", "type": "gitlab" }, "original": { @@ -849,11 +849,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1712617241, - "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=", + "lastModified": 1713066950, + "narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c", + "rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87", "type": "github" }, "original": { From 2e3d85126d1079df690221d3d60c247751de9ee1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Apr 2024 12:18:28 +0200 Subject: [PATCH 1695/2308] update flake lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 2f0f5e2..df61011 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1712765734, - "narHash": "sha256-HakehmZVdhbXHNaTzoSwIHdvy1A3A7XXEIUHV2cC7d8=", + "lastModified": 1713156907, + "narHash": "sha256-/rawlPtXRUITUnHZymXZHgaHurZIuRR42Fbk0y6FqFY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "7d92cad55f58ef55d5c95ecf3753e0fa75ab11e1", + "rev": "775191d5c1634bdcf59b5253838a8c95685b5a86", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1712947906, - "narHash": "sha256-T0eT2lMbcK7RLelkx0qx4SiFpOS/0dt0aSfLB+WsGV8=", + "lastModified": 1713152224, + "narHash": "sha256-k1aV06cotPwWO3FW+ho+dEoGjxNM303+UmhiG2o6XPs=", "owner": "nix-community", "repo": "disko", - "rev": "8d4ae698eaac8bd717e23507da2ca8b345bec4b5", + "rev": "bb5ba68ebb73b5ca7996b64e1457fe885891e78e", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1713077896, - "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=", + "lastModified": 1713166971, + "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "owner": "nix-community", "repo": "home-manager", - "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0", + "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "type": "github" }, "original": { @@ -587,11 +587,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -635,11 +635,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -849,11 +849,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1713066950, - "narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=", + "lastModified": 1713174909, + "narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87", + "rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b", "type": "github" }, "original": { From 5829cb9216640c2db8a1edaa452cb9f7a92abc23 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Apr 2024 14:02:56 +0200 Subject: [PATCH 1696/2308] update flake lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index df61011..66b4ac1 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1713156907, - "narHash": "sha256-/rawlPtXRUITUnHZymXZHgaHurZIuRR42Fbk0y6FqFY=", + "lastModified": 1713180885, + "narHash": "sha256-G9yAD8l8XJr3AyTADtM6j4T+tEMwn9z3ojy1lFOki5U=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "775191d5c1634bdcf59b5253838a8c95685b5a86", + "rev": "6d47c20efa5b15a53b98d73ea72a759adaea00d1", "type": "github" }, "original": { From 5089a4fa9b92df8134196564f225b4c935e5bf0a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Apr 2024 16:56:18 +0200 Subject: [PATCH 1697/2308] Let's try this for sliding sync support --- nixos/server/package-configs/conduit/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index b0d8430..83e0acd 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -123,6 +123,14 @@ in { add_header Access-Control-Allow-Origin "*"; ''; }; + locations."/_matrix/client/unstable/org.matrix.msc3575/sync" = { + proxyPass = "http://backend_conduit/client/unstable/org.matrix.msc3575/sync"; + proxyWebsockets = true; + extraConfig = '' + proxy_set_header Host $host; + proxy_buffering off; + ''; + }; extraConfig = '' merge_slashes off; From e43a52acadde6bf72147b50caa85fb5b057b8992 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Apr 2024 20:06:32 +0200 Subject: [PATCH 1698/2308] Let's see if this rendering jupyter works --- nixos/server/package-configs/forgejo/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index 2377b60..193cb84 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -67,11 +67,19 @@ markup.jupyter = " ENABLED = true; FILE_EXTENSIONS = .ipynb - RENDER_COMMAND = jupyter nbconvert --stdout --to html --template full + RENDER_COMMAND = ${pkgs.jupyter}/bin/jupyter nbconvert --stdout --to html --template full IS_INPUT_FILE = true RENDER_CONTENT_MODE = no-sanitizer "; }; + markup.sanitizer.juypter0 = " + ; Jupyter chiefly uses divs + ELEMENT = div + ; we will need access to html classes later + ALLOW_ATTR = class + ; we don't mind which classes we keep, so let's keep all of them + REGEXP = + "; }; services.nginx = { From d69eb68ae36e3cc9a68812731be626e3e1585d25 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Apr 2024 20:07:57 +0200 Subject: [PATCH 1699/2308] Maybe add it to the correct setting location --- nixos/server/package-configs/forgejo/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index 193cb84..bf03a6b 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -71,15 +71,15 @@ IS_INPUT_FILE = true RENDER_CONTENT_MODE = no-sanitizer "; - }; - markup.sanitizer.juypter0 = " - ; Jupyter chiefly uses divs - ELEMENT = div - ; we will need access to html classes later - ALLOW_ATTR = class - ; we don't mind which classes we keep, so let's keep all of them - REGEXP = + markup.sanitizer.juypter0 = " + ; Jupyter chiefly uses divs + ELEMENT = div + ; we will need access to html classes later + ALLOW_ATTR = class + ; we don't mind which classes we keep, so let's keep all of them + REGEXP = "; + }; }; services.nginx = { From 51e4c8d19ec1e451a883951b6d30ea864c3fbd0b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Apr 2024 20:10:17 +0200 Subject: [PATCH 1700/2308] Or maybe this way instead? --- nixos/server/package-configs/forgejo/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index bf03a6b..3a4b676 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -70,15 +70,18 @@ RENDER_COMMAND = ${pkgs.jupyter}/bin/jupyter nbconvert --stdout --to html --template full IS_INPUT_FILE = true RENDER_CONTENT_MODE = no-sanitizer - "; - markup.sanitizer.juypter0 = " + + + + ; the name after sanitizer doesn't really matter + [markup.sanitizer.jupyter0] ; Jupyter chiefly uses divs ELEMENT = div ; we will need access to html classes later ALLOW_ATTR = class ; we don't mind which classes we keep, so let's keep all of them REGEXP = - "; + "; }; }; From 38d203c1d467a50a9c92f92687b9707681754919 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 15 Apr 2024 23:28:06 +0200 Subject: [PATCH 1701/2308] update flake lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 66b4ac1..a743c29 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1713152224, - "narHash": "sha256-k1aV06cotPwWO3FW+ho+dEoGjxNM303+UmhiG2o6XPs=", + "lastModified": 1713204594, + "narHash": "sha256-5yyHYBWFZUKXkJvOccPBeX83hH2iED54NLnWs2eWgS0=", "owner": "nix-community", "repo": "disko", - "rev": "bb5ba68ebb73b5ca7996b64e1457fe885891e78e", + "rev": "d51114dc1bf3cfaba2b6644aabd16ff0c9909af5", "type": "github" }, "original": { @@ -399,11 +399,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712261512, - "narHash": "sha256-qsBZ3tJj/3LR8jNYyCKjyCe0ePj4cMynSWBMC1OEDtc=", + "lastModified": 1713192402, + "narHash": "sha256-M2rleMvDJyhJEDWMcwhJNAuNFtvZhN3vadve7x2KiOk=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "999c0cb03f748fe311bca78961dbf0562dc91659", + "rev": "1197e51e8f57135349bed4de791d8bab7f8cc150", "type": "github" }, "original": { From b55351a6f2632814fdd58208c13433cfd9355c39 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Apr 2024 10:37:19 +0200 Subject: [PATCH 1702/2308] Let's try this forgejo settings file --- .../package-configs/forgejo/default.nix | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index 3a4b676..f5f6157 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -64,24 +64,18 @@ ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; }; - markup.jupyter = " + markup.jupyter = { ENABLED = true; - FILE_EXTENSIONS = .ipynb - RENDER_COMMAND = ${pkgs.jupyter}/bin/jupyter nbconvert --stdout --to html --template full - IS_INPUT_FILE = true - RENDER_CONTENT_MODE = no-sanitizer - - - - ; the name after sanitizer doesn't really matter - [markup.sanitizer.jupyter0] - ; Jupyter chiefly uses divs - ELEMENT = div - ; we will need access to html classes later - ALLOW_ATTR = class - ; we don't mind which classes we keep, so let's keep all of them - REGEXP = - "; + FILE_EXTENSIONS = ".ipynb"; + RENDER_COMMAND = "${pkgs.jupyter}/bin/jupyter nbconvert --stdout --to html --template full"; + IS_INPUT_FILE = true; + RENDER_CONTENT_MODE = "no-sanitizer"; + }; + markup.sanitizer.jupyter0 = { + ELEMENT = "div"; + ALLOW_ATTR = "class"; + REGEXP = ""; + }; }; }; From 79d4c6e7683fca9b90893a5c866926995485bdd8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Apr 2024 10:39:58 +0200 Subject: [PATCH 1703/2308] Make it one part instead of multiple levels --- nixos/server/package-configs/forgejo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index f5f6157..a0c278e 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -64,14 +64,14 @@ ROOT_URL = "https://git.lillianviolet.dev/"; HTTP_PORT = 3218; }; - markup.jupyter = { + "markup.jupyter" = { ENABLED = true; FILE_EXTENSIONS = ".ipynb"; RENDER_COMMAND = "${pkgs.jupyter}/bin/jupyter nbconvert --stdout --to html --template full"; IS_INPUT_FILE = true; RENDER_CONTENT_MODE = "no-sanitizer"; }; - markup.sanitizer.jupyter0 = { + "markup.sanitizer.jupyter0" = { ELEMENT = "div"; ALLOW_ATTR = "class"; REGEXP = ""; From fddc25a0b1f9eb8273ab4b46717b8a618bd88d7d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Apr 2024 10:45:59 +0200 Subject: [PATCH 1704/2308] Allow URI images --- nixos/server/package-configs/forgejo/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index a0c278e..f89ec7f 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -76,6 +76,9 @@ ALLOW_ATTR = "class"; REGEXP = ""; }; + "markup.sanitizer.jupyter.img" = { + ALLOW_DATA_URI_IMAGES = true; + }; }; }; From 734d60b0bd5c262d508fc161ebfcf68aeeab5c14 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Apr 2024 13:46:42 +0200 Subject: [PATCH 1705/2308] Make forgejo sanitizers the smae --- nixos/server/package-configs/forgejo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index f89ec7f..e168705 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -76,7 +76,7 @@ ALLOW_ATTR = "class"; REGEXP = ""; }; - "markup.sanitizer.jupyter.img" = { + "markup.sanitizer.jupyter0.img" = { ALLOW_DATA_URI_IMAGES = true; }; }; From 49ee44b861863f3aea3a74e99cfef76b4dd1a1b0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Apr 2024 13:46:51 +0200 Subject: [PATCH 1706/2308] add git credential manager --- home-manager/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 95e9e23..b8c9ff4 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -52,6 +52,7 @@ # Coding: direnv git + git-credential-manager ruff kate From 9e044cbc009a80d304ab64015d5d32a808540185 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 16 Apr 2024 13:54:42 +0200 Subject: [PATCH 1707/2308] Clean up forgejo configuration comments --- .../server/package-configs/forgejo/default.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index e168705..da7b467 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -7,33 +7,15 @@ ... }: { imports = []; - #users.groups.gitea = {}; - #users.users = { - # gitea = { - # openssh.authorizedKeys.keys = [ - # "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI" - # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" - # ]; - # isSystemUser = true; - # isNormalUser = false; - # group = "gitea"; - # extraGroups = ["virtualMail"]; - # }; - #}; #sops.secrets."mailpassunhash".mode = "0440"; #sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name; services.forgejo = { enable = true; - #user = "gitea"; - #group = "gitea"; - #stateDir = "/var/lib/gitea"; #TODO: different mail passwords for different services #mailerPasswordFile = config.sops.secrets."mailpassunhash".path; database = { - #user = "gitea"; - #name = "gitea"; type = "postgres"; }; settings = { From fc4c0626501c3647d05dd1003342f36969a4c7d5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Apr 2024 13:39:57 +0200 Subject: [PATCH 1708/2308] update flake lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a743c29..999c01f 100644 --- a/flake.lock +++ b/flake.lock @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1713294767, + "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7", "type": "github" }, "original": { @@ -375,11 +375,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1712909442, - "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", + "lastModified": 1713333160, + "narHash": "sha256-iz4Uz3vykqsZwIY2hxEMfRrc1DvBgxHVCfSxppuj40s=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", + "rev": "d3ce25a385ec7ed899ffb282d1e54ccb4ac9ef0d", "type": "github" }, "original": { @@ -587,11 +587,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { @@ -603,11 +603,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { @@ -635,11 +635,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { From 1513f5c42f45a66cc59d578fdd9efa6cb4000d63 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Apr 2024 14:33:43 +0200 Subject: [PATCH 1709/2308] Remove cinny desktop (the pwa is better) --- home-manager/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index b8c9ff4..a4cc553 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -57,7 +57,6 @@ kate # Chat applications: - cinny-desktop signal-desktop webcord-vencord From 26f98a643049268c8d3864134308dfeac4d46432 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Apr 2024 20:58:49 +0200 Subject: [PATCH 1710/2308] update flake lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 999c01f..444c10d 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1713180885, - "narHash": "sha256-G9yAD8l8XJr3AyTADtM6j4T+tEMwn9z3ojy1lFOki5U=", + "lastModified": 1713379868, + "narHash": "sha256-L/QhOkRmzB/gmwrWrqxct/sD6XIL4AOGguRhb4ahO/8=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "6d47c20efa5b15a53b98d73ea72a759adaea00d1", + "rev": "d0a9666a2976b983daf72eb0c0f8d41c04443f84", "type": "github" }, "original": { @@ -399,11 +399,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1713192402, - "narHash": "sha256-M2rleMvDJyhJEDWMcwhJNAuNFtvZhN3vadve7x2KiOk=", + "lastModified": 1713369831, + "narHash": "sha256-G4OGxvlIIjphpkxcRAkf1QInYsAeqbfNh6Yl1JLy2uM=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "1197e51e8f57135349bed4de791d8bab7f8cc150", + "rev": "850f27322239f8cfa56b122cc9a278ab99a49015", "type": "github" }, "original": { @@ -507,11 +507,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1713377320, + "narHash": "sha256-OrBm62B+X9jylr6cPgKc+5OSgF2PRW9IY0ARCOtURMY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "f2d364de6589f7a029624983593eafc3c4dac726", "type": "github" }, "original": { From 59d69e0acadfc1ae5040754774a5d2a7b0e01f0f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Apr 2024 15:06:32 +0200 Subject: [PATCH 1711/2308] Enable comma --- home-manager/desktop/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index a4cc553..033fd6d 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -39,6 +39,11 @@ }; }; + # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently + programs.command-not-found.enable = false; + programs.nix-index.enable = true; + programs.nix-index-database.comma.enable = true; + home = { username = "lillian"; homeDirectory = "/home/lillian"; From 2713e8cb3b317279cc98ddba5edf46feeb2b5353 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Apr 2024 15:07:28 +0200 Subject: [PATCH 1712/2308] Should not be in HM --- home-manager/desktop/default.nix | 5 ----- nixos/desktop/default.nix | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 033fd6d..a4cc553 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -39,11 +39,6 @@ }; }; - # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently - programs.command-not-found.enable = false; - programs.nix-index.enable = true; - programs.nix-index-database.comma.enable = true; - home = { username = "lillian"; homeDirectory = "/home/lillian"; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 9153254..7868fa1 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -25,6 +25,11 @@ }; }; + # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently + programs.command-not-found.enable = false; + programs.nix-index.enable = true; + programs.nix-index-database.comma.enable = true; + environment.systemPackages = with pkgs; [ # Custom tools dvd From 7d2ab4469d797663e57a0fe95093035451d78a38 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Apr 2024 15:10:51 +0200 Subject: [PATCH 1713/2308] That line seems nonsensical --- nixos/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 7868fa1..a34bdc5 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -28,7 +28,6 @@ # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently programs.command-not-found.enable = false; programs.nix-index.enable = true; - programs.nix-index-database.comma.enable = true; environment.systemPackages = with pkgs; [ # Custom tools From c6f9436b2f84a137872d44439752575c7811a7ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 18 Apr 2024 15:11:49 +0200 Subject: [PATCH 1714/2308] Add comma --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index a34bdc5..95f4b52 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -40,6 +40,7 @@ aha bcachefs-tools clinfo + comma direnv git-filter-repo gnupg From f28ac969b7f4ae51ef82bac9c2be29d20894a856 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Apr 2024 09:58:14 +0200 Subject: [PATCH 1715/2308] update flake lock --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 444c10d..b280626 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1713204594, - "narHash": "sha256-5yyHYBWFZUKXkJvOccPBeX83hH2iED54NLnWs2eWgS0=", + "lastModified": 1713406758, + "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", "owner": "nix-community", "repo": "disko", - "rev": "d51114dc1bf3cfaba2b6644aabd16ff0c9909af5", + "rev": "1efd500e9805a9efbce401ed5999006d397b9f11", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1713294767, - "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=", + "lastModified": 1713479476, + "narHash": "sha256-kTww3Hd+R95AB6J+Y1zvXrhUScgMzf0vV5hN6+wFPXE=", "owner": "nix-community", "repo": "home-manager", - "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7", + "rev": "ffc3600f4009ca39b6cb63b24127ca4f93792854", "type": "github" }, "original": { @@ -507,11 +507,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713377320, - "narHash": "sha256-OrBm62B+X9jylr6cPgKc+5OSgF2PRW9IY0ARCOtURMY=", + "lastModified": 1713441075, + "narHash": "sha256-3GGeFsEO8ivD+TcDEqe4s/d0VLvMYGNDGtx0ZnBxkUs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f2d364de6589f7a029624983593eafc3c4dac726", + "rev": "6f976e53752e5b9ab08f9a3b1b0b9c67815c9754", "type": "github" }, "original": { @@ -571,11 +571,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1713042715, - "narHash": "sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE=", + "lastModified": 1713434076, + "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c27f3b6d8e29346af16eecc0e9d54b1071eae27e", + "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c", "type": "github" }, "original": { @@ -587,11 +587,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1713297878, + "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", "type": "github" }, "original": { @@ -635,11 +635,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1713297878, + "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", "type": "github" }, "original": { @@ -666,11 +666,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1712883908, - "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", + "lastModified": 1713284584, + "narHash": "sha256-rRuPBJD9+yjz7tY3xC/BvFUwloutynR9piiVE6fhGqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", + "rev": "2b6ee326ad047870526d9a3ae88dfd0197da898d", "type": "github" }, "original": { @@ -716,11 +716,11 @@ ] }, "locked": { - "lastModified": 1713085647, - "narHash": "sha256-UkY2rK6f5OgwH2pvRQwm9QeueC5C37Nzm+R2/iNjHtU=", + "lastModified": 1713460214, + "narHash": "sha256-WvX42uScdEN5yDJ13ZWQczYyUpPawgvt4JHvAaK5c44=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5af3d8f504d1d63aef73eda65c7a946c3fe3ac7a", + "rev": "ef0c106a2104f841a54fe4b9ec60a79775e2fe1e", "type": "github" }, "original": { @@ -849,11 +849,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1713174909, - "narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=", + "lastModified": 1713457024, + "narHash": "sha256-31MpStyXedDL1fvuOvn6iz3JURSVShDtDVMyP1PTjtc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b", + "rev": "b94c6edbb8355756c53efc8ca3874c63622f287a", "type": "github" }, "original": { From 6e87a8b8446769d2487ca1034d4f15fc5eb0c534 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Apr 2024 16:57:39 +0200 Subject: [PATCH 1716/2308] Add managed global firefox settings --- nixos/desktop/default.nix | 1 + nixos/desktop/package-configs/default.nix | 12 ++ .../package-configs/firefox/default.nix | 173 ++++++++++++++++++ 3 files changed, 186 insertions(+) create mode 100644 nixos/desktop/package-configs/default.nix create mode 100644 nixos/desktop/package-configs/firefox/default.nix diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 95f4b52..b8decf9 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -11,6 +11,7 @@ imports = [ # Import shared packages ../shared + ./package-configs ]; nixpkgs = { # You can add overlays here diff --git a/nixos/desktop/package-configs/default.nix b/nixos/desktop/package-configs/default.nix new file mode 100644 index 0000000..95564cd --- /dev/null +++ b/nixos/desktop/package-configs/default.nix @@ -0,0 +1,12 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + ./firefox + ]; +} diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix new file mode 100644 index 0000000..1bfc6a2 --- /dev/null +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -0,0 +1,173 @@ +{ + config, + pkgs, + ... +}: { + programs.firefox = { + enable = true; + package = pkgs.firefox; + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + DisablePocket = true; + DisableFirefoxAccounts = true; + DisableAccounts = true; + DisableProfileImport = true; + OverrideFirstRunPage = ""; + OverridePostUpdatePage = ""; + DontCheckDefaultBrowser = true; + DisplayBookmarksToolbar = "newtab"; + ManualAppUpdateOnly = true; + OfferToSaveLogins = false; + PasswordManagerEnabled = false; + DownloadDirectory = "\${home}/Downloads"; + SearchEngines = { + Add = [ + { + Name = "DuckDuckGo"; + URLTemplate = "https://www.duckduckgo.org/?t=h_&q{searchTerms}&ia=web"; + Method = "GET | POST"; + IconURL = "https://www.duckduckgo.org/favicon.ico"; + Alias = "duckduckgo"; + Description = "DuckDuckGo Privacy Search Engine"; + PostData = "name=value&q={searchTerms}"; + SuggestURLTemplate = "https://www.duckduckgo.org/suggestions/q={searchTerms}"; + } + ]; + Default = "DuckDuckGo"; + Remove = ["Google" "Amazon" "Ebay"]; + }; + EnableTrackingProtection = { + Value = true; + Cryptomining = true; + Fingerprinting = true; + }; + ExtensionSettings = { + # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below + # Privacy Badger: + "jid1-MnnxcxisBPnSXQ@jetpack" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi"; + installation_mode = "force_installed"; + }; + # Bitwarden: + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; + installation_mode = "force_installed"; + }; + # Libredirect: + "7esoorv3@alefvanoon.anonaddy.me" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/libredirect/latest.xpi"; + installation_mode = "force_installed"; + }; + # DarkReader: + "addon@darkreader.org" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi"; + installation_mode = "force_installed"; + }; + # SimpleLogin: + "addon@simplelogin" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/simplelogin/latest.xpi"; + installation_mode = "force_installed"; + }; + # Cookie Auto Delete: + "CookieAutoDelete@kennydo.com" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/cookie-autodelete/latest.xpi"; + installation_mode = "force_installed"; + }; + # Don't fuck with paste: + "DontFuckWithPaste@raim.ist" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/don-t-fuck-with-paste/latest.xpi"; + installation_mode = "force_installed"; + }; + # Firefox pwas: + "firefoxpwa@filips.si" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/pwas-for-firefox/latest.xpi"; + installation_mode = "force_installed"; + }; + # Consent o matic: + "gdpr@cavi.au.dk" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/consent-o-matic/latest.xpi"; + installation_mode = "force_installed"; + }; + # Mailvelope: + "jid1-AQqSMBYb0a8ADg@jetpack" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/mailvelope/latest.xpi"; + installation_mode = "force_installed"; + }; + # KDE connect: + "kde-connect@0xc0dedbad.com" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/kde-connect/latest.xpi"; + installation_mode = "force_installed"; + }; + # Plasma browser integration: + "plasma-browser-integration@kde.org" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/plasma-integration/latest.xpi"; + installation_mode = "force_installed"; + }; + # Shinigami eyes: + "shinigamieyes@shinigamieyes" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/shinigami-eyes/latest.xpi"; + installation_mode = "force_installed"; + }; + # uBlock Origin: + "uBlock0@raymondhill.net" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; + installation_mode = "force_installed"; + }; + # uBlock Scope: + "uBO-Scope@raymondhill.net" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/ubo-scope/latest.xpi"; + installation_mode = "force_installed"; + }; + # Wayback machine: + "wayback_machine@mozilla.org" = { + install_url = "https://addons.mozilla.org/firefox/downloads/file/4047136/wayback_machine_new-3.2.xpi"; + installation_mode = "force_installed"; + }; + }; + FirefoxHome = { + Search = true; + TopSites = false; + SponsoredTopSites = false; + Highlights = false; + Pocket = false; + SponsoredPocket = false; + Snippets = false; + }; + FirefoxSuggest = { + WebSuggestions = false; + SponsoredSuggestions = false; + ImproveSuggest = false; + }; + Preferences = { + "browser.compactmode.show" = true; + "browser.uidensity" = 1; + # "browser.newtabpage.activity-stream.feeds.topsites" = false; + # "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "font.name.serif.x-western" = "Crimson"; + "font.name.sans-serif.x-western" = "Atkinson Hyperlegible"; + "font.name.monospace.x-western" = "FiraCode Nerd Font"; + "font.size.variable.x-western" = 14; + "signon.rememberSignons" = true; + }; + # TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks + # Bookmarks = [ + # { + # Title = "NixOS wiki"; + # Placement = "toolbar"; + # URL = "https://nixos.wiki/"; + # } + # { + # Title = "NixOS options"; + # Placement = "toolbar"; + # URL = "https://nixos.org/manual/nixos/stable/options"; + # } + # { + # Title = "NixOS home-manager options"; + # Placement = "toolbar"; + # URL = "https://nix-community.github.io/home-manager/options.xhtml"; + # } + # ]; + }; + }; +} From 01de7075bed0124a05beaec8b72b2cfa7033855d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Apr 2024 17:43:16 +0200 Subject: [PATCH 1717/2308] fix ebay name --- nixos/desktop/package-configs/firefox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 1bfc6a2..33bd645 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -35,7 +35,7 @@ } ]; Default = "DuckDuckGo"; - Remove = ["Google" "Amazon" "Ebay"]; + Remove = ["Google" "Amazon" "eBay"]; }; EnableTrackingProtection = { Value = true; From 5b5986450e4d14aef6ddfa3d5c25b515eba9c376 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 20 Apr 2024 18:47:32 +0200 Subject: [PATCH 1718/2308] update flake lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index b280626..7dbe6d1 100644 --- a/flake.lock +++ b/flake.lock @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1713479476, - "narHash": "sha256-kTww3Hd+R95AB6J+Y1zvXrhUScgMzf0vV5hN6+wFPXE=", + "lastModified": 1713566308, + "narHash": "sha256-7Y91t8pheIzjJveUMAPyeh5NOq5F49Nq4Hl2532QpJs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffc3600f4009ca39b6cb63b24127ca4f93792854", + "rev": "057117a401a34259c9615ce62218aea7afdee4d3", "type": "github" }, "original": { @@ -375,11 +375,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1713333160, - "narHash": "sha256-iz4Uz3vykqsZwIY2hxEMfRrc1DvBgxHVCfSxppuj40s=", + "lastModified": 1713606448, + "narHash": "sha256-JMKo6uoAcUip9N10a3r1T2IoLz+pUStwIFrsVW/R4MA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d3ce25a385ec7ed899ffb282d1e54ccb4ac9ef0d", + "rev": "96cbbcd3712a0cb7f128c54b21ec2af0950d88d0", "type": "github" }, "original": { @@ -507,11 +507,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713441075, - "narHash": "sha256-3GGeFsEO8ivD+TcDEqe4s/d0VLvMYGNDGtx0ZnBxkUs=", + "lastModified": 1713521961, + "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6f976e53752e5b9ab08f9a3b1b0b9c67815c9754", + "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", "type": "github" }, "original": { @@ -587,11 +587,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "type": "github" }, "original": { @@ -635,11 +635,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "type": "github" }, "original": { @@ -716,11 +716,11 @@ ] }, "locked": { - "lastModified": 1713460214, - "narHash": "sha256-WvX42uScdEN5yDJ13ZWQczYyUpPawgvt4JHvAaK5c44=", + "lastModified": 1713552700, + "narHash": "sha256-R2+GRjHFEapDa08FnuJjweAiE+5W7VKnBxNo3tC/Yzo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "ef0c106a2104f841a54fe4b9ec60a79775e2fe1e", + "rev": "bd743369ef402d269885225af93064f22b640990", "type": "github" }, "original": { @@ -849,11 +849,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1713457024, - "narHash": "sha256-31MpStyXedDL1fvuOvn6iz3JURSVShDtDVMyP1PTjtc=", + "lastModified": 1713532771, + "narHash": "sha256-vfKxhYVMzG2tg48/1rewBoSLCrKIjQsG1j7Nm/Y2gf4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b94c6edbb8355756c53efc8ca3874c63622f287a", + "rev": "a929a011a09db735abc45a8a45d1ff7fdee62755", "type": "github" }, "original": { From 97edb73ac371077ae330b3e87fe526ac44e24f13 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 20 Apr 2024 20:11:43 +0200 Subject: [PATCH 1719/2308] Change browser to librewolf --- nixos/desktop/package-configs/firefox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 33bd645..eeeea5a 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -5,7 +5,7 @@ }: { programs.firefox = { enable = true; - package = pkgs.firefox; + package = pkgs.librewolf; policies = { DisableTelemetry = true; DisableFirefoxStudies = true; From 056954216f1cffa7a52b97f65a2b1810a8125695 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 17:59:03 +0200 Subject: [PATCH 1720/2308] Let's try yeeting firefox and only keeping librewolf with all kinds of customisations --- home-manager/desktop/default.nix | 3 +- home-manager/package-configs/firefox.nix | 392 +++++++++++++++++++++++ 2 files changed, 393 insertions(+), 2 deletions(-) create mode 100644 home-manager/package-configs/firefox.nix diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index a4cc553..7b854b0 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -87,9 +87,8 @@ zsh # Web browsing: - (firefox.override {nativeMessagingHosts = [pkgs.firefoxpwa];}) firefoxpwa - librewolf + (librewolf.override {nativeMessagingHosts = [pkgs.firefoxpwa];}) ungoogled-chromium ]; diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix new file mode 100644 index 0000000..b49099d --- /dev/null +++ b/home-manager/package-configs/firefox.nix @@ -0,0 +1,392 @@ +{ + config, + pkgs, + ... +}: { + programs.firefox = { + enable = true; + nativeMessagingHosts = [pkgs.firefoxpwa]; + package = pkgs.librewolf; + isDefault = true; + settings = { + "browser.aboutConfig.showWarning" = false; + "browser.bookmarks.addedImportButton" = true; + "browser.bookmarks.restore_default_bookmarks" = false; + "browser.bookmarks.showMobileBookmarks" = true; + "browser.ctrlTab.sortByRecentlyUsed" = true; + "browser.discovery.enabled" = false; + "browser.download.panel.shown" = true; + "browser.firefox-view.feature-tour" = "{\"message\":\"FIREFOX_VIEW_FEATURE_TOUR\",\"screen\":\"\",\"complete\":true}"; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.pageActions.persistedActions" = ''{"ids":["bookmark","_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si"],"idsInUrlbar":["_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si","bookmark"],"idsInUrlbarPreProton":[],"version":1}''; + "browser.search.region" = "NL"; + "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button","firefoxpwa_filips_si-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; + "browser.urlbar.placeholderName" = "DuckDuckGo"; + "browser.urlbar.placeholderName.private" = "DuckDuckGo"; + }; + userChrome = '' + /* + Title: Drannex42's FirefoxSidebar / Vertical Tabs + Description: Vertical tab design for Firefox with dynamic indentation:: + Sideberry and TreeStyleTabs (Legacy) themes available! + Repository URL: https://github.com/drannex42/FirefoxSidebar + Version: 12022.04.17 + */ + + /* + Preferences / Settings :: + Use this file to set your preferences this will save them in one place for easier future updating + ========================================================================= + */ + + /* + Preferences / Settings + Use this file to set your preferences this will save them in one place for easier future updating + ========================================================================= + */ + + :root { + --sidebar-width: 50px; + --toolbar-height: -50px; + --menubar-height: -74px; + --sidebar-padding: calc(var(--sidebar-width) + 5px); + --toolbar-start-end-padding: 5px !important; + + /* Custom Sidebar/Header Backround :: + This sets the background for the other sidebar options (bookmarks, history, in case it is transparent from a theme that is not set up properly + */ + /* --custom-sidebar-bg: Field; /* Default: Field (Disabled) */ + --custom-sidebar-header-bg: #000; /* Default: Field (Disabled) */ + + /* ====== Extension Settings ====== */ + + /* Window Control / Client Side Display Settings === + If you are putting this on the left or right side uncomment the side + preferences below and comment the other + ========================================================================= + */ + --csd-width: 100px; + --csd-top: 8px; + + /* + CSD - Left Side === + Default: --csd-left: 50px; --csd-margin-left: 92px; + */ + + /* + --csd-left: 50px; + --csd-margin-left: 92px; + */ + + /* + CSD - Right Side === + Defaults: --csd-right: 0px; --csd-margin-right: 95px; + */ + + --csd-right: 36px; + --csd-margin-right: 130px; + + /* === END: Window Control / Client Side Display Settings === */ + + /* === END: Extension Settings === */ + + } + + + /* ========================================================================= */ + + /* Sidebar (Core) :: This file is for the sidebar implementation */ + /* + Extension (Core): Sidebar + Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. + Repository URL: https://github.com/drannex42/FirefoxSidebar + Version: v12022.11.22 (YYYYY.MM.DD) + */ + + #main-window #TabsToolbar { + visibility: collapse; + } + + + + #sidebar-box > #browser, + #webextpanels-window { + background: transparent !important; + + } + + #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] + #sidebar-header { + /*! display: none; */ + } + + /*Collapse in default state and add transition*/ + #sidebar-box { + /*! overflow: visible !important; */ + border-right: none !important; /* border-right: 1px solid var(--sidebar-border-color) !important; */ + z-index: 2; + border-right: none !important; + width: 100% !important; + background: var(--custom-sidebar-bg, --sidebar-background); + + /* lock sidebar to height by doing the inverse margin of the toolbar element */ + z-index: 1000 !important; + position: relative !important; + margin-top: var(--menubar-height) !important; + border-right: none; + transition: none !important; + + /* lock sidebar to specified width */ + min-width: var(--sidebar-width) !important; + max-width: var(--sidebar-width) !important; + overflow: hidden !important; + transition-property: width; + transition-duration: 0.25s; + transition-delay: 0.25s; + transition-timing-function: ease-in; + } + + #sidebar-box::after { + background: var(--sidebar-border-color) !important; + margin-left: 207px; + z-index: 9999999; + position: absolute; + content: " "; + width: 1px; + height: 100%; + top: 0; + right: 0px; + } + + #sidebar-box:hover:after { + top: 42px; + } + + /*All other sidebar-boxes should be larger on hover*/ + #sidebar-box:hover, #sidebar-box #sidebar:hover { + min-width: 350px !important; + max-width: 350px !important; + z-index: 999; + margin-right: -300px !important; + } + + /*Tree Style Tabs && Sideberry specific sidebar width and size*/ + + #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"]:hover, + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]:hover, + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] #sidebar:hover { + min-width: 260px !important; + max-width: 260px !important; + margin-right: -210px !important; + } + + #sidebar-header { + border: none !important; + border-right: 1px solid var(--sidebar-border-color); + background: var(--custom-sidebar-header-bg, transparent) !important; + } + + #sidebar-close, + #sidebar-title, + #sidebar-switcher-arrow { + display: none; + border: none; + } + + #sidebar-switcher-target { + border: none !important; + margin-left: 4.5px !important; + padding-top: 4px !important; + padding-bottom: 6px !important; + } + + #sidebar-switcher-target:focus-visible:not(:hover, [open]), + #sidebar-close:focus-visible:not(:hover, [open]) { + outline: none !important; + } + + + + .sidebar-splitter { + opacity: 0 !important; + width: 0px !important; + border: none !important; + --avatar-image-url: none !important; + } + + #sidebarMenu-popup .subviewbutton { + min-width: 0px; + padding: 0; + margin: 0 !important; + } + + toolbarseparator { + display: none; + } + + #nav-bar-customization-target { + z-index: 99999; + position: relative; + } + + .browser-toolbar { + padding-left: var(--sidebar-width) !important; + position: relative !important; + } + + #PersonalToolbar { + padding: 2px 5px !important; + padding-top: 0px !important; + margin-top: 0px !important; + padding-left: calc(var(--sidebar-width) + 6px) !important; + } + + + /* + Extensions :: + To enable/disable specific extensions just comment/uncomment the line below. + ========================================================================= + */ + + /* CSD / Window Controls */ + /* + Extension: Window Controls / Client Side Decorations (CSD) + Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. + Repository URL: https://github.com/drannex42/FirefoxSidebar + Contributors: Mr-nUUb, Xanaxus, Drannex42 + Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 + */ + + /* allow the buttons to appear */ + .browser-toolbar { + position: unset !important; + } + + /* reserve space for buttons */ + #nav-bar { + padding-right: var(--csd-margin-right) !important; + margin-left: var(--csd-margin-left) !important; + } + + /* move buttons next to menu button */ + .titlebar-buttonbox-container { + visibility: visible !important; + position: fixed !important; + display: block; + z-index: 999999999; + top: var(--csd-top, inherit); + right: var(--csd-right, inherit); + left: var(--csd-left, inherit); + max-width: var(--csd-width); + } + + /* hide buttons in fullscreen mode (video player and F11) */ + #main-window[inFullscreen="true"] .titlebar-buttonbox-container, + #main-window[inDOMFullscreen="true"] .titlebar-buttonbox-container { + visibility: hidden !important; + } + + /* remove empty space when in fullscreen mode (F11) */ + #main-window[inFullscreen="true"] #nav-bar { + padding-right: 0px !important; + margin-left: 0px !important; + } + /* END Client Side Decorations / Window Controls */ + + + + /* --- Prevent enlargement */ + #urlbar[breakout-extend] { + top: calc( + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + ) !important; + left: 0 !important; + width: 100% !important; + } + + #urlbar[breakout-extend] #urlbar-input-container { + height: var(--urlbar-height) !important; + /* padding: 0px !important; */ + padding-block: 0px !important; + padding-inline: 0px !important; + } + .urlbarView-row { + padding: 0px 2px 0px 2px; + } + /* END Prevent enlargement --- */ + + /*/* --- Reduce row paddings to make them more compact */ + .urlbarView-row { + padding: 2px 0px !important; + line-height: 1.2em !important; + margin: -1px; + margin-bottom: 0px; + } + .urlbarView-row-inner { + padding-bottom: 6px !important; + } + .urlbarView { + margin: 0px !important; + width: 100% !important; + } + /* END Reduce row paddings to make them more compact --- */ + + /* Disable Urlbar Animation */ + #urlbar[breakout][breakout-extend][breakout-extend-animate] + > #urlbar-background { + animation-name: none !important; + animation: none !important; + } + /* END Disable Urlbar Animation */ + + /* --- More compact "Search with Google" rows */ + .urlbarView-row[dynamicType="onboardTabToSearch"] > .urlbarView-row-inner { + min-height: auto !important; + width: auto !important; + } + .urlbarView-row[dynamicType="onboardTabToSearch"] + > .urlbarView-row-inner + > .urlbarView-no-wrap + > .urlbarView-favicon { + margin-bottom: -1px; + } + /* END More compact "Search with Google" rows --- */ + + /* Remove active border on the addressbar when in focus */ + #nav-bar { + --toolbar-field-focus-border-color: #ccc; + } + + /* Remove box shadow on address bar */ + #urlbar-background, + #searchbar { + box-shadow: none !important; + } + ''; + profiles.lillian = { + Bookmarks = [ + { + name = "estrogen production"; + tags = ["chemistry" "oestrogen" "estrogen" "diy"]; + url = "https://crimethinc.com/2022/12/15/producing-transdermal-estrogen-a-do-it-yourself-guide"; + } + { + name = "Nix sites"; + toolbar = false; + bookmarks = [ + { + name = "packages"; + tags = ["packages" "basic" "nix"]; + url = "https://search.nixos.org/"; + } + { + name = "settings"; + tags = ["settings" "services" "packages" "nix"]; + url = "https://mynixos.com"; + } + ]; + } + ]; + }; + }; +} From 4ec642441c17cb4094ebe61d52df77a1250cbcad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 18:01:28 +0200 Subject: [PATCH 1721/2308] Let's try firefox instead, I'll delete all previous files and see how this looks --- home-manager/package-configs/firefox.nix | 2 +- nixos/desktop/package-configs/firefox/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index b49099d..8dc9174 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -6,7 +6,7 @@ programs.firefox = { enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; - package = pkgs.librewolf; + package = pkgs.firefox; isDefault = true; settings = { "browser.aboutConfig.showWarning" = false; diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index eeeea5a..33bd645 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -5,7 +5,7 @@ }: { programs.firefox = { enable = true; - package = pkgs.librewolf; + package = pkgs.firefox; policies = { DisableTelemetry = true; DisableFirefoxStudies = true; From 056670212404c89f3d6c0b8d6f6d9e2a4b8b1ae8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 18:15:10 +0200 Subject: [PATCH 1722/2308] Let's remove this add for now --- .../package-configs/firefox/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 33bd645..05fba9a 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -22,18 +22,18 @@ PasswordManagerEnabled = false; DownloadDirectory = "\${home}/Downloads"; SearchEngines = { - Add = [ - { - Name = "DuckDuckGo"; - URLTemplate = "https://www.duckduckgo.org/?t=h_&q{searchTerms}&ia=web"; - Method = "GET | POST"; - IconURL = "https://www.duckduckgo.org/favicon.ico"; - Alias = "duckduckgo"; - Description = "DuckDuckGo Privacy Search Engine"; - PostData = "name=value&q={searchTerms}"; - SuggestURLTemplate = "https://www.duckduckgo.org/suggestions/q={searchTerms}"; - } - ]; + # Add = [ + # { + # Name = "DuckDuckGo"; + # URLTemplate = "https://www.duckduckgo.org/?t=h_&q{searchTerms}&ia=web"; + # Method = "GET | POST"; + # IconURL = "https://www.duckduckgo.org/favicon.ico"; + # Alias = "duckduckgo"; + # Description = "DuckDuckGo Privacy Search Engine"; + # PostData = "name=value&q={searchTerms}"; + # SuggestURLTemplate = "https://www.duckduckgo.org/suggestions/q={searchTerms}"; + # } + # ]; Default = "DuckDuckGo"; Remove = ["Google" "Amazon" "eBay"]; }; From 329b215bbe25afad33f111e864616d91887e1a69 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:23:13 +0200 Subject: [PATCH 1723/2308] Add firefox config to home manager --- home-manager/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 7b854b0..0a3719f 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -17,6 +17,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../package-configs/zsh.nix + ../package-configs/firefox.nix ./plasma-desktop ]; nixpkgs = { From f8fd2cf5062ce0c00444f08ca625704147fb718f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:25:44 +0200 Subject: [PATCH 1724/2308] Should probably put the profile settings in the profile --- home-manager/package-configs/firefox.nix | 610 +++++++++++------------ 1 file changed, 305 insertions(+), 305 deletions(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 8dc9174..e6f38bf 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -7,363 +7,363 @@ enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; package = pkgs.firefox; - isDefault = true; - settings = { - "browser.aboutConfig.showWarning" = false; - "browser.bookmarks.addedImportButton" = true; - "browser.bookmarks.restore_default_bookmarks" = false; - "browser.bookmarks.showMobileBookmarks" = true; - "browser.ctrlTab.sortByRecentlyUsed" = true; - "browser.discovery.enabled" = false; - "browser.download.panel.shown" = true; - "browser.firefox-view.feature-tour" = "{\"message\":\"FIREFOX_VIEW_FEATURE_TOUR\",\"screen\":\"\",\"complete\":true}"; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; - "browser.pageActions.persistedActions" = ''{"ids":["bookmark","_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si"],"idsInUrlbar":["_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si","bookmark"],"idsInUrlbarPreProton":[],"version":1}''; - "browser.search.region" = "NL"; - "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button","firefoxpwa_filips_si-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; - "browser.urlbar.placeholderName" = "DuckDuckGo"; - "browser.urlbar.placeholderName.private" = "DuckDuckGo"; - }; - userChrome = '' - /* - Title: Drannex42's FirefoxSidebar / Vertical Tabs - Description: Vertical tab design for Firefox with dynamic indentation:: - Sideberry and TreeStyleTabs (Legacy) themes available! - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: 12022.04.17 - */ - - /* - Preferences / Settings :: - Use this file to set your preferences this will save them in one place for easier future updating - ========================================================================= - */ - - /* - Preferences / Settings - Use this file to set your preferences this will save them in one place for easier future updating - ========================================================================= - */ - - :root { - --sidebar-width: 50px; - --toolbar-height: -50px; - --menubar-height: -74px; - --sidebar-padding: calc(var(--sidebar-width) + 5px); - --toolbar-start-end-padding: 5px !important; - - /* Custom Sidebar/Header Backround :: - This sets the background for the other sidebar options (bookmarks, history, in case it is transparent from a theme that is not set up properly + profiles.lillian = { + isDefault = true; + settings = { + "browser.aboutConfig.showWarning" = false; + "browser.bookmarks.addedImportButton" = true; + "browser.bookmarks.restore_default_bookmarks" = false; + "browser.bookmarks.showMobileBookmarks" = true; + "browser.ctrlTab.sortByRecentlyUsed" = true; + "browser.discovery.enabled" = false; + "browser.download.panel.shown" = true; + "browser.firefox-view.feature-tour" = "{\"message\":\"FIREFOX_VIEW_FEATURE_TOUR\",\"screen\":\"\",\"complete\":true}"; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.pageActions.persistedActions" = ''{"ids":["bookmark","_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si"],"idsInUrlbar":["_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si","bookmark"],"idsInUrlbarPreProton":[],"version":1}''; + "browser.search.region" = "NL"; + "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button","firefoxpwa_filips_si-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; + "browser.urlbar.placeholderName" = "DuckDuckGo"; + "browser.urlbar.placeholderName.private" = "DuckDuckGo"; + }; + userChrome = '' + /* + Title: Drannex42's FirefoxSidebar / Vertical Tabs + Description: Vertical tab design for Firefox with dynamic indentation:: + Sideberry and TreeStyleTabs (Legacy) themes available! + Repository URL: https://github.com/drannex42/FirefoxSidebar + Version: 12022.04.17 */ - /* --custom-sidebar-bg: Field; /* Default: Field (Disabled) */ - --custom-sidebar-header-bg: #000; /* Default: Field (Disabled) */ - /* ====== Extension Settings ====== */ - - /* Window Control / Client Side Display Settings === - If you are putting this on the left or right side uncomment the side - preferences below and comment the other + /* + Preferences / Settings :: + Use this file to set your preferences this will save them in one place for easier future updating ========================================================================= */ - --csd-width: 100px; - --csd-top: 8px; - /* - CSD - Left Side === - Default: --csd-left: 50px; --csd-margin-left: 92px; + /* + Preferences / Settings + Use this file to set your preferences this will save them in one place for easier future updating + ========================================================================= + */ + + :root { + --sidebar-width: 50px; + --toolbar-height: -50px; + --menubar-height: -74px; + --sidebar-padding: calc(var(--sidebar-width) + 5px); + --toolbar-start-end-padding: 5px !important; + + /* Custom Sidebar/Header Backround :: + This sets the background for the other sidebar options (bookmarks, history, in case it is transparent from a theme that is not set up properly */ + /* --custom-sidebar-bg: Field; /* Default: Field (Disabled) */ + --custom-sidebar-header-bg: #000; /* Default: Field (Disabled) */ + + /* ====== Extension Settings ====== */ + + /* Window Control / Client Side Display Settings === + If you are putting this on the left or right side uncomment the side + preferences below and comment the other + ========================================================================= + */ + --csd-width: 100px; + --csd-top: 8px; /* - --csd-left: 50px; - --csd-margin-left: 92px; + CSD - Left Side === + Default: --csd-left: 50px; --csd-margin-left: 92px; */ - /* - CSD - Right Side === - Defaults: --csd-right: 0px; --csd-margin-right: 95px; - */ + /* + --csd-left: 50px; + --csd-margin-left: 92px; + */ - --csd-right: 36px; - --csd-margin-right: 130px; + /* + CSD - Right Side === + Defaults: --csd-right: 0px; --csd-margin-right: 95px; + */ - /* === END: Window Control / Client Side Display Settings === */ + --csd-right: 36px; + --csd-margin-right: 130px; - /* === END: Extension Settings === */ + /* === END: Window Control / Client Side Display Settings === */ - } + /* === END: Extension Settings === */ + + } - /* ========================================================================= */ + /* ========================================================================= */ - /* Sidebar (Core) :: This file is for the sidebar implementation */ - /* - Extension (Core): Sidebar - Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: v12022.11.22 (YYYYY.MM.DD) - */ + /* Sidebar (Core) :: This file is for the sidebar implementation */ + /* + Extension (Core): Sidebar + Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. + Repository URL: https://github.com/drannex42/FirefoxSidebar + Version: v12022.11.22 (YYYYY.MM.DD) + */ - #main-window #TabsToolbar { - visibility: collapse; - } + #main-window #TabsToolbar { + visibility: collapse; + } - #sidebar-box > #browser, - #webextpanels-window { - background: transparent !important; + #sidebar-box > #browser, + #webextpanels-window { + background: transparent !important; - } + } + + #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] + #sidebar-header { + /*! display: none; */ + } + + /*Collapse in default state and add transition*/ + #sidebar-box { + /*! overflow: visible !important; */ + border-right: none !important; /* border-right: 1px solid var(--sidebar-border-color) !important; */ + z-index: 2; + border-right: none !important; + width: 100% !important; + background: var(--custom-sidebar-bg, --sidebar-background); + + /* lock sidebar to height by doing the inverse margin of the toolbar element */ + z-index: 1000 !important; + position: relative !important; + margin-top: var(--menubar-height) !important; + border-right: none; + transition: none !important; + + /* lock sidebar to specified width */ + min-width: var(--sidebar-width) !important; + max-width: var(--sidebar-width) !important; + overflow: hidden !important; + transition-property: width; + transition-duration: 0.25s; + transition-delay: 0.25s; + transition-timing-function: ease-in; + } + + #sidebar-box::after { + background: var(--sidebar-border-color) !important; + margin-left: 207px; + z-index: 9999999; + position: absolute; + content: " "; + width: 1px; + height: 100%; + top: 0; + right: 0px; + } + + #sidebar-box:hover:after { + top: 42px; + } + + /*All other sidebar-boxes should be larger on hover*/ + #sidebar-box:hover, #sidebar-box #sidebar:hover { + min-width: 350px !important; + max-width: 350px !important; + z-index: 999; + margin-right: -300px !important; + } + + /*Tree Style Tabs && Sideberry specific sidebar width and size*/ + + #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"]:hover, + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]:hover, + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] #sidebar:hover { + min-width: 260px !important; + max-width: 260px !important; + margin-right: -210px !important; + } - #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header { - /*! display: none; */ - } + border: none !important; + border-right: 1px solid var(--sidebar-border-color); + background: var(--custom-sidebar-header-bg, transparent) !important; + } - /*Collapse in default state and add transition*/ - #sidebar-box { - /*! overflow: visible !important; */ - border-right: none !important; /* border-right: 1px solid var(--sidebar-border-color) !important; */ - z-index: 2; - border-right: none !important; - width: 100% !important; - background: var(--custom-sidebar-bg, --sidebar-background); + #sidebar-close, + #sidebar-title, + #sidebar-switcher-arrow { + display: none; + border: none; + } - /* lock sidebar to height by doing the inverse margin of the toolbar element */ - z-index: 1000 !important; - position: relative !important; - margin-top: var(--menubar-height) !important; - border-right: none; - transition: none !important; + #sidebar-switcher-target { + border: none !important; + margin-left: 4.5px !important; + padding-top: 4px !important; + padding-bottom: 6px !important; + } - /* lock sidebar to specified width */ - min-width: var(--sidebar-width) !important; - max-width: var(--sidebar-width) !important; - overflow: hidden !important; - transition-property: width; - transition-duration: 0.25s; - transition-delay: 0.25s; - transition-timing-function: ease-in; - } - - #sidebar-box::after { - background: var(--sidebar-border-color) !important; - margin-left: 207px; - z-index: 9999999; - position: absolute; - content: " "; - width: 1px; - height: 100%; - top: 0; - right: 0px; - } - - #sidebar-box:hover:after { - top: 42px; - } - - /*All other sidebar-boxes should be larger on hover*/ - #sidebar-box:hover, #sidebar-box #sidebar:hover { - min-width: 350px !important; - max-width: 350px !important; - z-index: 999; - margin-right: -300px !important; - } - - /*Tree Style Tabs && Sideberry specific sidebar width and size*/ - - #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"]:hover, - #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]:hover, - #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] #sidebar:hover { - min-width: 260px !important; - max-width: 260px !important; - margin-right: -210px !important; - } - - #sidebar-header { - border: none !important; - border-right: 1px solid var(--sidebar-border-color); - background: var(--custom-sidebar-header-bg, transparent) !important; - } - - #sidebar-close, - #sidebar-title, - #sidebar-switcher-arrow { - display: none; - border: none; - } - - #sidebar-switcher-target { - border: none !important; - margin-left: 4.5px !important; - padding-top: 4px !important; - padding-bottom: 6px !important; - } - - #sidebar-switcher-target:focus-visible:not(:hover, [open]), - #sidebar-close:focus-visible:not(:hover, [open]) { - outline: none !important; - } + #sidebar-switcher-target:focus-visible:not(:hover, [open]), + #sidebar-close:focus-visible:not(:hover, [open]) { + outline: none !important; + } - .sidebar-splitter { - opacity: 0 !important; - width: 0px !important; - border: none !important; - --avatar-image-url: none !important; - } + .sidebar-splitter { + opacity: 0 !important; + width: 0px !important; + border: none !important; + --avatar-image-url: none !important; + } - #sidebarMenu-popup .subviewbutton { - min-width: 0px; - padding: 0; - margin: 0 !important; - } + #sidebarMenu-popup .subviewbutton { + min-width: 0px; + padding: 0; + margin: 0 !important; + } - toolbarseparator { - display: none; - } + toolbarseparator { + display: none; + } - #nav-bar-customization-target { - z-index: 99999; - position: relative; - } + #nav-bar-customization-target { + z-index: 99999; + position: relative; + } - .browser-toolbar { - padding-left: var(--sidebar-width) !important; - position: relative !important; - } + .browser-toolbar { + padding-left: var(--sidebar-width) !important; + position: relative !important; + } - #PersonalToolbar { - padding: 2px 5px !important; - padding-top: 0px !important; - margin-top: 0px !important; - padding-left: calc(var(--sidebar-width) + 6px) !important; - } + #PersonalToolbar { + padding: 2px 5px !important; + padding-top: 0px !important; + margin-top: 0px !important; + padding-left: calc(var(--sidebar-width) + 6px) !important; + } - /* - Extensions :: - To enable/disable specific extensions just comment/uncomment the line below. - ========================================================================= - */ + /* + Extensions :: + To enable/disable specific extensions just comment/uncomment the line below. + ========================================================================= + */ - /* CSD / Window Controls */ - /* - Extension: Window Controls / Client Side Decorations (CSD) - Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Contributors: Mr-nUUb, Xanaxus, Drannex42 - Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 - */ + /* CSD / Window Controls */ + /* + Extension: Window Controls / Client Side Decorations (CSD) + Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. + Repository URL: https://github.com/drannex42/FirefoxSidebar + Contributors: Mr-nUUb, Xanaxus, Drannex42 + Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 + */ - /* allow the buttons to appear */ - .browser-toolbar { - position: unset !important; - } + /* allow the buttons to appear */ + .browser-toolbar { + position: unset !important; + } - /* reserve space for buttons */ - #nav-bar { - padding-right: var(--csd-margin-right) !important; - margin-left: var(--csd-margin-left) !important; - } + /* reserve space for buttons */ + #nav-bar { + padding-right: var(--csd-margin-right) !important; + margin-left: var(--csd-margin-left) !important; + } - /* move buttons next to menu button */ - .titlebar-buttonbox-container { - visibility: visible !important; - position: fixed !important; - display: block; - z-index: 999999999; - top: var(--csd-top, inherit); - right: var(--csd-right, inherit); - left: var(--csd-left, inherit); - max-width: var(--csd-width); - } + /* move buttons next to menu button */ + .titlebar-buttonbox-container { + visibility: visible !important; + position: fixed !important; + display: block; + z-index: 999999999; + top: var(--csd-top, inherit); + right: var(--csd-right, inherit); + left: var(--csd-left, inherit); + max-width: var(--csd-width); + } - /* hide buttons in fullscreen mode (video player and F11) */ - #main-window[inFullscreen="true"] .titlebar-buttonbox-container, - #main-window[inDOMFullscreen="true"] .titlebar-buttonbox-container { - visibility: hidden !important; - } + /* hide buttons in fullscreen mode (video player and F11) */ + #main-window[inFullscreen="true"] .titlebar-buttonbox-container, + #main-window[inDOMFullscreen="true"] .titlebar-buttonbox-container { + visibility: hidden !important; + } - /* remove empty space when in fullscreen mode (F11) */ - #main-window[inFullscreen="true"] #nav-bar { - padding-right: 0px !important; - margin-left: 0px !important; - } - /* END Client Side Decorations / Window Controls */ + /* remove empty space when in fullscreen mode (F11) */ + #main-window[inFullscreen="true"] #nav-bar { + padding-right: 0px !important; + margin-left: 0px !important; + } + /* END Client Side Decorations / Window Controls */ - /* --- Prevent enlargement */ - #urlbar[breakout-extend] { - top: calc( - (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 - ) !important; - left: 0 !important; - width: 100% !important; - } + /* --- Prevent enlargement */ + #urlbar[breakout-extend] { + top: calc( + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + ) !important; + left: 0 !important; + width: 100% !important; + } - #urlbar[breakout-extend] #urlbar-input-container { - height: var(--urlbar-height) !important; - /* padding: 0px !important; */ - padding-block: 0px !important; - padding-inline: 0px !important; - } - .urlbarView-row { - padding: 0px 2px 0px 2px; - } - /* END Prevent enlargement --- */ + #urlbar[breakout-extend] #urlbar-input-container { + height: var(--urlbar-height) !important; + /* padding: 0px !important; */ + padding-block: 0px !important; + padding-inline: 0px !important; + } + .urlbarView-row { + padding: 0px 2px 0px 2px; + } + /* END Prevent enlargement --- */ - /*/* --- Reduce row paddings to make them more compact */ - .urlbarView-row { - padding: 2px 0px !important; - line-height: 1.2em !important; - margin: -1px; - margin-bottom: 0px; - } - .urlbarView-row-inner { - padding-bottom: 6px !important; - } - .urlbarView { - margin: 0px !important; - width: 100% !important; - } - /* END Reduce row paddings to make them more compact --- */ + /*/* --- Reduce row paddings to make them more compact */ + .urlbarView-row { + padding: 2px 0px !important; + line-height: 1.2em !important; + margin: -1px; + margin-bottom: 0px; + } + .urlbarView-row-inner { + padding-bottom: 6px !important; + } + .urlbarView { + margin: 0px !important; + width: 100% !important; + } + /* END Reduce row paddings to make them more compact --- */ - /* Disable Urlbar Animation */ - #urlbar[breakout][breakout-extend][breakout-extend-animate] - > #urlbar-background { - animation-name: none !important; - animation: none !important; - } - /* END Disable Urlbar Animation */ + /* Disable Urlbar Animation */ + #urlbar[breakout][breakout-extend][breakout-extend-animate] + > #urlbar-background { + animation-name: none !important; + animation: none !important; + } + /* END Disable Urlbar Animation */ - /* --- More compact "Search with Google" rows */ - .urlbarView-row[dynamicType="onboardTabToSearch"] > .urlbarView-row-inner { - min-height: auto !important; - width: auto !important; - } - .urlbarView-row[dynamicType="onboardTabToSearch"] - > .urlbarView-row-inner - > .urlbarView-no-wrap - > .urlbarView-favicon { - margin-bottom: -1px; - } - /* END More compact "Search with Google" rows --- */ + /* --- More compact "Search with Google" rows */ + .urlbarView-row[dynamicType="onboardTabToSearch"] > .urlbarView-row-inner { + min-height: auto !important; + width: auto !important; + } + .urlbarView-row[dynamicType="onboardTabToSearch"] + > .urlbarView-row-inner + > .urlbarView-no-wrap + > .urlbarView-favicon { + margin-bottom: -1px; + } + /* END More compact "Search with Google" rows --- */ - /* Remove active border on the addressbar when in focus */ - #nav-bar { - --toolbar-field-focus-border-color: #ccc; - } + /* Remove active border on the addressbar when in focus */ + #nav-bar { + --toolbar-field-focus-border-color: #ccc; + } - /* Remove box shadow on address bar */ - #urlbar-background, - #searchbar { - box-shadow: none !important; - } - ''; - profiles.lillian = { + /* Remove box shadow on address bar */ + #urlbar-background, + #searchbar { + box-shadow: none !important; + } + ''; Bookmarks = [ { name = "estrogen production"; From fc4c9c81bad81163403f9314561a4ea5a70cd3b2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:26:34 +0200 Subject: [PATCH 1725/2308] Small b not big B bookmarks --- home-manager/package-configs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index e6f38bf..2180e18 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -364,7 +364,7 @@ box-shadow: none !important; } ''; - Bookmarks = [ + bookmarks = [ { name = "estrogen production"; tags = ["chemistry" "oestrogen" "estrogen" "diy"]; From 43d652c1294c111abf436e4630b0ef200c43fbfd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:30:24 +0200 Subject: [PATCH 1726/2308] Use the userchrome to true --- home-manager/package-configs/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 2180e18..48e8276 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -24,6 +24,7 @@ "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button","firefoxpwa_filips_si-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; "browser.urlbar.placeholderName" = "DuckDuckGo"; "browser.urlbar.placeholderName.private" = "DuckDuckGo"; + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; }; userChrome = '' /* From e8651810d04935dc9fad56cb9da389482a1d270c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:33:57 +0200 Subject: [PATCH 1727/2308] Let's try and change some values, this doesn't seem to work --- home-manager/package-configs/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 48e8276..eef3e34 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,8 +49,8 @@ :root { --sidebar-width: 50px; - --toolbar-height: -50px; - --menubar-height: -74px; + --toolbar-height: -30px; + --menubar-height: -54px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From 2fffe8e6a4e341471e64b0415d603f9e9b49cf65 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:34:55 +0200 Subject: [PATCH 1728/2308] Better but not perfect yet --- home-manager/package-configs/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index eef3e34..9fafa01 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,8 +49,8 @@ :root { --sidebar-width: 50px; - --toolbar-height: -30px; - --menubar-height: -54px; + --toolbar-height: -10px; + --menubar-height: -34px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From aa5b0d5a0ddeca0c67264662ab8144e258586da9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:36:58 +0200 Subject: [PATCH 1729/2308] Pretty close now --- home-manager/package-configs/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 9fafa01..67f0807 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,8 +49,8 @@ :root { --sidebar-width: 50px; - --toolbar-height: -10px; - --menubar-height: -34px; + --toolbar-height: -12px; + --menubar-height: -24px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From 62eda3b33a39edf2d829e68604a50950a63463dc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:38:04 +0200 Subject: [PATCH 1730/2308] Try again --- home-manager/package-configs/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 67f0807..083c26a 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,8 +49,8 @@ :root { --sidebar-width: 50px; - --toolbar-height: -12px; - --menubar-height: -24px; + --toolbar-height: -9px; + --menubar-height: -18px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From b107787c63f5d00a4540d551c5396f6a569c8fb7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:39:05 +0200 Subject: [PATCH 1731/2308] Not sure which way it needs to go --- home-manager/package-configs/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 083c26a..da2df53 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,8 +49,8 @@ :root { --sidebar-width: 50px; - --toolbar-height: -9px; - --menubar-height: -18px; + --toolbar-height: -18px; + --menubar-height: -22px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From f94614d47f583c741dafd10b93bf876be381b87c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:40:03 +0200 Subject: [PATCH 1732/2308] And again --- home-manager/package-configs/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index da2df53..2dcd805 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,8 +49,8 @@ :root { --sidebar-width: 50px; - --toolbar-height: -18px; - --menubar-height: -22px; + --toolbar-height: -30px; + --menubar-height: -42px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From 1840be2a234cfc2f1b71c1cafcaf15ef69bdf9dc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:41:10 +0200 Subject: [PATCH 1733/2308] One is perfect, now this one --- home-manager/package-configs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 2dcd805..4cce3b6 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,7 +49,7 @@ :root { --sidebar-width: 50px; - --toolbar-height: -30px; + --toolbar-height: -28px; --menubar-height: -42px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From b5f45d6632300079b622a7995527d6e490daaa22 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:42:01 +0200 Subject: [PATCH 1734/2308] Tad more --- home-manager/package-configs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 4cce3b6..9bbf14c 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,7 +49,7 @@ :root { --sidebar-width: 50px; - --toolbar-height: -28px; + --toolbar-height: -26px; --menubar-height: -42px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From 7f84e7c1165d0d1403aa18092fc2ddd0c2f54e3b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:42:50 +0200 Subject: [PATCH 1735/2308] Tiny bit more --- home-manager/package-configs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 9bbf14c..291bee8 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,7 +49,7 @@ :root { --sidebar-width: 50px; - --toolbar-height: -26px; + --toolbar-height: -24px; --menubar-height: -42px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From 25030da53a6651622a4075af4be8a23fd40c35ba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:43:39 +0200 Subject: [PATCH 1736/2308] 4 more pixels --- home-manager/package-configs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 291bee8..0f8a9a3 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,7 +49,7 @@ :root { --sidebar-width: 50px; - --toolbar-height: -24px; + --toolbar-height: -20px; --menubar-height: -42px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From 61fc96fbd18249b7ea907c945627d8eb6630f5b7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:44:29 +0200 Subject: [PATCH 1737/2308] 4 more --- home-manager/package-configs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 0f8a9a3..d02cdad 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,7 +49,7 @@ :root { --sidebar-width: 50px; - --toolbar-height: -20px; + --toolbar-height: -16px; --menubar-height: -42px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From 056b9799ad9a9ef2cb9c7d0f3ea53ddaa3ea7586 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:45:23 +0200 Subject: [PATCH 1738/2308] This might never work but last shot --- home-manager/package-configs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index d02cdad..89e15fc 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -49,7 +49,7 @@ :root { --sidebar-width: 50px; - --toolbar-height: -16px; + --toolbar-height: -12px; --menubar-height: -42px; --sidebar-padding: calc(var(--sidebar-width) + 5px); --toolbar-start-end-padding: 5px !important; From d899abddc735776b2d71861138cbf10f9788477a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:48:25 +0200 Subject: [PATCH 1739/2308] Install sideberry --- nixos/desktop/package-configs/firefox/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 05fba9a..6bc5aa1 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -44,6 +44,11 @@ }; ExtensionSettings = { # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below + # Sideberry: + "{3c078156-979c-498b-8990-85f7987dd929}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/sideberry/latest.xpi"; + installation_mode = "force_installed"; + }; # Privacy Badger: "jid1-MnnxcxisBPnSXQ@jetpack" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi"; From e0f5a6fb26e26b1a20cfa90cf084a41ccb7dbf25 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 22:52:20 +0200 Subject: [PATCH 1740/2308] Ah sidebery has one r --- nixos/desktop/package-configs/firefox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 6bc5aa1..e16de37 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -46,7 +46,7 @@ # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below # Sideberry: "{3c078156-979c-498b-8990-85f7987dd929}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/sideberry/latest.xpi"; + install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"; installation_mode = "force_installed"; }; # Privacy Badger: From 280e2fc214bd1fe6627cfebb3d408b2a431833af Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Apr 2024 23:03:15 +0200 Subject: [PATCH 1741/2308] Search engine stuff doesn't seem to work with policies, let's see what config can do --- home-manager/package-configs/firefox.nix | 1 + .../desktop/package-configs/firefox/default.nix | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 89e15fc..2364ce5 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -25,6 +25,7 @@ "browser.urlbar.placeholderName" = "DuckDuckGo"; "browser.urlbar.placeholderName.private" = "DuckDuckGo"; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "DuckDuckGo"; }; userChrome = '' /* diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index e16de37..aceea80 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -21,22 +21,6 @@ OfferToSaveLogins = false; PasswordManagerEnabled = false; DownloadDirectory = "\${home}/Downloads"; - SearchEngines = { - # Add = [ - # { - # Name = "DuckDuckGo"; - # URLTemplate = "https://www.duckduckgo.org/?t=h_&q{searchTerms}&ia=web"; - # Method = "GET | POST"; - # IconURL = "https://www.duckduckgo.org/favicon.ico"; - # Alias = "duckduckgo"; - # Description = "DuckDuckGo Privacy Search Engine"; - # PostData = "name=value&q={searchTerms}"; - # SuggestURLTemplate = "https://www.duckduckgo.org/suggestions/q={searchTerms}"; - # } - # ]; - Default = "DuckDuckGo"; - Remove = ["Google" "Amazon" "eBay"]; - }; EnableTrackingProtection = { Value = true; Cryptomining = true; From 01c9323f4db169b35ccb7e0146c3e5c1672fc030 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Apr 2024 00:21:54 +0200 Subject: [PATCH 1742/2308] Phanpy is being weird with default instance --- pkgs/phanpy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index 07a426e..aa009b3 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -20,7 +20,6 @@ buildNpmPackage rec { npmPackFlags = ["--ignore-scripts"]; installPhase = '' - export PHANPY_DEFAULT_INSTANCE="social.gladtherescake.eu" export PHANPY_CLIENT_NAME="Phanpy on gladtherescake.eu" export PHANPY_WEBSITE="phanpy.gladtherescake.eu" mkdir $out From 4287233b49e199bbf4ed8781851bd0059c951952 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Apr 2024 00:23:03 +0200 Subject: [PATCH 1743/2308] Update phanpy, hash commits after this --- pkgs/phanpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index aa009b3..31ddbe5 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -5,7 +5,7 @@ }: buildNpmPackage rec { pname = "phanpy"; - version = "2024.04.04.65d51b0"; + version = "2024.04.19.5145730"; src = fetchFromGitHub { owner = "cheeaun"; From 8a001b18e93e4b245660e9d3f9c33f5eb20fa898 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Apr 2024 00:25:34 +0200 Subject: [PATCH 1744/2308] Update hash 1 --- pkgs/phanpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index 31ddbe5..911876d 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { owner = "cheeaun"; repo = pname; rev = "${version}"; - hash = "sha256-sp7ihOgPYpP78M+IQ/QNjne0nw+PdcYJdEJ1m/ozZkE="; + hash = "sha256-+/VtvDYBRy5Y6ZmqNH3id4hph1p3323G2zeE1bqfT1Y="; }; npmDepsHash = "sha256-I4rZuk0Hn5R6rMu/QZvSuaGrCtG8Z61R7gjbhLnje2E="; From 12204f9b50820865d032338055075530d3f6618b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Apr 2024 00:26:49 +0200 Subject: [PATCH 1745/2308] Update hash 2 --- pkgs/phanpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/phanpy/default.nix b/pkgs/phanpy/default.nix index 911876d..7d02853 100644 --- a/pkgs/phanpy/default.nix +++ b/pkgs/phanpy/default.nix @@ -14,7 +14,7 @@ buildNpmPackage rec { hash = "sha256-+/VtvDYBRy5Y6ZmqNH3id4hph1p3323G2zeE1bqfT1Y="; }; - npmDepsHash = "sha256-I4rZuk0Hn5R6rMu/QZvSuaGrCtG8Z61R7gjbhLnje2E="; + npmDepsHash = "sha256-9tcZ3jQg+mHeI2K/dNFs0C1k7CfHwxbx+/+I8pdO/wQ="; # The prepack script runs the build script, which we'd rather do in the build phase. npmPackFlags = ["--ignore-scripts"]; From 8460d2ee9463b9adff166992d622ca8db516c3d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Apr 2024 14:38:22 +0200 Subject: [PATCH 1746/2308] update flake lock --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 7dbe6d1..d458db7 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1713406758, - "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", + "lastModified": 1713749408, + "narHash": "sha256-9hFaSpgx+rZgGVLsjWdT+QUGyZplUyGdK45IoWEx1GM=", "owner": "nix-community", "repo": "disko", - "rev": "1efd500e9805a9efbce401ed5999006d397b9f11", + "rev": "b8785a1c37f6176b6bc3d2939df329ab3a8f226c", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1713566308, - "narHash": "sha256-7Y91t8pheIzjJveUMAPyeh5NOq5F49Nq4Hl2532QpJs=", + "lastModified": 1713732794, + "narHash": "sha256-AYCofb8Zu4Mbc1lHDtju/uxeARawRijmOueAqEMEfMU=", "owner": "nix-community", "repo": "home-manager", - "rev": "057117a401a34259c9615ce62218aea7afdee4d3", + "rev": "670d9ecc3e46a6e3265c203c2d136031a3d3548e", "type": "github" }, "original": { @@ -375,11 +375,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1713606448, - "narHash": "sha256-JMKo6uoAcUip9N10a3r1T2IoLz+pUStwIFrsVW/R4MA=", + "lastModified": 1713763883, + "narHash": "sha256-/3aEYe0LEoUy5/1cs9EhcFhT4r8RnbHBziuI40vmK6E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "96cbbcd3712a0cb7f128c54b21ec2af0950d88d0", + "rev": "9bb2ac68cab837aa063b8da40991cecc37de75a1", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1712537332, - "narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=", + "lastModified": 1713783234, + "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d942db8df8ee860556a38754f15b8d03bf7e6933", + "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", "type": "github" }, "original": { @@ -571,11 +571,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1713434076, - "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=", + "lastModified": 1713638189, + "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c", + "rev": "74574c38577914733b4f7a775dd77d24245081dd", "type": "github" }, "original": { @@ -587,11 +587,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -635,11 +635,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -666,11 +666,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1713284584, - "narHash": "sha256-rRuPBJD9+yjz7tY3xC/BvFUwloutynR9piiVE6fhGqo=", + "lastModified": 1713596654, + "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b6ee326ad047870526d9a3ae88dfd0197da898d", + "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", "type": "github" }, "original": { @@ -716,11 +716,11 @@ ] }, "locked": { - "lastModified": 1713552700, - "narHash": "sha256-R2+GRjHFEapDa08FnuJjweAiE+5W7VKnBxNo3tC/Yzo=", + "lastModified": 1713769737, + "narHash": "sha256-iwMCrqpu61nyBuZkD+Y4c4AlJ/MY1SFTaLSNnguj1Cw=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bd743369ef402d269885225af93064f22b640990", + "rev": "76468d5e5b28304172a0dbc825a89b5b6aea1a81", "type": "github" }, "original": { @@ -849,11 +849,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1713532771, - "narHash": "sha256-vfKxhYVMzG2tg48/1rewBoSLCrKIjQsG1j7Nm/Y2gf4=", + "lastModified": 1713775152, + "narHash": "sha256-xyP8h9jLQ0AmyPy40sIwL7/D03oVpXG9YHoYJ4ecYWA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a929a011a09db735abc45a8a45d1ff7fdee62755", + "rev": "4371a1301c4d36cc791069d90ae522613a3a335e", "type": "github" }, "original": { From 4436d8df59d35bb94a464f430379cbf29364ba05 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Apr 2024 14:50:33 +0200 Subject: [PATCH 1747/2308] Have shodan import firefox settings --- home-manager/hosts/shodan/lillian.nix | 1 + nixos/hosts/shodan/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index dfac6d2..f4a1e4f 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../package-configs/zsh.nix + ../../package-configs/firefox.nix ../../desktop/plasma-desktop ]; nixpkgs = { diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 53cd124..ff41d04 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -17,6 +17,7 @@ # Import the shared settings ../../shared + ../../desktop/package-configs/firefox # You can also split up your configuration and import pieces of it here: # ./nvim.nix From fd3e121d2ad77871419949d2ece869900baf2e41 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 22 Apr 2024 21:24:30 +0200 Subject: [PATCH 1748/2308] Some more firefox editing, removing some google, bing, ebay and amazon stuff --- home-manager/package-configs/firefox.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 2364ce5..8145022 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -21,9 +21,10 @@ "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; "browser.pageActions.persistedActions" = ''{"ids":["bookmark","_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si"],"idsInUrlbar":["_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si","bookmark"],"idsInUrlbarPreProton":[],"version":1}''; "browser.search.region" = "NL"; - "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button","firefoxpwa_filips_si-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; + "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["jid1-mnnxcxisbpnsxq_jetpack-browser-action","firefoxpwa_filips_si-browser-action","ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; "browser.urlbar.placeholderName" = "DuckDuckGo"; "browser.urlbar.placeholderName.private" = "DuckDuckGo"; + "extensions.webextensions.uuid" = ''{"formautofill@mozilla.org":"ea6a95e0-ef85-453b-afdf-44e57e4ca32c","pictureinpicture@mozilla.org":"41fcca40-5f8a-4182-ace9-e1ff2e6fc210","screenshots@mozilla.org":"8c2c3f97-17a1-4240-b640-c9707e3b917e","webcompat-reporter@mozilla.org":"d2c1a84b-03ff-47c6-92be-a623026b79d9","webcompat@mozilla.org":"bb5b827a-1ad3-40d0-8c16-c7d6db11a62b","default-theme@mozilla.org":"83700f73-6c25-4599-9393-3e071be81fe6","wayback_machine@mozilla.org":"ef76899f-67d6-4ffb-973f-0c198a8369e4","uBlock0@raymondhill.net":"24e7b891-a28c-4555-b072-0ee184115cb4","DontFuckWithPaste@raim.ist":"6dbb9616-e8c9-40ff-a729-01dcd6fe09b4","uBO-Scope@raymondhill.net":"6afd83ed-7f93-41ad-960c-28c5ec5ac9bd","gdpr@cavi.au.dk":"4577a4f9-84e4-400c-a995-9b13640f3620","addon@simplelogin":"e492ff49-9c0e-4c42-ab28-465563e953b9","addons-search-detection@mozilla.com":"63a9d1fb-3c16-4b40-bd69-de186c138c5e","plasma-browser-integration@kde.org":"e655920d-846c-4a72-918e-86ebb25362a6","firefoxpwa@filips.si":"3ce26b62-9349-47cc-beaa-584b0c737979","addon@darkreader.org":"510c480d-7737-47ad-91a0-5b8e8f3745c3","shinigamieyes@shinigamieyes":"8f3b1099-f3b1-4468-915d-60fbfbfda8ce","7esoorv3@alefvanoon.anonaddy.me":"947c1016-2e39-48cd-ae1a-c301a6531d2a","CookieAutoDelete@kennydo.com":"28ccdbbd-d179-472a-8658-ae97d228f958","jid1-MnnxcxisBPnSXQ@jetpack":"f361e1b5-74bf-4073-ae95-245429a12cad","jid1-AQqSMBYb0a8ADg@jetpack":"8f3e6fd5-f009-4d2e-b501-0ec6b18dcf9e","wikipedia@search.mozilla.org":"c615bbc5-9fa2-48ae-a78d-7e5546c1a94e","ddg@search.mozilla.org":"4f7e3183-d053-40f6-b7b2-8f405f033281","{446900e4-71c2-419f-a6a7-df9c091e268b}":"bccbf892-7089-4d89-b886-a667e6fd9a03","{3c078156-979c-498b-8990-85f7987dd929}":"f3f046fa-c1b9-415d-b79b-236109b3926b"}''; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "DuckDuckGo"; }; From 0c15e86846872f1be09d4a22538bd8980d296eee Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Apr 2024 11:32:18 +0200 Subject: [PATCH 1749/2308] Add nix index database --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 9 +++++++++ 2 files changed, 30 insertions(+) diff --git a/flake.lock b/flake.lock index d458db7..91d5bcb 100644 --- a/flake.lock +++ b/flake.lock @@ -469,6 +469,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1713668931, + "narHash": "sha256-rVlwWQlgFGGK3aPVcKmtYqWgjYnPah5FOIsYAqrMN2w=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "07ece11b22217b8459df589f858e92212b74f1a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1712450863, @@ -769,6 +789,7 @@ "jovian": "jovian", "lanzaboote": "lanzaboote", "linger": "linger", + "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", diff --git a/flake.nix b/flake.nix index 0e95bd7..8d22f0f 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # Nix index database files + nix-index-database.url = "github:nix-community/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + # Secret management with sops sops-nix.url = "github:Mic92/sops-nix"; @@ -85,6 +89,7 @@ lanzaboote, jovian, nixos-hardware, + nix-index-database, conduit, ... } @ inputs: let @@ -133,6 +138,7 @@ lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko home-manager.nixosModules.home-manager + nix-index-database.nixosModules.nix-index { home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; } @@ -149,6 +155,7 @@ lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko home-manager.nixosModules.home-manager + nix-index-database.nixosModules.nix-index { home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; } @@ -193,6 +200,7 @@ ./nixos/hosts/iso/configuration.nix sops-nix.nixosModules.sops home-manager.nixosModules.home-manager + nix-index-database.nixosModules.nix-index { home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; } @@ -203,6 +211,7 @@ system = "armv7l-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + nix-index-database.nixosModules.nix-index # make the module declared by the linger flake available to our config #linger.nixosModules."armv7l-linux".default #pihole.nixosModules."armv7l-linux".default From 95d129f1a393f7efaaf99bd9ac9b2db5c73e0008 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Apr 2024 11:38:14 +0200 Subject: [PATCH 1750/2308] Enable comma in desktop --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index b8decf9..a62a6f1 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -29,6 +29,7 @@ # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently programs.command-not-found.enable = false; programs.nix-index.enable = true; + programs.nix-index-database.comma.enable = true; environment.systemPackages = with pkgs; [ # Custom tools From 9c6007bea8a3d1df598e107332115838abfb1c7c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Apr 2024 11:44:47 +0200 Subject: [PATCH 1751/2308] It said this is incompatible with zsh, need to force command-not-found to false --- flake.nix | 1 - nixos/desktop/default.nix | 2 +- nixos/hosts/iso/configuration.nix | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 8d22f0f..ce30709 100644 --- a/flake.nix +++ b/flake.nix @@ -211,7 +211,6 @@ system = "armv7l-linux"; specialArgs = {inherit inputs outputs;}; modules = [ - nix-index-database.nixosModules.nix-index # make the module declared by the linger flake available to our config #linger.nixosModules."armv7l-linux".default #pihole.nixosModules."armv7l-linux".default diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index a62a6f1..2baa9c0 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -27,7 +27,7 @@ }; # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently - programs.command-not-found.enable = false; + programs.command-not-found.enable = lib.mkForce false; programs.nix-index.enable = true; programs.nix-index-database.comma.enable = true; diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index f8efbdb..2585dc7 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -19,6 +19,10 @@ ../../shared ]; + programs.command-not-found.enable = lib.mkForce false; + programs.nix-index.enable = true; + programs.nix-index-database.comma.enable = true; + boot.tmp.cleanOnBoot = true; zramSwap.enable = false; networking.domain = ""; From 9581fc5052b816840bee3872b77de2731abbdb11 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Apr 2024 14:06:52 +0200 Subject: [PATCH 1752/2308] Try and change density --- home-manager/package-configs/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index 8145022..ff37f3b 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -22,6 +22,7 @@ "browser.pageActions.persistedActions" = ''{"ids":["bookmark","_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si"],"idsInUrlbar":["_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si","bookmark"],"idsInUrlbarPreProton":[],"version":1}''; "browser.search.region" = "NL"; "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["jid1-mnnxcxisbpnsxq_jetpack-browser-action","firefoxpwa_filips_si-browser-action","ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; + "browser.uidensity" = 2; "browser.urlbar.placeholderName" = "DuckDuckGo"; "browser.urlbar.placeholderName.private" = "DuckDuckGo"; "extensions.webextensions.uuid" = ''{"formautofill@mozilla.org":"ea6a95e0-ef85-453b-afdf-44e57e4ca32c","pictureinpicture@mozilla.org":"41fcca40-5f8a-4182-ace9-e1ff2e6fc210","screenshots@mozilla.org":"8c2c3f97-17a1-4240-b640-c9707e3b917e","webcompat-reporter@mozilla.org":"d2c1a84b-03ff-47c6-92be-a623026b79d9","webcompat@mozilla.org":"bb5b827a-1ad3-40d0-8c16-c7d6db11a62b","default-theme@mozilla.org":"83700f73-6c25-4599-9393-3e071be81fe6","wayback_machine@mozilla.org":"ef76899f-67d6-4ffb-973f-0c198a8369e4","uBlock0@raymondhill.net":"24e7b891-a28c-4555-b072-0ee184115cb4","DontFuckWithPaste@raim.ist":"6dbb9616-e8c9-40ff-a729-01dcd6fe09b4","uBO-Scope@raymondhill.net":"6afd83ed-7f93-41ad-960c-28c5ec5ac9bd","gdpr@cavi.au.dk":"4577a4f9-84e4-400c-a995-9b13640f3620","addon@simplelogin":"e492ff49-9c0e-4c42-ab28-465563e953b9","addons-search-detection@mozilla.com":"63a9d1fb-3c16-4b40-bd69-de186c138c5e","plasma-browser-integration@kde.org":"e655920d-846c-4a72-918e-86ebb25362a6","firefoxpwa@filips.si":"3ce26b62-9349-47cc-beaa-584b0c737979","addon@darkreader.org":"510c480d-7737-47ad-91a0-5b8e8f3745c3","shinigamieyes@shinigamieyes":"8f3b1099-f3b1-4468-915d-60fbfbfda8ce","7esoorv3@alefvanoon.anonaddy.me":"947c1016-2e39-48cd-ae1a-c301a6531d2a","CookieAutoDelete@kennydo.com":"28ccdbbd-d179-472a-8658-ae97d228f958","jid1-MnnxcxisBPnSXQ@jetpack":"f361e1b5-74bf-4073-ae95-245429a12cad","jid1-AQqSMBYb0a8ADg@jetpack":"8f3e6fd5-f009-4d2e-b501-0ec6b18dcf9e","wikipedia@search.mozilla.org":"c615bbc5-9fa2-48ae-a78d-7e5546c1a94e","ddg@search.mozilla.org":"4f7e3183-d053-40f6-b7b2-8f405f033281","{446900e4-71c2-419f-a6a7-df9c091e268b}":"bccbf892-7089-4d89-b886-a667e6fd9a03","{3c078156-979c-498b-8990-85f7987dd929}":"f3f046fa-c1b9-415d-b79b-236109b3926b"}''; From db75412fd989088c7c88a641d993824df5722c29 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Apr 2024 14:08:15 +0200 Subject: [PATCH 1753/2308] Let's try undoing this and setting the UI --- home-manager/package-configs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index ff37f3b..a07363f 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -21,7 +21,7 @@ "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; "browser.pageActions.persistedActions" = ''{"ids":["bookmark","_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si"],"idsInUrlbar":["_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si","bookmark"],"idsInUrlbarPreProton":[],"version":1}''; "browser.search.region" = "NL"; - "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["jid1-mnnxcxisbpnsxq_jetpack-browser-action","firefoxpwa_filips_si-browser-action","ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; + # "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["jid1-mnnxcxisbpnsxq_jetpack-browser-action","firefoxpwa_filips_si-browser-action","ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; "browser.uidensity" = 2; "browser.urlbar.placeholderName" = "DuckDuckGo"; "browser.urlbar.placeholderName.private" = "DuckDuckGo"; From 6ead075c5fb0f7ea470dc0c8bed936b724e3b862 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Apr 2024 14:10:06 +0200 Subject: [PATCH 1754/2308] Ah it was something aada did --- home-manager/package-configs/firefox.nix | 3 +-- nixos/desktop/package-configs/firefox/default.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/home-manager/package-configs/firefox.nix b/home-manager/package-configs/firefox.nix index a07363f..8145022 100644 --- a/home-manager/package-configs/firefox.nix +++ b/home-manager/package-configs/firefox.nix @@ -21,8 +21,7 @@ "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; "browser.pageActions.persistedActions" = ''{"ids":["bookmark","_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si"],"idsInUrlbar":["_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si","bookmark"],"idsInUrlbarPreProton":[],"version":1}''; "browser.search.region" = "NL"; - # "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["jid1-mnnxcxisbpnsxq_jetpack-browser-action","firefoxpwa_filips_si-browser-action","ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; - "browser.uidensity" = 2; + "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["jid1-mnnxcxisbpnsxq_jetpack-browser-action","firefoxpwa_filips_si-browser-action","ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}''; "browser.urlbar.placeholderName" = "DuckDuckGo"; "browser.urlbar.placeholderName.private" = "DuckDuckGo"; "extensions.webextensions.uuid" = ''{"formautofill@mozilla.org":"ea6a95e0-ef85-453b-afdf-44e57e4ca32c","pictureinpicture@mozilla.org":"41fcca40-5f8a-4182-ace9-e1ff2e6fc210","screenshots@mozilla.org":"8c2c3f97-17a1-4240-b640-c9707e3b917e","webcompat-reporter@mozilla.org":"d2c1a84b-03ff-47c6-92be-a623026b79d9","webcompat@mozilla.org":"bb5b827a-1ad3-40d0-8c16-c7d6db11a62b","default-theme@mozilla.org":"83700f73-6c25-4599-9393-3e071be81fe6","wayback_machine@mozilla.org":"ef76899f-67d6-4ffb-973f-0c198a8369e4","uBlock0@raymondhill.net":"24e7b891-a28c-4555-b072-0ee184115cb4","DontFuckWithPaste@raim.ist":"6dbb9616-e8c9-40ff-a729-01dcd6fe09b4","uBO-Scope@raymondhill.net":"6afd83ed-7f93-41ad-960c-28c5ec5ac9bd","gdpr@cavi.au.dk":"4577a4f9-84e4-400c-a995-9b13640f3620","addon@simplelogin":"e492ff49-9c0e-4c42-ab28-465563e953b9","addons-search-detection@mozilla.com":"63a9d1fb-3c16-4b40-bd69-de186c138c5e","plasma-browser-integration@kde.org":"e655920d-846c-4a72-918e-86ebb25362a6","firefoxpwa@filips.si":"3ce26b62-9349-47cc-beaa-584b0c737979","addon@darkreader.org":"510c480d-7737-47ad-91a0-5b8e8f3745c3","shinigamieyes@shinigamieyes":"8f3b1099-f3b1-4468-915d-60fbfbfda8ce","7esoorv3@alefvanoon.anonaddy.me":"947c1016-2e39-48cd-ae1a-c301a6531d2a","CookieAutoDelete@kennydo.com":"28ccdbbd-d179-472a-8658-ae97d228f958","jid1-MnnxcxisBPnSXQ@jetpack":"f361e1b5-74bf-4073-ae95-245429a12cad","jid1-AQqSMBYb0a8ADg@jetpack":"8f3e6fd5-f009-4d2e-b501-0ec6b18dcf9e","wikipedia@search.mozilla.org":"c615bbc5-9fa2-48ae-a78d-7e5546c1a94e","ddg@search.mozilla.org":"4f7e3183-d053-40f6-b7b2-8f405f033281","{446900e4-71c2-419f-a6a7-df9c091e268b}":"bccbf892-7089-4d89-b886-a667e6fd9a03","{3c078156-979c-498b-8990-85f7987dd929}":"f3f046fa-c1b9-415d-b79b-236109b3926b"}''; diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index aceea80..3375034 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -130,7 +130,7 @@ }; Preferences = { "browser.compactmode.show" = true; - "browser.uidensity" = 1; + "browser.uidensity" = 2; # "browser.newtabpage.activity-stream.feeds.topsites" = false; # "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; "font.name.serif.x-western" = "Crimson"; From b3a4b71bcd8404e8622b157a1fa4a72d0a595b12 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Apr 2024 14:11:18 +0200 Subject: [PATCH 1755/2308] Normal density --- nixos/desktop/package-configs/firefox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 3375034..f857706 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -130,7 +130,7 @@ }; Preferences = { "browser.compactmode.show" = true; - "browser.uidensity" = 2; + "browser.uidensity" = 0; # "browser.newtabpage.activity-stream.feeds.topsites" = false; # "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; "font.name.serif.x-western" = "Crimson"; From 4f243d6b304b15e2caaf01b77cc89fa8235f684c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 25 Apr 2024 11:10:36 +0200 Subject: [PATCH 1756/2308] update flake lock --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 91d5bcb..57d39de 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1713749408, - "narHash": "sha256-9hFaSpgx+rZgGVLsjWdT+QUGyZplUyGdK45IoWEx1GM=", + "lastModified": 1714008123, + "narHash": "sha256-zpJNUuOcVL3Yi60VPvpNhs77uIK1D0Ri2eeHcfdz8yg=", "owner": "nix-community", "repo": "disko", - "rev": "b8785a1c37f6176b6bc3d2939df329ab3a8f226c", + "rev": "db1150487c7cde696cf5c4bbb599b37b885ca592", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1713732794, - "narHash": "sha256-AYCofb8Zu4Mbc1lHDtju/uxeARawRijmOueAqEMEfMU=", + "lastModified": 1713992342, + "narHash": "sha256-bW7K4WPo6jhYMo4ZUGoJfog6xJV0XZh8adXqZKunRoc=", "owner": "nix-community", "repo": "home-manager", - "rev": "670d9ecc3e46a6e3265c203c2d136031a3d3548e", + "rev": "2f072c127c041eec36621b8e38a531fe0fe07961", "type": "github" }, "original": { @@ -375,11 +375,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1713763883, - "narHash": "sha256-/3aEYe0LEoUy5/1cs9EhcFhT4r8RnbHBziuI40vmK6E=", + "lastModified": 1714022840, + "narHash": "sha256-i6xZsf7Kvp1n/Sn3nqPY1MJQx0gf80OGQw32PA/aZd8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9bb2ac68cab837aa063b8da40991cecc37de75a1", + "rev": "94def3af1d45fe4b142beda3aa59a6a98e62ce9e", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1713668931, - "narHash": "sha256-rVlwWQlgFGGK3aPVcKmtYqWgjYnPah5FOIsYAqrMN2w=", + "lastModified": 1713869268, + "narHash": "sha256-o3CMQeu/S8/4zU0pMtYg51rd1FWdJsI2Xohzng1Ysdg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "07ece11b22217b8459df589f858e92212b74f1a1", + "rev": "dcb6ac44922858ce3a5b46f77a36d6030181460c", "type": "github" }, "original": { @@ -527,11 +527,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713521961, - "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", + "lastModified": 1713864415, + "narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", + "rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc", "type": "github" }, "original": { @@ -607,11 +607,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1713895582, + "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "572af610f6151fd41c212f897c71f7056e3fb518", "type": "github" }, "original": { @@ -655,11 +655,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1713895582, + "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "572af610f6151fd41c212f897c71f7056e3fb518", "type": "github" }, "original": { @@ -736,11 +736,11 @@ ] }, "locked": { - "lastModified": 1713769737, - "narHash": "sha256-iwMCrqpu61nyBuZkD+Y4c4AlJ/MY1SFTaLSNnguj1Cw=", + "lastModified": 1713805120, + "narHash": "sha256-WmqVyblqQ3g2Bmm+WONc1OnUuOuULQRIQya9wCLp5o8=", "owner": "pjones", "repo": "plasma-manager", - "rev": "76468d5e5b28304172a0dbc825a89b5b6aea1a81", + "rev": "ffeef9dc96a5a0e442479c94a6000f93b69aeaac", "type": "github" }, "original": { @@ -870,11 +870,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1713775152, - "narHash": "sha256-xyP8h9jLQ0AmyPy40sIwL7/D03oVpXG9YHoYJ4ecYWA=", + "lastModified": 1713892811, + "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4371a1301c4d36cc791069d90ae522613a3a335e", + "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", "type": "github" }, "original": { From 77073bed6e9392b2ba28ab5f67b0095ca424a4b5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 25 Apr 2024 12:51:54 +0200 Subject: [PATCH 1757/2308] Ignore venv folder globally --- home-manager/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 0a3719f..afda684 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -144,6 +144,7 @@ "*.direnv" "*.vscode" ".envrc" + "venv" ]; }; From 37f25a346e5d05a26a0158a62676d18f69230dcc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 26 Apr 2024 09:45:22 +0200 Subject: [PATCH 1758/2308] update flake lock --- flake.lock | 93 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 57d39de..76b2287 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1707922053, - "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=", + "lastModified": 1711742460, + "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", "owner": "zhaofengli", "repo": "attic", - "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21", + "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", "type": "github" }, "original": { @@ -39,9 +39,26 @@ "type": "gitlab" } }, + "complement": { + "flake": false, + "locked": { + "lastModified": 1713458251, + "narHash": "sha256-hom/Lt0gZzLWqFhUJG0X2i88CAMIILInO5w0tPj6G3s=", + "owner": "matrix-org", + "repo": "complement", + "rev": "d73c81a091604b0fc5b6b0617dcac58c25763f57", + "type": "github" + }, + "original": { + "owner": "matrix-org", + "repo": "complement", + "type": "github" + } + }, "conduit": { "inputs": { "attic": "attic", + "complement": "complement", "crane": "crane_2", "fenix": "fenix", "flake-compat": "flake-compat_2", @@ -49,14 +66,15 @@ "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" - ] + ], + "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1713379868, - "narHash": "sha256-L/QhOkRmzB/gmwrWrqxct/sD6XIL4AOGguRhb4ahO/8=", + "lastModified": 1714111420, + "narHash": "sha256-ax+Z3K9y2N43C/+1gwyTbtXKHuWYY1NYN+tV5NcJ+zI=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "d0a9666a2976b983daf72eb0c0f8d41c04443f84", + "rev": "341bafb91e77cd95775d9cfa4f0810309889b176", "type": "github" }, "original": { @@ -95,17 +113,17 @@ ] }, "locked": { - "lastModified": 1707685877, - "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", + "lastModified": 1713738183, + "narHash": "sha256-qd/MuLm7OfKQKyd4FAMqV4H6zYyOfef5lLzRrmXwKJM=", "owner": "ipetkov", "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", + "rev": "f6c6a2fb1b8bd9b65d65ca9342dd0eb180a63f11", "type": "github" }, "original": { "owner": "ipetkov", + "ref": "master", "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", "type": "github" } }, @@ -137,11 +155,11 @@ ] }, "locked": { - "lastModified": 1714008123, - "narHash": "sha256-zpJNUuOcVL3Yi60VPvpNhs77uIK1D0Ri2eeHcfdz8yg=", + "lastModified": 1714103775, + "narHash": "sha256-kcBiIrmqzt3bNTr2GMBfAyA+on8BEKO1iKzzDFQZkjI=", "owner": "nix-community", "repo": "disko", - "rev": "db1150487c7cde696cf5c4bbb599b37b885ca592", + "rev": "285e26465a0bae510897ca04da26ce6307c652b4", "type": "github" }, "original": { @@ -159,11 +177,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1711606966, - "narHash": "sha256-nTaO7ZDL4D02dVC5ktqnXNiNuODBUHyE4qEcFjAUCQY=", + "lastModified": 1713680591, + "narHash": "sha256-3pbv7UgAgetwz9YdjzIT/lZ6Rgj6wj6MR4mphBLyDjU=", "owner": "nix-community", "repo": "fenix", - "rev": "aa45c3e901ea42d6633af083c0c555efaf948b17", + "rev": "19aaa94a73cc670a4d87e84f0909966cd8f8cd79", "type": "github" }, "original": { @@ -355,11 +373,11 @@ ] }, "locked": { - "lastModified": 1713992342, - "narHash": "sha256-bW7K4WPo6jhYMo4ZUGoJfog6xJV0XZh8adXqZKunRoc=", + "lastModified": 1714042918, + "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f072c127c041eec36621b8e38a531fe0fe07961", + "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db", "type": "github" }, "original": { @@ -543,11 +561,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "type": "github" }, "original": { @@ -559,11 +577,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702780907, - "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", "type": "github" }, "original": { @@ -780,6 +798,23 @@ "type": "github" } }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1713810944, + "narHash": "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc=", + "owner": "facebook", + "repo": "rocksdb", + "rev": "6f7cabeac80a3a6150be2c8a8369fcecb107bf43", + "type": "github" + }, + "original": { + "owner": "facebook", + "ref": "v9.1.1", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { "conduit": "conduit", @@ -803,11 +838,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1711562745, - "narHash": "sha256-s/YOyBM0vumhkqCFi8CnV5imFlC5JJrGia8CmEXyQkM=", + "lastModified": 1713628977, + "narHash": "sha256-iN5QUlUq527lswmBC+RopfXdu6Xx7mmTaBSH2l59FtM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ad51a17c627b4ca57f83f0dc1f3bb5f3f17e6d0b", + "rev": "55d9a533b309119c8acd13061581b43ae8840823", "type": "github" }, "original": { From 06442942aaea41402461fd94b6c7c9c77c9081f6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 26 Apr 2024 22:59:34 +0200 Subject: [PATCH 1759/2308] Some initial catppucin theming :) --- flake.lock | 16 +++++++++++ flake.nix | 40 +++++++++++++++++++++++++--- home-manager/package-configs/zsh.nix | 1 + nixos/shared/default.nix | 5 ++++ 4 files changed, 58 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 76b2287..019bd04 100644 --- a/flake.lock +++ b/flake.lock @@ -39,6 +39,21 @@ "type": "gitlab" } }, + "catppuccin": { + "locked": { + "lastModified": 1713895615, + "narHash": "sha256-SVkxhcL0/IN5fNI2dqr702wXOnzktsm0LCEVGRAJQcY=", + "owner": "catppuccin", + "repo": "nix", + "rev": "a48e70a31616cb63e4794fd3465bff1835cc4246", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "complement": { "flake": false, "locked": { @@ -817,6 +832,7 @@ }, "root": { "inputs": { + "catppuccin": "catppuccin", "conduit": "conduit", "disko": "disko", "flake-utils": "flake-utils_3", diff --git a/flake.nix b/flake.nix index ce30709..e183a9f 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # catpuccin theme + catppuccin.url = "github:catppuccin/nix"; + # Conduit fork without all the fuss and drama conduit = { url = "github:girlbossceo/conduwuit"; @@ -79,6 +82,7 @@ self, nixpkgs, nixos-generators, + catppuccin, disko, home-manager, sops-nix, @@ -139,8 +143,12 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin { - home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + inputs.plasma-manager.homeManagerModules.plasma-manager + ]; } ]; }; @@ -156,8 +164,12 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin { - home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + inputs.plasma-manager.homeManagerModules.plasma-manager + ]; } ]; }; @@ -171,6 +183,12 @@ sops-nix.nixosModules.sops disko.nixosModules.disko simple-nixos-mailserver.nixosModule + catppuccin.nixosModules.catppuccin + { + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + ]; + } ]; }; @@ -185,8 +203,12 @@ disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager + catppuccin.nixosModules.catppuccin { - home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; + home-manager.sharedModules = [ + inputs.plasma-manager.homeManagerModules.plasma-manager + inputs.catppuccin.homeManagerModules.catppuccin + ]; } ]; }; @@ -201,8 +223,12 @@ sops-nix.nixosModules.sops home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin { - home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; + home-manager.sharedModules = [ + inputs.plasma-manager.homeManagerModules.plasma-manager + inputs.catppuccin.homeManagerModules.catppuccin + ]; } ]; }; @@ -211,6 +237,7 @@ system = "armv7l-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + catppuccin.nixosModules.catppuccin # make the module declared by the linger flake available to our config #linger.nixosModules."armv7l-linux".default #pihole.nixosModules."armv7l-linux".default @@ -218,6 +245,11 @@ # > Our main nixos configuration file < ./nixos/hosts/wheatley/configuration.nix sops-nix.nixosModules.sops + { + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + ]; + } ]; }; }; diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix index f7346cd..f5fde16 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/package-configs/zsh.nix @@ -9,6 +9,7 @@ # Enable starship programs.starship = { enable = true; + catppuccin.enable = true; }; programs.zoxide = { diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 55493b2..43711d2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -36,6 +36,11 @@ }; }; + catppuccin.flavour = "macchiato"; + catppuccin.enable = true; + + console.catppuccin.enable = true; + users.users.lillian = { isNormalUser = true; extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; From 7c94cd1656bc060b655b5498ee3fc65bd56ca350 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 26 Apr 2024 23:10:38 +0200 Subject: [PATCH 1760/2308] And a few more :3 --- home-manager/desktop/default.nix | 11 +++++++++-- home-manager/hosts/shodan/lillian.nix | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index afda684..dfb4f50 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -87,9 +87,14 @@ qbittorrent zsh + # Theming: + catppuccin-cursors + catppuccin-kde + catppuccin-sddm-corners + # Web browsing: firefoxpwa - (librewolf.override {nativeMessagingHosts = [pkgs.firefoxpwa];}) + (firefox.override {nativeMessagingHosts = [pkgs.firefoxpwa];}) ungoogled-chromium ]; @@ -99,8 +104,10 @@ extensions = with pkgs.vscode-extensions; [ #arrterian.nix-env-selector #ban.spellright + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons charliermarsh.ruff - dracula-theme.theme-dracula + # dracula-theme.theme-dracula eamodio.gitlens github.vscode-pull-request-github jnoortheen.nix-ide diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index f4a1e4f..65350f7 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -74,6 +74,12 @@ qbittorrent zsh + # Theming: + catppuccin-cursors + catppuccin-kde + catppuccin-plymouth + catppuccin-sddm-corners + # Web browsing: librewolf ungoogled-chromium From 236c3c4aa0b924b5a45782292cacaea4e32d8b36 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 26 Apr 2024 23:11:46 +0200 Subject: [PATCH 1761/2308] Remove this redundant firefox --- home-manager/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index dfb4f50..92e4d26 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -94,7 +94,6 @@ # Web browsing: firefoxpwa - (firefox.override {nativeMessagingHosts = [pkgs.firefoxpwa];}) ungoogled-chromium ]; From 0dbcf7bc6049eba96ae0ef190347b5a47c6665e8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 26 Apr 2024 23:31:02 +0200 Subject: [PATCH 1762/2308] Let's see if I can do an overlay to change the kde theme? --- overlays/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/overlays/default.nix b/overlays/default.nix index 267ba4c..9cece08 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -7,6 +7,10 @@ # steam = prev.steam.override { # extraProfile = ''export LD_PRELOAD=${inputs.extest}/lib/libextest.so:$LD_PRELOAD''; # }; + catppuccin-kde = prev.catppuccin-kde.prev.steam.override { + flavour = ["macchiato"]; + accents = ["lavender"]; + }; }; # This one brings our custom packages from the 'pkgs' directory From ff66125d9593eb4c4038b35b7867e799b11b7af6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 00:21:50 +0200 Subject: [PATCH 1763/2308] Automatically install the catppuccin theme to firefox --- nixos/desktop/package-configs/firefox/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index f857706..5065913 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -28,6 +28,11 @@ }; ExtensionSettings = { # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below + # Catppuccin Macchiato - Lavender theme: + "{15cb5e64-94bd-41aa-91cf-751bb1a84972}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-lavender/latest.xpi"; + installation_mode = "force_installed"; + }; # Sideberry: "{3c078156-979c-498b-8990-85f7987dd929}" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"; From a5247bb60ce7e7d5e6cecaf1f5aa3556685f7240 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 13:52:50 +0200 Subject: [PATCH 1764/2308] Try and fix decky loader --- nixos/hosts/shodan/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index ff41d04..4277525 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -53,6 +53,7 @@ #System: btrfs-progs + decky-loader efitools jq noto-fonts @@ -104,6 +105,8 @@ jovian.decky-loader.enable = true; + jovian.decky-loader.user = "lillian"; + jovian.hardware.has.amd.gpu = true; programs.steam = lib.mkForce { From 12565e6ba528ce2a3c22c2516437918e7bbb5b4d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 13:57:24 +0200 Subject: [PATCH 1765/2308] Let's try to theme like this then --- home-manager/desktop/default.nix | 17 +++++++++++++++-- home-manager/hosts/shodan/lillian.nix | 5 ++++- overlays/default.nix | 4 ---- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 92e4d26..a1140a5 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -89,7 +89,10 @@ # Theming: catppuccin-cursors - catppuccin-kde + (catppuccin-kde.override { + flavour = "macchiato"; + accents = "lavender"; + }) catppuccin-sddm-corners # Web browsing: @@ -103,7 +106,17 @@ extensions = with pkgs.vscode-extensions; [ #arrterian.nix-env-selector #ban.spellright - catppuccin.catppuccin-vsc + (pkgs.catppuccin-vsc.override { + accent = "lavender"; + boldKeywords = true; + italicComments = true; + italicKeywords = true; + extraBordersEnabled = false; + workbenchMode = "default"; + bracketMode = "rainbow"; + colorOverrides = {}; + customUIColors = {}; + }) catppuccin.catppuccin-vsc-icons charliermarsh.ruff # dracula-theme.theme-dracula diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 65350f7..8cb86a1 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -76,7 +76,10 @@ # Theming: catppuccin-cursors - catppuccin-kde + (catppuccin-kde.override { + flavour = "macchiato"; + accents = "lavender"; + }) catppuccin-plymouth catppuccin-sddm-corners diff --git a/overlays/default.nix b/overlays/default.nix index 9cece08..267ba4c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -7,10 +7,6 @@ # steam = prev.steam.override { # extraProfile = ''export LD_PRELOAD=${inputs.extest}/lib/libextest.so:$LD_PRELOAD''; # }; - catppuccin-kde = prev.catppuccin-kde.prev.steam.override { - flavour = ["macchiato"]; - accents = ["lavender"]; - }; }; # This one brings our custom packages from the 'pkgs' directory From 2f071a778455de8491e948e2a91271cefefd7653 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:00:02 +0200 Subject: [PATCH 1766/2308] Maybe without the pkgs --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index a1140a5..60ecb6a 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -106,7 +106,7 @@ extensions = with pkgs.vscode-extensions; [ #arrterian.nix-env-selector #ban.spellright - (pkgs.catppuccin-vsc.override { + (catppuccin-vsc.override { accent = "lavender"; boldKeywords = true; italicComments = true; From eca05b13847b9510847c56a4a0b9840976e85fca Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:00:02 +0200 Subject: [PATCH 1767/2308] Let's follow the example --- flake.nix | 3 +++ home-manager/desktop/default.nix | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e183a9f..3dfe70c 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,9 @@ # catpuccin theme catppuccin.url = "github:catppuccin/nix"; + # catpuccin flakehub for vscode + inputs.catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; + # Conduit fork without all the fuss and drama conduit = { url = "github:girlbossceo/conduwuit"; diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index a1140a5..b7cbd05 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -23,6 +23,7 @@ nixpkgs = { # You can add overlays here overlays = [ + inputs.catppuccin-vsc.overlays.default # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default @@ -106,7 +107,7 @@ extensions = with pkgs.vscode-extensions; [ #arrterian.nix-env-selector #ban.spellright - (pkgs.catppuccin-vsc.override { + (catppuccin-vsc.override { accent = "lavender"; boldKeywords = true; italicComments = true; From a6ddcbf60b8912b3eabf61f8870e47a192a7a19f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:03:27 +0200 Subject: [PATCH 1768/2308] Without inputs. --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 3dfe70c..ccff2d2 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ catppuccin.url = "github:catppuccin/nix"; # catpuccin flakehub for vscode - inputs.catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; + catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; # Conduit fork without all the fuss and drama conduit = { From f245d3399f19790b1e375260c334cb849d9a1fb7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:20:06 +0200 Subject: [PATCH 1769/2308] This seems to compile, so let's try this --- flake.nix | 3 --- home-manager/desktop/default.nix | 30 ++++++++++++++++-------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index ccff2d2..e183a9f 100644 --- a/flake.nix +++ b/flake.nix @@ -20,9 +20,6 @@ # catpuccin theme catppuccin.url = "github:catppuccin/nix"; - # catpuccin flakehub for vscode - catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; - # Conduit fork without all the fuss and drama conduit = { url = "github:girlbossceo/conduwuit"; diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index b7cbd05..4c76a93 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -23,7 +23,6 @@ nixpkgs = { # You can add overlays here overlays = [ - inputs.catppuccin-vsc.overlays.default # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default @@ -33,6 +32,19 @@ # patches = [ ./change-hello-to-hi.patch ]; # }); # }) + (final: prev: { + catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { + accent = "lavender"; + boldKeywords = true; + italicComments = true; + italicKeywords = true; + extraBordersEnabled = false; + workbenchMode = "default"; + bracketMode = "rainbow"; + colorOverrides = {}; + customUIColors = {}; + }); + }) ]; # Configure your nixpkgs instance config = { @@ -91,8 +103,8 @@ # Theming: catppuccin-cursors (catppuccin-kde.override { - flavour = "macchiato"; - accents = "lavender"; + flavour = ["macchiato"]; + accents = ["lavender"]; }) catppuccin-sddm-corners @@ -107,17 +119,7 @@ extensions = with pkgs.vscode-extensions; [ #arrterian.nix-env-selector #ban.spellright - (catppuccin-vsc.override { - accent = "lavender"; - boldKeywords = true; - italicComments = true; - italicKeywords = true; - extraBordersEnabled = false; - workbenchMode = "default"; - bracketMode = "rainbow"; - colorOverrides = {}; - customUIColors = {}; - }) + catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc-icons charliermarsh.ruff # dracula-theme.theme-dracula From 55663d1b5d34043ea9d90a0f723d7124341faad0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:20:34 +0200 Subject: [PATCH 1770/2308] Change it for shodan too --- home-manager/hosts/shodan/lillian.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 8cb86a1..41f8436 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -77,8 +77,8 @@ # Theming: catppuccin-cursors (catppuccin-kde.override { - flavour = "macchiato"; - accents = "lavender"; + flavour = ["macchiato"]; + accents = ["lavender"]; }) catppuccin-plymouth catppuccin-sddm-corners From 245358b9659e59c0e17f130c9338f4bbeaae7634 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:25:41 +0200 Subject: [PATCH 1771/2308] Mauve has better contrast, I'll stick with that --- home-manager/desktop/default.nix | 4 ++-- home-manager/hosts/shodan/lillian.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 4c76a93..0cbd01f 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -34,7 +34,7 @@ # }) (final: prev: { catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { - accent = "lavender"; + accent = "mauve"; boldKeywords = true; italicComments = true; italicKeywords = true; @@ -104,7 +104,7 @@ catppuccin-cursors (catppuccin-kde.override { flavour = ["macchiato"]; - accents = ["lavender"]; + accents = ["mauve"]; }) catppuccin-sddm-corners diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 41f8436..e94a33f 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -78,7 +78,7 @@ catppuccin-cursors (catppuccin-kde.override { flavour = ["macchiato"]; - accents = ["lavender"]; + accents = ["mauve"]; }) catppuccin-plymouth catppuccin-sddm-corners From 67afd17e6e561e49b12f066a8d49ee1e02c62aef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:40:15 +0200 Subject: [PATCH 1772/2308] Let's try theming helix --- home-manager/desktop/default.nix | 1 + home-manager/hosts/iso/lillian.nix | 1 + home-manager/hosts/queen/lillian.nix | 1 + home-manager/hosts/shodan/lillian.nix | 1 + home-manager/hosts/wheatley/lillian.nix | 1 + home-manager/package-configs/helix.nix | 12 ++++++++++++ 6 files changed, 17 insertions(+) create mode 100644 home-manager/package-configs/helix.nix diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 0cbd01f..fc7f0af 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -18,6 +18,7 @@ # ./nvim.nix ../package-configs/zsh.nix ../package-configs/firefox.nix + ../package-configs/helix.nix ./plasma-desktop ]; nixpkgs = { diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix index d6a4544..1fdbb27 100644 --- a/home-manager/hosts/iso/lillian.nix +++ b/home-manager/hosts/iso/lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop + ../../package-configs/helix.nix ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index 016bbf5..c3778c3 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../package-configs/zsh.nix + ../../package-configs/helix.nix ]; nixpkgs = { diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index e94a33f..3587849 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -21,6 +21,7 @@ ../../package-configs/zsh.nix ../../package-configs/firefox.nix ../../desktop/plasma-desktop + ../../package-configs/helix.nix ]; nixpkgs = { # You can add overlays here diff --git a/home-manager/hosts/wheatley/lillian.nix b/home-manager/hosts/wheatley/lillian.nix index 016bbf5..c3778c3 100644 --- a/home-manager/hosts/wheatley/lillian.nix +++ b/home-manager/hosts/wheatley/lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../package-configs/zsh.nix + ../../package-configs/helix.nix ]; nixpkgs = { diff --git a/home-manager/package-configs/helix.nix b/home-manager/package-configs/helix.nix new file mode 100644 index 0000000..988f599 --- /dev/null +++ b/home-manager/package-configs/helix.nix @@ -0,0 +1,12 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + programs.helix = { + catppuccin.enable = true; + }; +} From c882121d0c28f09508a2a4d3489f151300a784cb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:42:23 +0200 Subject: [PATCH 1773/2308] Maybe I need to enable that setting too? --- home-manager/package-configs/helix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/package-configs/helix.nix b/home-manager/package-configs/helix.nix index 988f599..233ddb6 100644 --- a/home-manager/package-configs/helix.nix +++ b/home-manager/package-configs/helix.nix @@ -7,6 +7,7 @@ ... }: { programs.helix = { + enable = true; catppuccin.enable = true; }; } From 2d88e84a47dadfb1541fdabd78252a449770cca0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:44:23 +0200 Subject: [PATCH 1774/2308] It worked but it's light mode, maybe this works? --- home-manager/package-configs/helix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/package-configs/helix.nix b/home-manager/package-configs/helix.nix index 233ddb6..1f4fe19 100644 --- a/home-manager/package-configs/helix.nix +++ b/home-manager/package-configs/helix.nix @@ -9,5 +9,6 @@ programs.helix = { enable = true; catppuccin.enable = true; + catppuccin.theme = "macchiato"; }; } From dfea857bb6525420b865278c2f68ff35fc6e80cd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:45:12 +0200 Subject: [PATCH 1775/2308] Or this? --- home-manager/package-configs/helix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/helix.nix b/home-manager/package-configs/helix.nix index 1f4fe19..a33bbb3 100644 --- a/home-manager/package-configs/helix.nix +++ b/home-manager/package-configs/helix.nix @@ -9,6 +9,6 @@ programs.helix = { enable = true; catppuccin.enable = true; - catppuccin.theme = "macchiato"; + catppuccin.flavour = "macchiato"; }; } From 284f4199ed6158192a96ff47b5cf7f6ea5233e64 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 14:55:46 +0200 Subject: [PATCH 1776/2308] Let's copy Lotte's helix config <3 --- home-manager/package-configs/helix.nix | 84 ++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 5 deletions(-) diff --git a/home-manager/package-configs/helix.nix b/home-manager/package-configs/helix.nix index a33bbb3..1d1d8c5 100644 --- a/home-manager/package-configs/helix.nix +++ b/home-manager/package-configs/helix.nix @@ -1,14 +1,88 @@ { - inputs, - outputs, - lib, config, + lib, pkgs, ... }: { programs.helix = { enable = true; - catppuccin.enable = true; - catppuccin.flavour = "macchiato"; + defaultEditor = true; + + settings = { + theme = "catppuccin_macchiato"; + editor = { + line-number = "relative"; + lsp.display-messages = true; + cursor-shape = { + insert = "bar"; + normal = "block"; + select = "underline"; + }; + cursorline = true; + bufferline = "always"; + color-modes = true; + soft-wrap = { + enable = true; + max-wrap = 25; + wrap-indicator = ""; + }; + }; + }; + languages = { + language = [ + { + name = "python"; + language-id = "python"; + auto-format = true; + file-types = ["py"]; + language-servers = ["python-lsp"]; + formatter = { + command = "ruff"; + args = ["-q"]; + }; + } + { + name = "typst"; + language-id = "typst"; + auto-format = false; + file-types = ["typ"]; + language-servers = ["typst-lsp"]; + } + { + name = "rust"; + language-id = "rust"; + auto-format = true; + file-types = ["rs"]; + roots = ["Cargo.lock"]; + language-servers = ["rust-analyzer"]; + } + { + name = "nix"; + language-id = "nix"; + auto-format = true; + file-types = ["nix"]; + roots = ["flake.lock" "flake.nix"]; + language-servers = ["nil"]; + formatter = { + command = "nix"; + args = ["fmt"]; + }; + } + ]; + language-server = { + python-lsp = { + command = "pylsp"; + }; + typst-lsp = { + command = "typst-lsp"; + }; + rust-analyzer = { + command = "rust-analyzer"; + }; + nil = { + command = "nil"; + }; + }; + }; }; } From 59a23dbbed2f0d7396ddcd07ba33b1de3a67a1db Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 15:17:47 +0200 Subject: [PATCH 1777/2308] Maybe direnv breaks things? --- nixos/shared/packages/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 5cfe20d..614d927 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -41,6 +41,13 @@ tldr # System libraries + + # language servers and debuggers for helix + typst-lsp + python311Packages.python-lsp-server + rust-analyzer + rocmPackages.llvm.lldb + nil ]; # fonts.packages = with pkgs; [ From 15d7e42fed998fda6a6c98beeea96fd035dfcd94 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 16:12:38 +0200 Subject: [PATCH 1778/2308] Wheatley won't compile anymore, let's just remove it for now --- flake.nix | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index e183a9f..976bfdf 100644 --- a/flake.nix +++ b/flake.nix @@ -233,25 +233,25 @@ ]; }; - wheatley = nixpkgs.lib.nixosSystem { - system = "armv7l-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - catppuccin.nixosModules.catppuccin - # make the module declared by the linger flake available to our config - #linger.nixosModules."armv7l-linux".default - #pihole.nixosModules."armv7l-linux".default - disko.nixosModules.disko - # > Our main nixos configuration file < - ./nixos/hosts/wheatley/configuration.nix - sops-nix.nixosModules.sops - { - home-manager.sharedModules = [ - inputs.catppuccin.homeManagerModules.catppuccin - ]; - } - ]; - }; + # wheatley = nixpkgs.lib.nixosSystem { + # system = "armv7l-linux"; + # specialArgs = {inherit inputs outputs;}; + # modules = [ + # catppuccin.nixosModules.catppuccin + # # make the module declared by the linger flake available to our config + # #linger.nixosModules."armv7l-linux".default + # #pihole.nixosModules."armv7l-linux".default + # disko.nixosModules.disko + # # > Our main nixos configuration file < + # ./nixos/hosts/wheatley/configuration.nix + # sops-nix.nixosModules.sops + # { + # home-manager.sharedModules = [ + # inputs.catppuccin.homeManagerModules.catppuccin + # ]; + # } + # ]; + # }; }; }; } From 19fede337a798b7e97a8663cdff19b6230828a97 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 16:12:44 +0200 Subject: [PATCH 1779/2308] update flake lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 019bd04..a19aee6 100644 --- a/flake.lock +++ b/flake.lock @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1714042918, - "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=", + "lastModified": 1714203603, + "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db", + "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", "type": "github" }, "original": { @@ -560,11 +560,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713864415, - "narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=", + "lastModified": 1714201532, + "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc", + "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", "type": "github" }, "original": { @@ -640,11 +640,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713895582, - "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "572af610f6151fd41c212f897c71f7056e3fb518", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -688,11 +688,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1713895582, - "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "572af610f6151fd41c212f897c71f7056e3fb518", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -769,11 +769,11 @@ ] }, "locked": { - "lastModified": 1713805120, - "narHash": "sha256-WmqVyblqQ3g2Bmm+WONc1OnUuOuULQRIQya9wCLp5o8=", + "lastModified": 1714225998, + "narHash": "sha256-NhvSRlSiWsKgi5bJ0r3e8oco9P+YBDITVv7QOSuNVc8=", "owner": "pjones", "repo": "plasma-manager", - "rev": "ffeef9dc96a5a0e442479c94a6000f93b69aeaac", + "rev": "f5bdc6af100d0aefad0c61822bffa12d3b54d92e", "type": "github" }, "original": { From 43706133dfd2338d5967c0d1808ab49ea2705264 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 16:21:39 +0200 Subject: [PATCH 1780/2308] Remove python global lsp --- nixos/shared/packages/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 614d927..56e9b72 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -44,7 +44,6 @@ # language servers and debuggers for helix typst-lsp - python311Packages.python-lsp-server rust-analyzer rocmPackages.llvm.lldb nil From 83123499c274c0a3512a37a9ed61ef9ebc8129fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 16:22:44 +0200 Subject: [PATCH 1781/2308] Disable auto format for python in helix --- home-manager/package-configs/helix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/helix.nix b/home-manager/package-configs/helix.nix index 1d1d8c5..68ff2b6 100644 --- a/home-manager/package-configs/helix.nix +++ b/home-manager/package-configs/helix.nix @@ -33,7 +33,7 @@ { name = "python"; language-id = "python"; - auto-format = true; + auto-format = false; file-types = ["py"]; language-servers = ["python-lsp"]; formatter = { From dc86f96b8e4783a0ce53849f753427622c945d43 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 16:26:15 +0200 Subject: [PATCH 1782/2308] That did fix it, let me try and use an older flake lock to see if the error disappears --- home-manager/package-configs/helix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/package-configs/helix.nix b/home-manager/package-configs/helix.nix index 68ff2b6..1d1d8c5 100644 --- a/home-manager/package-configs/helix.nix +++ b/home-manager/package-configs/helix.nix @@ -33,7 +33,7 @@ { name = "python"; language-id = "python"; - auto-format = false; + auto-format = true; file-types = ["py"]; language-servers = ["python-lsp"]; formatter = { From 2011519216d0131a17bfe3cd8bc3a7bca4ef827c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 16:40:07 +0200 Subject: [PATCH 1783/2308] Let's try without this -q --- home-manager/package-configs/helix.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/package-configs/helix.nix b/home-manager/package-configs/helix.nix index 1d1d8c5..05eb203 100644 --- a/home-manager/package-configs/helix.nix +++ b/home-manager/package-configs/helix.nix @@ -38,7 +38,6 @@ language-servers = ["python-lsp"]; formatter = { command = "ruff"; - args = ["-q"]; }; } { From ee2bfcf24ff9eb36fe735b5b1e7b719c79048cb2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Apr 2024 16:43:54 +0200 Subject: [PATCH 1784/2308] Let's try this config for helix and ruff --- home-manager/package-configs/helix.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/home-manager/package-configs/helix.nix b/home-manager/package-configs/helix.nix index 05eb203..5b5b47f 100644 --- a/home-manager/package-configs/helix.nix +++ b/home-manager/package-configs/helix.nix @@ -35,10 +35,7 @@ language-id = "python"; auto-format = true; file-types = ["py"]; - language-servers = ["python-lsp"]; - formatter = { - command = "ruff"; - }; + language-servers = ["ruff"]; } { name = "typst"; @@ -69,8 +66,8 @@ } ]; language-server = { - python-lsp = { - command = "pylsp"; + ruff = { + command = "ruff-lsp"; }; typst-lsp = { command = "typst-lsp"; From afadb4eabe1b7d39fc24fea964794bb270c49d7e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 15:23:55 +0200 Subject: [PATCH 1785/2308] Let's see if this makes formatting with nix work and not wipe a file in helix --- nixos/hosts/EDI/hardware-configuration.nix | 22 +++++++++++++--------- nixos/shared/packages/default.nix | 6 ------ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 006d087..081b9c8 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -1,17 +1,21 @@ # 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") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = ["dm-snapshot"]; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; #fileSystems."/" = # { device = "UUID=65956905-b7a5-4573-81fe-622c42cabdf5"; diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 56e9b72..5cfe20d 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -41,12 +41,6 @@ tldr # System libraries - - # language servers and debuggers for helix - typst-lsp - rust-analyzer - rocmPackages.llvm.lldb - nil ]; # fonts.packages = with pkgs; [ From 2d1c049cf21b2d70e45d601dbd3bae2637819360 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 15:57:41 +0200 Subject: [PATCH 1786/2308] Let's try this? --- home-manager/package-configs/helix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/package-configs/helix.nix b/home-manager/package-configs/helix.nix index 5b5b47f..e83f57f 100644 --- a/home-manager/package-configs/helix.nix +++ b/home-manager/package-configs/helix.nix @@ -60,8 +60,8 @@ roots = ["flake.lock" "flake.nix"]; language-servers = ["nil"]; formatter = { - command = "nix"; - args = ["fmt"]; + command = "alejandra"; + args = ["-q"]; }; } ]; From 67c8f740a031110ea3fe634a22132a68b3855c78 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 16:03:51 +0200 Subject: [PATCH 1787/2308] comment out pihole stuff --- flake.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 976bfdf..7ffd836 100644 --- a/flake.nix +++ b/flake.nix @@ -65,17 +65,17 @@ # hardware.url = "github:nixos/nixos-hardware"; # Required for making sure that Pi-hole continues running if the executing user has no active session. - linger = { - url = "github:mindsbackyard/linger-flake"; - inputs.flake-utils.follows = "flake-utils"; - }; + # linger = { + # url = "github:mindsbackyard/linger-flake"; + # inputs.flake-utils.follows = "flake-utils"; + # }; - pihole = { - url = "github:mindsbackyard/pihole-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - inputs.linger.follows = "linger"; - }; + # pihole = { + # url = "github:mindsbackyard/pihole-flake"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.flake-utils.follows = "flake-utils"; + # inputs.linger.follows = "linger"; + # }; }; outputs = { @@ -88,8 +88,8 @@ sops-nix, simple-nixos-mailserver, plasma-manager, - linger, - pihole, + # linger, + # pihole, lanzaboote, jovian, nixos-hardware, From ad634818359c6b909b177886d4fe590599e80008 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 20:06:28 +0200 Subject: [PATCH 1788/2308] add zellij with basic configs --- home-manager/desktop/default.nix | 1 + home-manager/package-configs/zellij.kdl | 31 +++++++++++++++++++++++++ home-manager/package-configs/zellij.nix | 15 ++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 home-manager/package-configs/zellij.kdl create mode 100644 home-manager/package-configs/zellij.nix diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index fc7f0af..4181ff8 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -19,6 +19,7 @@ ../package-configs/zsh.nix ../package-configs/firefox.nix ../package-configs/helix.nix + ../package-configs/zellij.nix ./plasma-desktop ]; nixpkgs = { diff --git a/home-manager/package-configs/zellij.kdl b/home-manager/package-configs/zellij.kdl new file mode 100644 index 0000000..15b14d5 --- /dev/null +++ b/home-manager/package-configs/zellij.kdl @@ -0,0 +1,31 @@ +session_serialization true +theme "catppuccin-macchiato" + +themes { + catppuccin-mocha { + bg "#585b70" // Surface2 + fg "#cdd6f4" + red "#f38ba8" + green "#a6e3a1" + blue "#89b4fa" + yellow "#f9e2af" + magenta "#f5c2e7" // Pink + orange "#fab387" // Peach + cyan "#89dceb" // Sky + black "#181825" // Mantle + white "#cdd6f4" + } + catppuccin-macchiato { + bg "#5b6078" // Surface2 + fg "#cad3f5" + red "#ed8796" + green "#a6da95" + blue "#8aadf4" + yellow "#eed49f" + magenta "#f5bde6" // Pink + orange "#f5a97f" // Peach + cyan "#91d7e3" // Sky + black "#1e2030" // Mantle + white "#cad3f5" + } +} diff --git a/home-manager/package-configs/zellij.nix b/home-manager/package-configs/zellij.nix new file mode 100644 index 0000000..b8d9abe --- /dev/null +++ b/home-manager/package-configs/zellij.nix @@ -0,0 +1,15 @@ +{lib, ...}: { + programs.zellij = { + # This autostarts zellij on zsh start + # TODO find specific settings for vscode to avoid + #enable = true; + enableZshIntegration = true; + }; + + home.file = { + "zellij" = { + source = ./zellij.kdl; + target = ".config/zellij/config.kdl"; + }; + }; +} From aa1213bb659a63f752de8fa57d24c8b1922f677d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 20:30:22 +0200 Subject: [PATCH 1789/2308] Pare down zsh and refactor home manager a bit --- flake.lock | 50 +----------------- home-manager/desktop/default.nix | 15 +----- .../{ => desktop}/package-configs/firefox.nix | 0 .../plasma-desktop.nix} | 0 home-manager/hosts/GLaDOS/lillian.nix | 1 + home-manager/hosts/iso/lillian.nix | 2 +- home-manager/hosts/queen/lillian.nix | 3 +- home-manager/hosts/shodan/lillian.nix | 10 ++-- home-manager/shared/default.nix | 24 +++++++++ .../shell}/helix.nix | 0 .../shell}/zellij.kdl | 0 .../shell}/zellij.nix | 0 .../{package-configs => shared/shell}/zsh.nix | 52 +------------------ 13 files changed, 36 insertions(+), 121 deletions(-) rename home-manager/{ => desktop}/package-configs/firefox.nix (100%) rename home-manager/desktop/{plasma-desktop/default.nix => package-configs/plasma-desktop.nix} (100%) create mode 100644 home-manager/shared/default.nix rename home-manager/{package-configs => shared/shell}/helix.nix (100%) rename home-manager/{package-configs => shared/shell}/zellij.kdl (100%) rename home-manager/{package-configs => shared/shell}/zellij.nix (100%) rename home-manager/{package-configs => shared/shell}/zsh.nix (50%) diff --git a/flake.lock b/flake.lock index a19aee6..c43b49c 100644 --- a/flake.lock +++ b/flake.lock @@ -158,7 +158,7 @@ "type": "github" }, "original": { - "owner": "ipetkov", + "owner": "ipetkov", "repo": "crane", "type": "github" } @@ -445,26 +445,6 @@ "type": "github" } }, - "linger": { - "inputs": { - "flake-utils": [ - "flake-utils" - ] - }, - "locked": { - "lastModified": 1670283645, - "narHash": "sha256-SuC/SuQ8RUaM6RthNAkNTSnlpRXJxEmuym2OyPLLpWk=", - "owner": "mindsbackyard", - "repo": "linger-flake", - "rev": "9f8632c0621dc562dd42e9eacfdb6dae82aebf8b", - "type": "github" - }, - "original": { - "owner": "mindsbackyard", - "repo": "linger-flake", - "type": "github" - } - }, "nix-filter": { "locked": { "lastModified": 1710156097, @@ -733,32 +713,6 @@ "type": "github" } }, - "pihole": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "linger": [ - "linger" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1670284048, - "narHash": "sha256-lNyJ7vrDAdsPVcNBXqDUXseBBL9Kf2q64/A8ntEKXWI=", - "owner": "mindsbackyard", - "repo": "pihole-flake", - "rev": "9daaf65415ad6d3f5a8daa617d8737bc405f9dd8", - "type": "github" - }, - "original": { - "owner": "mindsbackyard", - "repo": "pihole-flake", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -839,13 +793,11 @@ "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", - "linger": "linger", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", - "pihole": "pihole", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 4181ff8..7970c5e 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -16,11 +16,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../package-configs/zsh.nix - ../package-configs/firefox.nix - ../package-configs/helix.nix - ../package-configs/zellij.nix - ./plasma-desktop + ./package-configs/plasma-desktop.nix + ./package-configs/firefox.nix ]; nixpkgs = { # You can add overlays here @@ -96,11 +93,9 @@ nextcloud-client nitrokey-app protonvpn-gui - sops virtualbox watchmate qbittorrent - zsh # Theming: catppuccin-cursors @@ -119,12 +114,9 @@ enable = true; package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ - #arrterian.nix-env-selector - #ban.spellright catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc-icons charliermarsh.ruff - # dracula-theme.theme-dracula eamodio.gitlens github.vscode-pull-request-github jnoortheen.nix-ide @@ -133,12 +125,9 @@ ms-toolsai.jupyter ms-pyright.pyright ms-python.black-formatter - #ms-python.python ms-python.vscode-pylance - #ms-vscode-remote.remote-containers ms-vscode-remote.remote-ssh oderwat.indent-rainbow - #redhat.java rust-lang.rust-analyzer yzhang.markdown-all-in-one ]; diff --git a/home-manager/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix similarity index 100% rename from home-manager/package-configs/firefox.nix rename to home-manager/desktop/package-configs/firefox.nix diff --git a/home-manager/desktop/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop.nix similarity index 100% rename from home-manager/desktop/plasma-desktop/default.nix rename to home-manager/desktop/package-configs/plasma-desktop.nix diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 69d5be2..3dcac9e 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop + ../../shared ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix index 1fdbb27..192f9c3 100644 --- a/home-manager/hosts/iso/lillian.nix +++ b/home-manager/hosts/iso/lillian.nix @@ -19,7 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop - ../../package-configs/helix.nix + ../../shared ]; home.packages = with pkgs; [ diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index c3778c3..3dc5e4f 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -18,8 +18,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../../package-configs/zsh.nix - ../../package-configs/helix.nix + ../../shared ]; nixpkgs = { diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 3587849..ee7fec6 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -18,10 +18,10 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../../package-configs/zsh.nix - ../../package-configs/firefox.nix - ../../desktop/plasma-desktop - ../../package-configs/helix.nix + + ../../desktop/package-configs/plasma-desktop.nix + ../../desktop/package-configs/firefox.nix + ../../shared ]; nixpkgs = { # You can add overlays here @@ -85,7 +85,7 @@ catppuccin-sddm-corners # Web browsing: - librewolf + firefox ungoogled-chromium ]; diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix new file mode 100644 index 0000000..80c814e --- /dev/null +++ b/home-manager/shared/default.nix @@ -0,0 +1,24 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + ./shell/helix.nix + ./shell/zellij.nix + ./shell/zsh.nix + ]; + home = { + username = "lillian"; + homeDirectory = "/home/lillian"; + }; + + home.packages = with pkgs; [ + # System tools: + sops + zsh + ]; +} diff --git a/home-manager/package-configs/helix.nix b/home-manager/shared/shell/helix.nix similarity index 100% rename from home-manager/package-configs/helix.nix rename to home-manager/shared/shell/helix.nix diff --git a/home-manager/package-configs/zellij.kdl b/home-manager/shared/shell/zellij.kdl similarity index 100% rename from home-manager/package-configs/zellij.kdl rename to home-manager/shared/shell/zellij.kdl diff --git a/home-manager/package-configs/zellij.nix b/home-manager/shared/shell/zellij.nix similarity index 100% rename from home-manager/package-configs/zellij.nix rename to home-manager/shared/shell/zellij.nix diff --git a/home-manager/package-configs/zsh.nix b/home-manager/shared/shell/zsh.nix similarity index 50% rename from home-manager/package-configs/zsh.nix rename to home-manager/shared/shell/zsh.nix index f5fde16..da9b4a5 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -44,64 +44,14 @@ enable = true; plugins = [ "git" - "adb" - "battery" - "branch" - "coffee" "colored-man-pages" "colorize" - "command-not-found" - "common-aliases" - "compleat" - "composer" - "copypath" - "copybuffer" - "copyfile" - "cp" - "dirhistory" - "dirpersist" - "docker" - "docker-compose" - "extract" "fancy-ctrl-z" - "fastfile" - "frontend-search" - "git-auto-fetch" - "git-escape-magic" - "git-extras" "git-flow" - "github" - "gitignore" - "gnu-utils" - "gpg-agent" - "history" - "history-substring-search" "isodate" - "jsontools" - "keychain" - "man" - "nanoc" - "pip" - "pipenv" - "pyenv" - "python" - "rsync" - "rvm" - "screen" - "sdk" - "sfdx" - "shell-proxy" - "sudo" - "systemadmin" - "systemd" - "themes" - "urltools" - "web-search" - "zsh-interactive-cd" - "zsh-navigation-tools" "z" ]; - theme = "jtriley"; + theme = "catppuccin-macchiato"; }; }; } From bec8e1106760bf0e5798613c08b580707c7a56ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 20:32:19 +0200 Subject: [PATCH 1790/2308] SHould probably add shared to EDI huh --- home-manager/hosts/EDI/lillian.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index d6a4544..192f9c3 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -19,6 +19,7 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../../desktop + ../../shared ]; home.packages = with pkgs; [ From 17c818b7d82cfdc572b42fd96bf00690a87e7e15 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 20:35:40 +0200 Subject: [PATCH 1791/2308] Remove theme and add stuff for zoxide --- home-manager/shared/shell/zsh.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index da9b4a5..c595187 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -51,7 +51,10 @@ "isodate" "z" ]; - theme = "catppuccin-macchiato"; }; + # stuff for zoxide + initExtra = '' + eval "$(zoxide init --cmd cd zsh)" + ''; }; } From 165c24b44da11eaef4f1a1e0f070938943676abc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 20:37:48 +0200 Subject: [PATCH 1792/2308] Enable zellij --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index b8d9abe..00829e3 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -2,7 +2,7 @@ programs.zellij = { # This autostarts zellij on zsh start # TODO find specific settings for vscode to avoid - #enable = true; + enable = true; enableZshIntegration = true; }; From 0ffffc4bb881a5e2f59681ce8e190912e0290d82 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 20:41:00 +0200 Subject: [PATCH 1793/2308] Add starship theming --- home-manager/shared/default.nix | 1 + home-manager/shared/shell/starship.nix | 50 ++++++++++++++++++++++++++ home-manager/shared/shell/zsh.nix | 6 ---- 3 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 home-manager/shared/shell/starship.nix diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 80c814e..b82b547 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -10,6 +10,7 @@ ./shell/helix.nix ./shell/zellij.nix ./shell/zsh.nix + ./shell/starship.nix ]; home = { username = "lillian"; diff --git a/home-manager/shared/shell/starship.nix b/home-manager/shared/shell/starship.nix new file mode 100644 index 0000000..e07cd6b --- /dev/null +++ b/home-manager/shared/shell/starship.nix @@ -0,0 +1,50 @@ +{ + lib, + pkgs, + ... +}: { + programs.starship = let + flavour = "macchiato"; # One of `latte`, `frappe`, `macchiato`, or `mocha` + in { + enable = true; + settings = + { + add_newline = true; + format = lib.concatStrings [ + "$sudo" + "$all" + ]; + character.success_symbol = "[➜](bold purple)"; + package.disabled = true; + sudo = { + symbol = "witch "; + style = "bold blue"; + format = "[$symbol]($style)"; + disabled = false; + }; + hostname = { + ssh_only = false; + format = "[$hostname](bold yellow)[$ssh_symbol](bold blue):"; + trim_at = ""; + disabled = false; + }; + username = { + show_always = true; + format = "[$user]($style)@"; + }; + git_branch.style = "bold blue"; + directory.style = "bold blue"; + direnv.disabled = false; + palette = "catppuccin_${flavour}"; + } + // builtins.fromTOML (builtins.readFile + (pkgs.fetchFromGitHub + { + owner = "catppuccin"; + repo = "starship"; + rev = "5629d23"; # Replace with the latest commit hash + sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; + } + + /palettes/${flavour}.toml)); + }; +} diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index c595187..aab67f2 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -6,12 +6,6 @@ pkgs, ... }: { - # Enable starship - programs.starship = { - enable = true; - catppuccin.enable = true; - }; - programs.zoxide = { enable = true; }; From bb29cd599fea5e6b76b1c94715f94168cc199268 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 21:23:04 +0200 Subject: [PATCH 1794/2308] enable catppuccin module in zellij --- home-manager/shared/shell/zellij.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 00829e3..772d1c9 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -4,6 +4,7 @@ # TODO find specific settings for vscode to avoid enable = true; enableZshIntegration = true; + catppuccin.enable = true; }; home.file = { From ee4a47dbe792ef0d9ac21fe2ca29aa74ff603b1d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 21:25:04 +0200 Subject: [PATCH 1795/2308] remove the makeup file --- home-manager/shared/shell/zellij.kdl | 31 ---------------------------- home-manager/shared/shell/zellij.nix | 7 ------- 2 files changed, 38 deletions(-) delete mode 100644 home-manager/shared/shell/zellij.kdl diff --git a/home-manager/shared/shell/zellij.kdl b/home-manager/shared/shell/zellij.kdl deleted file mode 100644 index 15b14d5..0000000 --- a/home-manager/shared/shell/zellij.kdl +++ /dev/null @@ -1,31 +0,0 @@ -session_serialization true -theme "catppuccin-macchiato" - -themes { - catppuccin-mocha { - bg "#585b70" // Surface2 - fg "#cdd6f4" - red "#f38ba8" - green "#a6e3a1" - blue "#89b4fa" - yellow "#f9e2af" - magenta "#f5c2e7" // Pink - orange "#fab387" // Peach - cyan "#89dceb" // Sky - black "#181825" // Mantle - white "#cdd6f4" - } - catppuccin-macchiato { - bg "#5b6078" // Surface2 - fg "#cad3f5" - red "#ed8796" - green "#a6da95" - blue "#8aadf4" - yellow "#eed49f" - magenta "#f5bde6" // Pink - orange "#f5a97f" // Peach - cyan "#91d7e3" // Sky - black "#1e2030" // Mantle - white "#cad3f5" - } -} diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 772d1c9..aa5f449 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -6,11 +6,4 @@ enableZshIntegration = true; catppuccin.enable = true; }; - - home.file = { - "zellij" = { - source = ./zellij.kdl; - target = ".config/zellij/config.kdl"; - }; - }; } From ae594211e0f3feefa498811acff9d47a714a98e5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 21:28:45 +0200 Subject: [PATCH 1796/2308] Re-add the history plugins --- home-manager/shared/shell/zsh.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index aab67f2..d5e6bf2 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -40,6 +40,8 @@ "git" "colored-man-pages" "colorize" + "history" + "history-substring-search" "fancy-ctrl-z" "git-flow" "isodate" From 2d83db719a35c94c02bfd7ddfb424f68768062fe Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 21:39:19 +0200 Subject: [PATCH 1797/2308] Replace cat with bat --- home-manager/shared/default.nix | 1 + home-manager/shared/shell/zsh.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index b82b547..0233f57 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -21,5 +21,6 @@ # System tools: sops zsh + bat ]; } diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index d5e6bf2..5368ebd 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -16,6 +16,7 @@ cd = "z"; code = "codium ./"; lh = "ls -lah"; + cat = "bat"; }; plugins = [ { From a8d928742f640447b836dcf5c9c0aefd5ba8d9fa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 21:49:37 +0200 Subject: [PATCH 1798/2308] Change bat theme to catppuccin --- home-manager/shared/shell/bat.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 home-manager/shared/shell/bat.nix diff --git a/home-manager/shared/shell/bat.nix b/home-manager/shared/shell/bat.nix new file mode 100644 index 0000000..21acc30 --- /dev/null +++ b/home-manager/shared/shell/bat.nix @@ -0,0 +1,11 @@ +{ + lib, + pkgs, + ... +}: { + programs.bat = { + enable = true; + extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch]; + catppuccin.enable = true; + }; +} From f2921494456d32703d67068a7521bdb02c44e21b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 23:20:46 +0200 Subject: [PATCH 1799/2308] The other theme was different and better, so let's stick to the kdl file --- home-manager/shared/shell/zellij.kdl | 31 ++++++++++++++++++++++++++++ home-manager/shared/shell/zellij.nix | 8 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 home-manager/shared/shell/zellij.kdl diff --git a/home-manager/shared/shell/zellij.kdl b/home-manager/shared/shell/zellij.kdl new file mode 100644 index 0000000..15b14d5 --- /dev/null +++ b/home-manager/shared/shell/zellij.kdl @@ -0,0 +1,31 @@ +session_serialization true +theme "catppuccin-macchiato" + +themes { + catppuccin-mocha { + bg "#585b70" // Surface2 + fg "#cdd6f4" + red "#f38ba8" + green "#a6e3a1" + blue "#89b4fa" + yellow "#f9e2af" + magenta "#f5c2e7" // Pink + orange "#fab387" // Peach + cyan "#89dceb" // Sky + black "#181825" // Mantle + white "#cdd6f4" + } + catppuccin-macchiato { + bg "#5b6078" // Surface2 + fg "#cad3f5" + red "#ed8796" + green "#a6da95" + blue "#8aadf4" + yellow "#eed49f" + magenta "#f5bde6" // Pink + orange "#f5a97f" // Peach + cyan "#91d7e3" // Sky + black "#1e2030" // Mantle + white "#cad3f5" + } +} diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index aa5f449..00829e3 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -4,6 +4,12 @@ # TODO find specific settings for vscode to avoid enable = true; enableZshIntegration = true; - catppuccin.enable = true; + }; + + home.file = { + "zellij" = { + source = ./zellij.kdl; + target = ".config/zellij/config.kdl"; + }; }; } From 728cc4cf611f473dfcad034f2849b7a82a55ef01 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 23:25:20 +0200 Subject: [PATCH 1800/2308] add tree to all systems --- nixos/shared/packages/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 5cfe20d..81f762e 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -29,13 +29,14 @@ e2fsprogs git git-filter-repo + helix home-manager htop killall neofetch oh-my-zsh rsync - helix + tree wget zsh tldr From 99fe8a39740a8e64df607a425ca6397a540de4e8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 23:30:16 +0200 Subject: [PATCH 1801/2308] replace tree with tre --- home-manager/shared/shell/zsh.nix | 4 +++- nixos/shared/packages/default.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index 5368ebd..75b9810 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -17,6 +17,7 @@ code = "codium ./"; lh = "ls -lah"; cat = "bat"; + tree = "tre"; }; plugins = [ { @@ -49,9 +50,10 @@ "z" ]; }; - # stuff for zoxide + # stuff for zoxide & tre initExtra = '' eval "$(zoxide init --cmd cd zsh)" + tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; } ''; }; } diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 81f762e..ae89bcd 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -36,7 +36,7 @@ neofetch oh-my-zsh rsync - tree + tre-command wget zsh tldr From d8b57452ee5fc2e443f8cfa7253cc99642ee9a86 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 23:51:07 +0200 Subject: [PATCH 1802/2308] change default fonts to new ones --- nixos/shared/packages/default.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index ae89bcd..23cd867 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -43,11 +43,20 @@ # System libraries ]; - - # fonts.packages = with pkgs; [ - # noto-fonts - # noto-fonts-emoji-blob-bin - # noto-fonts-emoji - # (nerdfonts.override {fonts = ["FiraCode" "DroidSansMono"];}) - # ]; + fonts = { + packages = with pkgs; [ + cantarell-fonts + dejavu_fonts + fira-code + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + paratype-pt-sans + paratype-pt-mono + paratype-pt-serif + roboto + twemoji-color-font + ]; + enableDefaultPackages = false; + }; } From 5d79895d843f6a3005ec36a4aa732cadab71737d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Apr 2024 10:05:52 +0200 Subject: [PATCH 1803/2308] Navigation is weird now so let's try and fix that this way --- home-manager/shared/shell/zsh.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index 75b9810..0ea7244 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -42,12 +42,16 @@ "git" "colored-man-pages" "colorize" + "dirhistory" + "dirpersist" "history" "history-substring-search" "fancy-ctrl-z" "git-flow" "isodate" "z" + "zsh-interactive-cd" + "zsh-navigation-tools" ]; }; # stuff for zoxide & tre From 6fd9e72e4952ae5cbfaf0953e394227d2caf23fb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Apr 2024 11:30:44 +0200 Subject: [PATCH 1804/2308] replace ls with eza --- home-manager/shared/default.nix | 1 + home-manager/shared/shell/eza.nix | 8 ++++++++ home-manager/shared/shell/zsh.nix | 1 + 3 files changed, 10 insertions(+) create mode 100644 home-manager/shared/shell/eza.nix diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 0233f57..2329b2d 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -11,6 +11,7 @@ ./shell/zellij.nix ./shell/zsh.nix ./shell/starship.nix + ./shell/eza.nix ]; home = { username = "lillian"; diff --git a/home-manager/shared/shell/eza.nix b/home-manager/shared/shell/eza.nix new file mode 100644 index 0000000..6c874a7 --- /dev/null +++ b/home-manager/shared/shell/eza.nix @@ -0,0 +1,8 @@ +{lib, ...}: { + programs.eza = { + enable = true; + enableZshIntegration = true; + git = true; + icons = true; + }; +} diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index 0ea7244..fcd99f8 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -15,6 +15,7 @@ shellAliases = { cd = "z"; code = "codium ./"; + ls = "eza"; lh = "ls -lah"; cat = "bat"; tree = "tre"; From d27e25c0fcc842cdca57184535ca885f122bf2e7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Apr 2024 11:35:30 +0200 Subject: [PATCH 1805/2308] icons mostly show tofu, ugly --- home-manager/shared/shell/eza.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/shared/shell/eza.nix b/home-manager/shared/shell/eza.nix index 6c874a7..b0c72f2 100644 --- a/home-manager/shared/shell/eza.nix +++ b/home-manager/shared/shell/eza.nix @@ -3,6 +3,5 @@ enable = true; enableZshIntegration = true; git = true; - icons = true; }; } From dbba8a257750a3df3fce62c2b00203e3d46bc73a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Apr 2024 15:02:26 +0200 Subject: [PATCH 1806/2308] set zellij to not auto start on server --- home-manager/hosts/queen/lillian.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index 3dc5e4f..f2c7c2b 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -41,6 +41,10 @@ }; }; + programs.zellij = { + enable = lib.mkForce false; + }; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "24.05"; } From 589da4b4fa11bf0770b6eeabe364c49a08311615 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Apr 2024 15:25:34 +0200 Subject: [PATCH 1807/2308] add inlay type hints by default in helix --- home-manager/shared/shell/helix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/shell/helix.nix b/home-manager/shared/shell/helix.nix index e83f57f..9fc9e69 100644 --- a/home-manager/shared/shell/helix.nix +++ b/home-manager/shared/shell/helix.nix @@ -13,6 +13,7 @@ editor = { line-number = "relative"; lsp.display-messages = true; + lsp.display-inlay-hints = true; cursor-shape = { insert = "bar"; normal = "block"; From afdb110f7ab16bf4bb093482b1b1eadda5c77726 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 1 May 2024 10:21:26 +0200 Subject: [PATCH 1808/2308] update flake lock --- flake.lock | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index c43b49c..d2f3ad2 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1713895615, - "narHash": "sha256-SVkxhcL0/IN5fNI2dqr702wXOnzktsm0LCEVGRAJQcY=", + "lastModified": 1714422957, + "narHash": "sha256-fQ1NP//CLQSj/te/qUxO+YiHlz6KYPxzVFSW5ldQGMA=", "owner": "catppuccin", "repo": "nix", - "rev": "a48e70a31616cb63e4794fd3465bff1835cc4246", + "rev": "f46dffa3345aba8b315ed7ddd1be4bc12f9e9e78", "type": "github" }, "original": { @@ -158,7 +158,7 @@ "type": "github" }, "original": { - "owner": "ipetkov", + "owner": "ipetkov", "repo": "crane", "type": "github" } @@ -170,11 +170,11 @@ ] }, "locked": { - "lastModified": 1714103775, - "narHash": "sha256-kcBiIrmqzt3bNTr2GMBfAyA+on8BEKO1iKzzDFQZkjI=", + "lastModified": 1714405407, + "narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=", "owner": "nix-community", "repo": "disko", - "rev": "285e26465a0bae510897ca04da26ce6307c652b4", + "rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1714203603, - "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", + "lastModified": 1714515075, + "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", + "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1714022840, - "narHash": "sha256-i6xZsf7Kvp1n/Sn3nqPY1MJQx0gf80OGQw32PA/aZd8=", + "lastModified": 1714464433, + "narHash": "sha256-ztvukQ2LvrRQBtiRiut8FgCOyKXgqLTIp3Deg/OguUY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "94def3af1d45fe4b142beda3aa59a6a98e62ce9e", + "rev": "2a5194b960801b68cfc4c811eb1733cf3aa8ece6", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1713869268, - "narHash": "sha256-o3CMQeu/S8/4zU0pMtYg51rd1FWdJsI2Xohzng1Ysdg=", + "lastModified": 1714273701, + "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "dcb6ac44922858ce3a5b46f77a36d6030181460c", + "rev": "941c4973c824509e0356be455d89613611f76c8a", "type": "github" }, "original": { @@ -540,11 +540,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1714201532, - "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=", + "lastModified": 1714465198, + "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", + "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4", "type": "github" }, "original": { @@ -620,11 +620,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -636,11 +636,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -668,11 +668,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -723,11 +723,11 @@ ] }, "locked": { - "lastModified": 1714225998, - "narHash": "sha256-NhvSRlSiWsKgi5bJ0r3e8oco9P+YBDITVv7QOSuNVc8=", + "lastModified": 1714468356, + "narHash": "sha256-GdOqQ94WnMkHHRH+Fu7Nx5pMhfs5eou8yxI1hr3PIqM=", "owner": "pjones", "repo": "plasma-manager", - "rev": "f5bdc6af100d0aefad0c61822bffa12d3b54d92e", + "rev": "22ae742b456e1f8fb6fea1b19037f50e9c80e1ec", "type": "github" }, "original": { @@ -853,11 +853,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1713012165, - "narHash": "sha256-z/soXKDnz+w4Nw0LkRaM73YqolhSmIYy6cpg1F2ps8I=", + "lastModified": 1714298568, + "narHash": "sha256-HzgySE+n7Ri8faGo+uxYdjlCicgVGV0eJT86cWYIvo4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "9f6635a0351c190179dc6904545f950108a23dd8", + "rev": "ef4756bcfc8a6791adbcae2b32f87e2f0a00525d", "type": "gitlab" }, "original": { From f5bc182956fe8e5aa696df0771ea14ecab8b0a20 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 1 May 2024 23:05:24 +0200 Subject: [PATCH 1809/2308] create package for and install simple-completion-language-server for helix --- nixos/shared/packages/default.nix | 1 + pkgs/default.nix | 1 + .../default.nix | 24 +++++++++++++++++++ pkgs/simple-completion-language-server/result | 1 + 4 files changed, 27 insertions(+) create mode 100644 pkgs/simple-completion-language-server/default.nix create mode 120000 pkgs/simple-completion-language-server/result diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 23cd867..4c1de8a 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -22,6 +22,7 @@ install-nix update upgrade + simple-completion-language-server # System tools age diff --git a/pkgs/default.nix b/pkgs/default.nix index dd4c2cc..51823f9 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,4 +13,5 @@ pkgs: { restart = pkgs.callPackage ./restart {}; phanpy = pkgs.callPackage ./phanpy {}; # auto-mount = pkgs.callPackage ./auto-mount {}; + simple-completion-language-server = pkgs.callPackage ./simple-completion-language-server {}; } diff --git a/pkgs/simple-completion-language-server/default.nix b/pkgs/simple-completion-language-server/default.nix new file mode 100644 index 0000000..00d16a2 --- /dev/null +++ b/pkgs/simple-completion-language-server/default.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "simple-completion-language-server"; + version = "ff9f90bc96c347f284571bc6310bc31f95508d55"; + + src = fetchFromGitHub { + owner = "estin"; + repo = pname; + rev = version; + hash = "sha256-qybbZXjKzKcc6UXfAjwmkkB+qEUuGQXABRbMj7bNksM="; + }; + + cargoHash = "sha256-VTz2Fm+PRUPM5+u9D+2TzGGIEQwb1j0Lz0WRaQ5/Yzo="; + meta = with lib; { + description = "Language server to enable word completion and snippets for Helix editor"; + homepage = "https://github.com/estin/simple-completion-language-server"; + license = licenses.mit; + maintainers = ["Lillian-Violet"]; + }; +} diff --git a/pkgs/simple-completion-language-server/result b/pkgs/simple-completion-language-server/result new file mode 120000 index 0000000..5a7c687 --- /dev/null +++ b/pkgs/simple-completion-language-server/result @@ -0,0 +1 @@ +/nix/store/3l0wgxsvf5sz2q9sgyj0blc1ivzg808b-simple-completion-language-server-ff9f90bc96c347f284571bc6310bc31f95508d55 \ No newline at end of file From f909759031d7416c95eb5f3fae1bc4d104f26c70 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 1 May 2024 23:27:11 +0200 Subject: [PATCH 1810/2308] Add simple completion language server and snippets to helix --- home-manager/shared/shell/helix.nix | 32 ++++++++++++++++++++++--- home-manager/shared/shell/snippets.toml | 3 +++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 home-manager/shared/shell/snippets.toml diff --git a/home-manager/shared/shell/helix.nix b/home-manager/shared/shell/helix.nix index 9fc9e69..6a587da 100644 --- a/home-manager/shared/shell/helix.nix +++ b/home-manager/shared/shell/helix.nix @@ -36,14 +36,14 @@ language-id = "python"; auto-format = true; file-types = ["py"]; - language-servers = ["ruff"]; + language-servers = ["ruff" "scls"]; } { name = "typst"; language-id = "typst"; auto-format = false; file-types = ["typ"]; - language-servers = ["typst-lsp"]; + language-servers = ["typst-lsp" "scls"]; } { name = "rust"; @@ -51,7 +51,16 @@ auto-format = true; file-types = ["rs"]; roots = ["Cargo.lock"]; - language-servers = ["rust-analyzer"]; + language-servers = ["rust-analyzer" "scls"]; + } + { + name = "stub"; + scope = "text.stub"; + file-types = []; + shebangs = []; + roots = []; + auto-format = false; + language-servers = ["scls"]; } { name = "nix"; @@ -79,7 +88,24 @@ nil = { command = "nil"; }; + scls = { + command = "simple-completion-language-server"; + config = { + max_completion_items = 20; + snippets_first = true; + feature_words = true; + feature_snippets = true; + feature_unicode_input = true; + feature_paths = true; + }; + }; }; }; }; + home.file = { + "helix" = { + source = ./snippets.toml; + target = ".config/helix/external-snippets.toml"; + }; + }; } diff --git a/home-manager/shared/shell/snippets.toml b/home-manager/shared/shell/snippets.toml new file mode 100644 index 0000000..8ebea98 --- /dev/null +++ b/home-manager/shared/shell/snippets.toml @@ -0,0 +1,3 @@ +[[sources]] # list of sources to load +name = "friendly-snippets" # optional name shown on snippet description +git = "https://github.com/rafamadriz/friendly-snippets.git" # git repo with snippets collections \ No newline at end of file From aa7e9ac29c16f0c3cf709fc93f159fa045563158 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 1 May 2024 23:33:03 +0200 Subject: [PATCH 1811/2308] Also add scls to nix --- home-manager/shared/shell/helix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix.nix b/home-manager/shared/shell/helix.nix index 6a587da..ae6d948 100644 --- a/home-manager/shared/shell/helix.nix +++ b/home-manager/shared/shell/helix.nix @@ -68,7 +68,7 @@ auto-format = true; file-types = ["nix"]; roots = ["flake.lock" "flake.nix"]; - language-servers = ["nil"]; + language-servers = ["nil" "scls"]; formatter = { command = "alejandra"; args = ["-q"]; From 6f2f3bda95d0f5acb8920e906b9207f7ab8f5e76 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 10:02:32 +0200 Subject: [PATCH 1812/2308] replace neofetch with hyfetch --- home-manager/shared/default.nix | 1 + home-manager/shared/shell/hyfetch.nix | 17 +++++++++++++++++ home-manager/shared/shell/zsh.nix | 1 + 3 files changed, 19 insertions(+) create mode 100644 home-manager/shared/shell/hyfetch.nix diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 2329b2d..6a99e2a 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -12,6 +12,7 @@ ./shell/zsh.nix ./shell/starship.nix ./shell/eza.nix + ./shell/hyfetch.nix ]; home = { username = "lillian"; diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix new file mode 100644 index 0000000..c54a2a6 --- /dev/null +++ b/home-manager/shared/shell/hyfetch.nix @@ -0,0 +1,17 @@ +{ + config, + lib, + pkgs, + ... +}: { + programs.hyfetch = { + enable = true; + settings = { + preset = "trans"; + mode = "rgb"; + color_align = { + mode = "horizontal"; + }; + }; + }; +} diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index fcd99f8..f6ea06b 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -19,6 +19,7 @@ lh = "ls -lah"; cat = "bat"; tree = "tre"; + neofetch = "hyfetch"; }; plugins = [ { From de0fdb756d8cccabe17afed0bcfba6b5f6298003 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 10:04:24 +0200 Subject: [PATCH 1813/2308] did this miss some files? --- nixos/shared/packages/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 4c1de8a..c313bc0 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -34,7 +34,6 @@ home-manager htop killall - neofetch oh-my-zsh rsync tre-command From 814440e96a054478eea783ad3678b5b6e5a083ac Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 10:07:26 +0200 Subject: [PATCH 1814/2308] hyfetch doesn't work, let's see if it's settings --- home-manager/shared/shell/hyfetch.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix index c54a2a6..64e676d 100644 --- a/home-manager/shared/shell/hyfetch.nix +++ b/home-manager/shared/shell/hyfetch.nix @@ -6,12 +6,12 @@ }: { programs.hyfetch = { enable = true; - settings = { - preset = "trans"; - mode = "rgb"; - color_align = { - mode = "horizontal"; - }; - }; + # settings = { + # preset = "trans"; + # mode = "rgb"; + # color_align = { + # mode = "horizontal"; + # }; + # }; }; } From 0e554116db698a922381a8a87d3a963bc42cb5c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 11:11:12 +0200 Subject: [PATCH 1815/2308] Try and fix hyfetch and add zjstatus --- flake.lock | 119 +++++++++++++++++++++++++- flake.nix | 5 +- home-manager/shared/shell/hyfetch.nix | 13 ++- overlays/default.nix | 12 ++- 4 files changed, 139 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index d2f3ad2..d54eec1 100644 --- a/flake.lock +++ b/flake.lock @@ -163,6 +163,27 @@ "type": "github" } }, + "crane_4": { + "inputs": { + "nixpkgs": [ + "zjstatus", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1713979152, + "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=", + "owner": "ipetkov", + "repo": "crane", + "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -359,6 +380,24 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -713,6 +752,22 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1714091391, + "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -800,7 +855,8 @@ "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "zjstatus": "zjstatus" } }, "rust-analyzer-src": { @@ -845,6 +901,31 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "zjstatus", + "flake-utils" + ], + "nixpkgs": [ + "zjstatus", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714097613, + "narHash": "sha256-044xbpBszupqN3nl/CGOCJtTQ4O6Aca81mJpX45i8/I=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "2a42c742ab04b61d9b2f1edf392842cf9f27ebfd", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", @@ -946,6 +1027,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_4" @@ -963,6 +1059,27 @@ "repo": "flake-utils", "type": "github" } + }, + "zjstatus": { + "inputs": { + "crane": "crane_4", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_7", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1714117167, + "narHash": "sha256-Dw+x2AWL5BKmkZL1Aewlh8Elp+4bhsR0ukaukqnm2Uo=", + "owner": "dj95", + "repo": "zjstatus", + "rev": "cda2388764cc96832d7260e4114fc5c5c8699de3", + "type": "github" + }, + "original": { + "owner": "dj95", + "repo": "zjstatus", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7ffd836..4263779 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,8 @@ home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + zjstatus.url = "github:dj95/zjstatus"; + # Fix for steam cursor not being visible under wayland # Add any other flake you might need @@ -88,6 +90,7 @@ sops-nix, simple-nixos-mailserver, plasma-manager, + zjstatus, # linger, # pihole, lanzaboote, @@ -126,7 +129,7 @@ homeManagerModules = import ./modules/home-manager; # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs;}; + overlays = import ./overlays {inherit inputs zjstatus;}; # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix index 64e676d..5d7d1c5 100644 --- a/home-manager/shared/shell/hyfetch.nix +++ b/home-manager/shared/shell/hyfetch.nix @@ -6,12 +6,11 @@ }: { programs.hyfetch = { enable = true; - # settings = { - # preset = "trans"; - # mode = "rgb"; - # color_align = { - # mode = "horizontal"; - # }; - # }; + settings = { + preset = "transgender"; + color_align = { + mode = "horizontal"; + }; + }; }; } diff --git a/overlays/default.nix b/overlays/default.nix index 267ba4c..b56db9c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,9 @@ # This file defines overlays -{inputs, ...}: { +{ + inputs, + zjstatus, + ... +}: { # This one contains whatever you want to overlay # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays @@ -9,6 +13,12 @@ # }; }; + zjstatus = ( + final: prev: { + zjstatus = zjstatus.packages.${prev.system}.default; + } + ); + # This one brings our custom packages from the 'pkgs' directory additions = final: _prev: import ../pkgs { From 5887857babad782030570e3024bb8d96a081548e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 11:14:22 +0200 Subject: [PATCH 1816/2308] Copy over the hyfetch settings --- home-manager/shared/shell/hyfetch.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix index 5d7d1c5..0945e59 100644 --- a/home-manager/shared/shell/hyfetch.nix +++ b/home-manager/shared/shell/hyfetch.nix @@ -8,9 +8,13 @@ enable = true; settings = { preset = "transgender"; + mode = "rgb"; + light_dark = "dark"; + lightness = 0.65; color_align = { mode = "horizontal"; }; + backend = "neofetch"; }; }; } From e9dab03e3fa5b497b7b2d599bec84b5b3ff1ef05 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 11:21:29 +0200 Subject: [PATCH 1817/2308] add zjstatus to installed packages --- home-manager/shared/shell/zellij.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 00829e3..9ee6d6b 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -1,4 +1,11 @@ -{lib, ...}: { +{ + lib, + pkgs, + ... +}: { + home.packages = with pkgs; [ + zjstatus + ]; programs.zellij = { # This autostarts zellij on zsh start # TODO find specific settings for vscode to avoid From 84f0261121d003db834584df37e599b4546310ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 11:54:18 +0200 Subject: [PATCH 1818/2308] Let's try to install zjstatus like conduwuit --- flake.nix | 2 +- home-manager/shared/shell/zellij.nix | 34 ++++++++++++++++++++++++---- overlays/default.nix | 6 ----- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 4263779..219d683 100644 --- a/flake.nix +++ b/flake.nix @@ -129,7 +129,7 @@ homeManagerModules = import ./modules/home-manager; # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs zjstatus;}; + overlays = import ./overlays {inherit inputs;}; # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 9ee6d6b..66d14c7 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -1,6 +1,7 @@ { lib, pkgs, + inputs, ... }: { home.packages = with pkgs; [ @@ -11,12 +12,35 @@ # TODO find specific settings for vscode to avoid enable = true; enableZshIntegration = true; - }; + settings = { + session_serialization = true; + theme = "catppuccin-macchiato"; - home.file = { - "zellij" = { - source = ./zellij.kdl; - target = ".config/zellij/config.kdl"; + themes = { + catppuccin-macchiato = { + bg = "#5b6078"; + fg = "#cad3f5"; + red = "#ed8796"; + green = "#a6da95"; + blue = "#8aadf4"; + yellow = "#eed49f"; + magenta = "#f5bde6"; + orange = "#f5a97f"; + cyan = "#91d7e3"; + black = "#1e2030"; + white = "#cad3f5"; + }; + }; + pane = { + plugin.location = "${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm"; + }; }; }; + + # home.file = { + # "zellij" = { + # source = ./zellij.kdl; + # target = ".config/zellij/config.kdl"; + # }; + # }; } diff --git a/overlays/default.nix b/overlays/default.nix index b56db9c..bc1a9c0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -13,12 +13,6 @@ # }; }; - zjstatus = ( - final: prev: { - zjstatus = zjstatus.packages.${prev.system}.default; - } - ); - # This one brings our custom packages from the 'pkgs' directory additions = final: _prev: import ../pkgs { From b2f2eb5f10645346ecf8ce24a26b57b564636bc6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 11:55:25 +0200 Subject: [PATCH 1819/2308] Remove it from the overlays --- overlays/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index bc1a9c0..267ba4c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,9 +1,5 @@ # This file defines overlays -{ - inputs, - zjstatus, - ... -}: { +{inputs, ...}: { # This one contains whatever you want to overlay # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays From cd8b18c3eafa56fa63d7efda205902199bfe6bee Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 11:55:56 +0200 Subject: [PATCH 1820/2308] Remove that too --- home-manager/shared/shell/zellij.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 66d14c7..d5baed0 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -4,9 +4,6 @@ inputs, ... }: { - home.packages = with pkgs; [ - zjstatus - ]; programs.zellij = { # This autostarts zellij on zsh start # TODO find specific settings for vscode to avoid From 8b2312edf2e5503937094d49d9e10ac746fcaba4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 12:05:00 +0200 Subject: [PATCH 1821/2308] We need that space there not another nest --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index d5baed0..1639c36 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -29,7 +29,7 @@ }; }; pane = { - plugin.location = "${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm"; + "plugin location" = "${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm"; }; }; }; From 823371ccaa40319f4f6f24acf074cca04d48e719 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 12:09:15 +0200 Subject: [PATCH 1822/2308] Let's try this weird format instead --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 1639c36..e838363 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -29,7 +29,7 @@ }; }; pane = { - "plugin location" = "${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm"; + "plugin location=" = "file${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm"; }; }; }; From 8e0c718886119e1dee5953dc94380041bd12dc2b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 12:10:05 +0200 Subject: [PATCH 1823/2308] Forgot the : --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index e838363..1cbdd3b 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -29,7 +29,7 @@ }; }; pane = { - "plugin location=" = "file${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm"; + "plugin location=" = "file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm"; }; }; }; From 422321705ed50bcbcde60065355c8768b78f08ac Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 12:15:04 +0200 Subject: [PATCH 1824/2308] Let's try this config then --- home-manager/shared/shell/zellij.nix | 29 +++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 1cbdd3b..caae0f2 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -29,7 +29,34 @@ }; }; pane = { - "plugin location=" = "file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm"; + "plugin location= \"file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm\"" = { + format_left = "{mode} #[fg=#89B4FA,bold]{session}"; + format_center = "{tabs}"; + format_right = "{command_git_branch} {datetime}"; + format_space = ""; + + border_enabled = "false"; + border_char = "─"; + border_format = "#[fg=#6C7086]{char}"; + border_position = "top"; + + hide_frame_for_single_pane = "true"; + + mode_normal = "#[bg=blue] "; + mode_tmux = "#[bg=#ffc387] "; + + tab_normal = "#[fg=#6C7086] {name} "; + tab_active = "#[fg=#9399B2,bold,italic] {name} "; + + command_git_branch_command = "git rev-parse --abbrev-ref HEAD"; + command_git_branch_format = "#[fg=blue] {stdout} "; + command_git_branch_interval = "10"; + command_git_branch_rendermode = "static"; + + datetime = "#[fg=#6C7086,bold] {format} "; + datetime_format = "%A, %d %b %Y %H:%M"; + datetime_timezone = "Europe/Amsterdam"; + }; }; }; }; From 1ad3ad4945a2d3311a0b19c10979ea9f9613fc92 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 12:24:29 +0200 Subject: [PATCH 1825/2308] Let's try it with a file, else we'll have to make it a string in the config file --- home-manager/shared/shell/zellij.kdl | 35 +++++++++++ home-manager/shared/shell/zellij.nix | 90 ++++++++++++++-------------- 2 files changed, 80 insertions(+), 45 deletions(-) diff --git a/home-manager/shared/shell/zellij.kdl b/home-manager/shared/shell/zellij.kdl index 15b14d5..10711ed 100644 --- a/home-manager/shared/shell/zellij.kdl +++ b/home-manager/shared/shell/zellij.kdl @@ -29,3 +29,38 @@ themes { white "#cad3f5" } } +pane = { + default_tab_template { + children + pane size=1 borderless=true { + plugin location="file:${inputs.conduit.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + format_left "{mode} #[fg=cyan,bold]{session}" + format_center "{tabs}" + format_right "{command_git_branch} {datetime}" + format_space "" + + border_enabled "false" + border_char "─" + border_format "#[fg=green]{char}" + border_position "top" + + hide_frame_for_single_pane "true" + + mode_normal "#[bg=blue] " + mode_tmux "#[bg=blue] " + + tab_normal "#[fg=green] {name} " + tab_active "#[fg=red,bold,italic] {name} " + + command_git_branch_command "git rev-parse --abbrev-ref HEAD" + command_git_branch_format "#[fg=blue] {stdout} " + command_git_branch_interval "10" + command_git_branch_rendermode "static" + + datetime "#[fg=#green,bold] {format} " + datetime_format "%A, %d %b %Y %H:%M" + datetime_timezone "Europe/Berlin" + } + } + } +} \ No newline at end of file diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index caae0f2..e4e4ba7 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -13,58 +13,58 @@ session_serialization = true; theme = "catppuccin-macchiato"; - themes = { - catppuccin-macchiato = { - bg = "#5b6078"; - fg = "#cad3f5"; - red = "#ed8796"; - green = "#a6da95"; - blue = "#8aadf4"; - yellow = "#eed49f"; - magenta = "#f5bde6"; - orange = "#f5a97f"; - cyan = "#91d7e3"; - black = "#1e2030"; - white = "#cad3f5"; - }; - }; - pane = { - "plugin location= \"file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm\"" = { - format_left = "{mode} #[fg=#89B4FA,bold]{session}"; - format_center = "{tabs}"; - format_right = "{command_git_branch} {datetime}"; - format_space = ""; + # themes = { + # catppuccin-macchiato = { + # bg = "#5b6078"; + # fg = "#cad3f5"; + # red = "#ed8796"; + # green = "#a6da95"; + # blue = "#8aadf4"; + # yellow = "#eed49f"; + # magenta = "#f5bde6"; + # orange = "#f5a97f"; + # cyan = "#91d7e3"; + # black = "#1e2030"; + # white = "#cad3f5"; + # }; + # }; + # pane = { + # "plugin location= \"file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm\"" = { + # format_left = "{mode} #[fg=#89B4FA,bold]{session}"; + # format_center = "{tabs}"; + # format_right = "{command_git_branch} {datetime}"; + # format_space = ""; - border_enabled = "false"; - border_char = "─"; - border_format = "#[fg=#6C7086]{char}"; - border_position = "top"; + # border_enabled = "false"; + # border_char = "─"; + # border_format = "#[fg=#6C7086]{char}"; + # border_position = "top"; - hide_frame_for_single_pane = "true"; + # hide_frame_for_single_pane = "true"; - mode_normal = "#[bg=blue] "; - mode_tmux = "#[bg=#ffc387] "; + # mode_normal = "#[bg=blue] "; + # mode_tmux = "#[bg=#ffc387] "; - tab_normal = "#[fg=#6C7086] {name} "; - tab_active = "#[fg=#9399B2,bold,italic] {name} "; + # tab_normal = "#[fg=#6C7086] {name} "; + # tab_active = "#[fg=#9399B2,bold,italic] {name} "; - command_git_branch_command = "git rev-parse --abbrev-ref HEAD"; - command_git_branch_format = "#[fg=blue] {stdout} "; - command_git_branch_interval = "10"; - command_git_branch_rendermode = "static"; + # command_git_branch_command = "git rev-parse --abbrev-ref HEAD"; + # command_git_branch_format = "#[fg=blue] {stdout} "; + # command_git_branch_interval = "10"; + # command_git_branch_rendermode = "static"; - datetime = "#[fg=#6C7086,bold] {format} "; - datetime_format = "%A, %d %b %Y %H:%M"; - datetime_timezone = "Europe/Amsterdam"; - }; - }; + # datetime = "#[fg=#6C7086,bold] {format} "; + # datetime_format = "%A, %d %b %Y %H:%M"; + # datetime_timezone = "Europe/Amsterdam"; + # }; + # }; }; }; - # home.file = { - # "zellij" = { - # source = ./zellij.kdl; - # target = ".config/zellij/config.kdl"; - # }; - # }; + home.file = { + "zellij" = { + source = ./zellij.kdl; + target = ".config/zellij/config.kdl"; + }; + }; } From 02409ba62a8ccbac9609ce6d7020914b674147d4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 12:26:09 +0200 Subject: [PATCH 1826/2308] Don't make the file twice --- home-manager/shared/shell/zellij.nix | 86 ++++++++++++++-------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index e4e4ba7..2faa6f3 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -9,56 +9,56 @@ # TODO find specific settings for vscode to avoid enable = true; enableZshIntegration = true; - settings = { - session_serialization = true; - theme = "catppuccin-macchiato"; + # settings = { + # session_serialization = true; + # theme = "catppuccin-macchiato"; - # themes = { - # catppuccin-macchiato = { - # bg = "#5b6078"; - # fg = "#cad3f5"; - # red = "#ed8796"; - # green = "#a6da95"; - # blue = "#8aadf4"; - # yellow = "#eed49f"; - # magenta = "#f5bde6"; - # orange = "#f5a97f"; - # cyan = "#91d7e3"; - # black = "#1e2030"; - # white = "#cad3f5"; - # }; - # }; - # pane = { - # "plugin location= \"file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm\"" = { - # format_left = "{mode} #[fg=#89B4FA,bold]{session}"; - # format_center = "{tabs}"; - # format_right = "{command_git_branch} {datetime}"; - # format_space = ""; + # themes = { + # catppuccin-macchiato = { + # bg = "#5b6078"; + # fg = "#cad3f5"; + # red = "#ed8796"; + # green = "#a6da95"; + # blue = "#8aadf4"; + # yellow = "#eed49f"; + # magenta = "#f5bde6"; + # orange = "#f5a97f"; + # cyan = "#91d7e3"; + # black = "#1e2030"; + # white = "#cad3f5"; + # }; + # }; + # pane = { + # "plugin location= \"file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm\"" = { + # format_left = "{mode} #[fg=#89B4FA,bold]{session}"; + # format_center = "{tabs}"; + # format_right = "{command_git_branch} {datetime}"; + # format_space = ""; - # border_enabled = "false"; - # border_char = "─"; - # border_format = "#[fg=#6C7086]{char}"; - # border_position = "top"; + # border_enabled = "false"; + # border_char = "─"; + # border_format = "#[fg=#6C7086]{char}"; + # border_position = "top"; - # hide_frame_for_single_pane = "true"; + # hide_frame_for_single_pane = "true"; - # mode_normal = "#[bg=blue] "; - # mode_tmux = "#[bg=#ffc387] "; + # mode_normal = "#[bg=blue] "; + # mode_tmux = "#[bg=#ffc387] "; - # tab_normal = "#[fg=#6C7086] {name} "; - # tab_active = "#[fg=#9399B2,bold,italic] {name} "; + # tab_normal = "#[fg=#6C7086] {name} "; + # tab_active = "#[fg=#9399B2,bold,italic] {name} "; - # command_git_branch_command = "git rev-parse --abbrev-ref HEAD"; - # command_git_branch_format = "#[fg=blue] {stdout} "; - # command_git_branch_interval = "10"; - # command_git_branch_rendermode = "static"; + # command_git_branch_command = "git rev-parse --abbrev-ref HEAD"; + # command_git_branch_format = "#[fg=blue] {stdout} "; + # command_git_branch_interval = "10"; + # command_git_branch_rendermode = "static"; - # datetime = "#[fg=#6C7086,bold] {format} "; - # datetime_format = "%A, %d %b %Y %H:%M"; - # datetime_timezone = "Europe/Amsterdam"; - # }; - # }; - }; + # datetime = "#[fg=#6C7086,bold] {format} "; + # datetime_format = "%A, %d %b %Y %H:%M"; + # datetime_timezone = "Europe/Amsterdam"; + # }; + # }; + # }; }; home.file = { From 70d7b91dc7bd3b2473e29e23579d39d100c8d28e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 13:12:03 +0200 Subject: [PATCH 1827/2308] Let's try the string method --- home-manager/shared/shell/zellij.nix | 125 ++++++++++++++++----------- 1 file changed, 73 insertions(+), 52 deletions(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 2faa6f3..de05b12 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -3,67 +3,88 @@ pkgs, inputs, ... -}: { +}: let + config = + pkgs.writeText "zellij.kdl" + '' + session_serialization true + theme "catppuccin-macchiato" + + themes { + catppuccin-mocha { + bg "#585b70" // Surface2 + fg "#cdd6f4" + red "#f38ba8" + green "#a6e3a1" + blue "#89b4fa" + yellow "#f9e2af" + magenta "#f5c2e7" // Pink + orange "#fab387" // Peach + cyan "#89dceb" // Sky + black "#181825" // Mantle + white "#cdd6f4" + } + catppuccin-macchiato { + bg "#5b6078" // Surface2 + fg "#cad3f5" + red "#ed8796" + green "#a6da95" + blue "#8aadf4" + yellow "#eed49f" + magenta "#f5bde6" // Pink + orange "#f5a97f" // Peach + cyan "#91d7e3" // Sky + black "#1e2030" // Mantle + white "#cad3f5" + } + } + pane = { + default_tab_template { + children + pane size=1 borderless=true { + plugin location="file:${inputs.conduit.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + format_left "{mode} #[fg=cyan,bold]{session}" + format_center "{tabs}" + format_right "{command_git_branch} {datetime}" + format_space "" + + border_enabled "false" + border_char "─" + border_format "#[fg=green]{char}" + border_position "top" + + hide_frame_for_single_pane "true" + + mode_normal "#[bg=blue] " + mode_tmux "#[bg=blue] " + + tab_normal "#[fg=green] {name} " + tab_active "#[fg=red,bold,italic] {name} " + + command_git_branch_command "git rev-parse --abbrev-ref HEAD" + command_git_branch_format "#[fg=blue] {stdout} " + command_git_branch_interval "10" + command_git_branch_rendermode "static" + + datetime "#[fg=#green,bold] {format} " + datetime_format "%A, %d %b %Y %H:%M" + datetime_timezone "Europe/Berlin" + } + } + } + } + ''; +in { programs.zellij = { # This autostarts zellij on zsh start # TODO find specific settings for vscode to avoid enable = true; enableZshIntegration = true; - # settings = { - # session_serialization = true; - # theme = "catppuccin-macchiato"; - - # themes = { - # catppuccin-macchiato = { - # bg = "#5b6078"; - # fg = "#cad3f5"; - # red = "#ed8796"; - # green = "#a6da95"; - # blue = "#8aadf4"; - # yellow = "#eed49f"; - # magenta = "#f5bde6"; - # orange = "#f5a97f"; - # cyan = "#91d7e3"; - # black = "#1e2030"; - # white = "#cad3f5"; - # }; - # }; - # pane = { - # "plugin location= \"file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm\"" = { - # format_left = "{mode} #[fg=#89B4FA,bold]{session}"; - # format_center = "{tabs}"; - # format_right = "{command_git_branch} {datetime}"; - # format_space = ""; - - # border_enabled = "false"; - # border_char = "─"; - # border_format = "#[fg=#6C7086]{char}"; - # border_position = "top"; - - # hide_frame_for_single_pane = "true"; - - # mode_normal = "#[bg=blue] "; - # mode_tmux = "#[bg=#ffc387] "; - - # tab_normal = "#[fg=#6C7086] {name} "; - # tab_active = "#[fg=#9399B2,bold,italic] {name} "; - - # command_git_branch_command = "git rev-parse --abbrev-ref HEAD"; - # command_git_branch_format = "#[fg=blue] {stdout} "; - # command_git_branch_interval = "10"; - # command_git_branch_rendermode = "static"; - - # datetime = "#[fg=#6C7086,bold] {format} "; - # datetime_format = "%A, %d %b %Y %H:%M"; - # datetime_timezone = "Europe/Amsterdam"; - # }; - # }; - # }; }; home.file = { "zellij" = { - source = ./zellij.kdl; + source = "${config}/app/config.kdl"; target = ".config/zellij/config.kdl"; }; }; From 0d89d227a58551942e26f8438e2a1bcb12678297 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 13:16:25 +0200 Subject: [PATCH 1828/2308] Let's not build conduwuit for a zellij plugin --- home-manager/shared/shell/zellij.kdl | 2 +- home-manager/shared/shell/zellij.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/zellij.kdl b/home-manager/shared/shell/zellij.kdl index 10711ed..76d6ee4 100644 --- a/home-manager/shared/shell/zellij.kdl +++ b/home-manager/shared/shell/zellij.kdl @@ -33,7 +33,7 @@ pane = { default_tab_template { children pane size=1 borderless=true { - plugin location="file:${inputs.conduit.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "{mode} #[fg=cyan,bold]{session}" format_center "{tabs}" format_right "{command_git_branch} {datetime}" diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index de05b12..a49f915 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -42,7 +42,7 @@ default_tab_template { children pane size=1 borderless=true { - plugin location="file:${inputs.conduit.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "{mode} #[fg=cyan,bold]{session}" format_center "{tabs}" format_right "{command_git_branch} {datetime}" From 2cb0384ac1bdb322bc1d152d4ff42ffb6d9a75ab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 13:19:12 +0200 Subject: [PATCH 1829/2308] Should probably use consistent naming --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index a49f915..3b656c2 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -5,7 +5,7 @@ ... }: let config = - pkgs.writeText "zellij.kdl" + pkgs.writeText "config.kdl" '' session_serialization true theme "catppuccin-macchiato" From 5aa0d47180f1e3198548fc1ba9ec623945b2c812 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 13:24:16 +0200 Subject: [PATCH 1830/2308] Fix the path for the config file --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 3b656c2..0d424c4 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -84,7 +84,7 @@ in { home.file = { "zellij" = { - source = "${config}/app/config.kdl"; + source = "${config}"; target = ".config/zellij/config.kdl"; }; }; From b088c9f56466d6019b15c49a11cc31366924438f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 13:25:58 +0200 Subject: [PATCH 1831/2308] Little wrong format there --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 0d424c4..ee3453e 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -38,7 +38,7 @@ white "#cad3f5" } } - pane = { + layout { default_tab_template { children pane size=1 borderless=true { From 499d9e8f78249411acf6bcbb09322c4ec0e51fb5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 13:41:41 +0200 Subject: [PATCH 1832/2308] They're two different files --- home-manager/shared/shell/zellij.kdl | 35 ---------------------- home-manager/shared/shell/zellij.nix | 45 +++++++--------------------- 2 files changed, 10 insertions(+), 70 deletions(-) diff --git a/home-manager/shared/shell/zellij.kdl b/home-manager/shared/shell/zellij.kdl index 76d6ee4..6f552c3 100644 --- a/home-manager/shared/shell/zellij.kdl +++ b/home-manager/shared/shell/zellij.kdl @@ -28,39 +28,4 @@ themes { black "#1e2030" // Mantle white "#cad3f5" } -} -pane = { - default_tab_template { - children - pane size=1 borderless=true { - plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { - format_left "{mode} #[fg=cyan,bold]{session}" - format_center "{tabs}" - format_right "{command_git_branch} {datetime}" - format_space "" - - border_enabled "false" - border_char "─" - border_format "#[fg=green]{char}" - border_position "top" - - hide_frame_for_single_pane "true" - - mode_normal "#[bg=blue] " - mode_tmux "#[bg=blue] " - - tab_normal "#[fg=green] {name} " - tab_active "#[fg=red,bold,italic] {name} " - - command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=blue] {stdout} " - command_git_branch_interval "10" - command_git_branch_rendermode "static" - - datetime "#[fg=#green,bold] {format} " - datetime_format "%A, %d %b %Y %H:%M" - datetime_timezone "Europe/Berlin" - } - } - } } \ No newline at end of file diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index ee3453e..a8656e8 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -4,40 +4,9 @@ inputs, ... }: let - config = - pkgs.writeText "config.kdl" + layout = + pkgs.writeText "default.kdl" '' - session_serialization true - theme "catppuccin-macchiato" - - themes { - catppuccin-mocha { - bg "#585b70" // Surface2 - fg "#cdd6f4" - red "#f38ba8" - green "#a6e3a1" - blue "#89b4fa" - yellow "#f9e2af" - magenta "#f5c2e7" // Pink - orange "#fab387" // Peach - cyan "#89dceb" // Sky - black "#181825" // Mantle - white "#cdd6f4" - } - catppuccin-macchiato { - bg "#5b6078" // Surface2 - fg "#cad3f5" - red "#ed8796" - green "#a6da95" - blue "#8aadf4" - yellow "#eed49f" - magenta "#f5bde6" // Pink - orange "#f5a97f" // Peach - cyan "#91d7e3" // Sky - black "#1e2030" // Mantle - white "#cad3f5" - } - } layout { default_tab_template { children @@ -83,8 +52,14 @@ in { }; home.file = { - "zellij" = { - source = "${config}"; + "layout" = { + source = "${layout}"; + target = ".config/zellij/default.kdl"; + }; + }; + home.file = { + "config" = { + source = ./zellij.kdl; target = ".config/zellij/config.kdl"; }; }; From 4a1086517475fc4ef3f31ac2484f5572c88cee03 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 13:49:07 +0200 Subject: [PATCH 1833/2308] Change the layout a bit --- home-manager/shared/shell/zellij.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index a8656e8..68bcc30 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -17,12 +17,12 @@ format_right "{command_git_branch} {datetime}" format_space "" - border_enabled "false" + border_enabled "true" border_char "─" border_format "#[fg=green]{char}" border_position "top" - hide_frame_for_single_pane "true" + hide_frame_for_single_pane "false" mode_normal "#[bg=blue] " mode_tmux "#[bg=blue] " @@ -36,8 +36,8 @@ command_git_branch_rendermode "static" datetime "#[fg=#green,bold] {format} " - datetime_format "%A, %d %b %Y %H:%M" - datetime_timezone "Europe/Berlin" + datetime_format "%YYYY-%MM-%DD %H:%M" + datetime_timezone "Europe/Amsterdam" } } } From 1c67762f10b34714e8ef6996e3bf40616c9bfefd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 13:50:29 +0200 Subject: [PATCH 1834/2308] Let's try this now --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 68bcc30..7a9ff41 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -36,7 +36,7 @@ command_git_branch_rendermode "static" datetime "#[fg=#green,bold] {format} " - datetime_format "%YYYY-%MM-%DD %H:%M" + datetime_format "%Y-%M-%d %H:%M" datetime_timezone "Europe/Amsterdam" } } From ebbd8f3c84e2f3b1fc17f72c09a488be19b4d239 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 13:52:28 +0200 Subject: [PATCH 1835/2308] Give me a border --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 7a9ff41..783c582 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -10,7 +10,7 @@ layout { default_tab_template { children - pane size=1 borderless=true { + pane size=1 borderless=false { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "{mode} #[fg=cyan,bold]{session}" format_center "{tabs}" From bd320b9903ba0fb16c62555a732b9ab24de32a34 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 14:02:19 +0200 Subject: [PATCH 1836/2308] Add the default stuff too --- home-manager/shared/shell/zellij.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 783c582..dc479a1 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -8,6 +8,14 @@ pkgs.writeText "default.kdl" '' layout { + pane size=1 borderless=true { + plugin location="tab-bar" + } + pane + pane size=2 borderless=true { + plugin location="status-bar" + } + default_tab_template { children pane size=1 borderless=false { From 746b9dea57b946c8cf586cc19fe35bd95a3987ae Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 14:04:01 +0200 Subject: [PATCH 1837/2308] This is what the wiki says, idk if it'll work --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index dc479a1..257c597 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -62,7 +62,7 @@ in { home.file = { "layout" = { source = "${layout}"; - target = ".config/zellij/default.kdl"; + target = ".config/zellij/config/layouts/default.kdl"; }; }; home.file = { From 54b8fa474cf0919abd477c153897a8f7faedc919 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 14:13:20 +0200 Subject: [PATCH 1838/2308] let's see if this works to show the plugin --- home-manager/shared/shell/zellij.nix | 79 +++++++++++++--------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 257c597..2a99171 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -7,48 +7,45 @@ layout = pkgs.writeText "default.kdl" '' - layout { - pane size=1 borderless=true { - plugin location="tab-bar" - } - pane - pane size=2 borderless=true { - plugin location="status-bar" - } - - default_tab_template { - children - pane size=1 borderless=false { - plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { - format_left "{mode} #[fg=cyan,bold]{session}" - format_center "{tabs}" - format_right "{command_git_branch} {datetime}" - format_space "" - - border_enabled "true" - border_char "─" - border_format "#[fg=green]{char}" - border_position "top" - - hide_frame_for_single_pane "false" - - mode_normal "#[bg=blue] " - mode_tmux "#[bg=blue] " - - tab_normal "#[fg=green] {name} " - tab_active "#[fg=red,bold,italic] {name} " - - command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=blue] {stdout} " - command_git_branch_interval "10" - command_git_branch_rendermode "static" - - datetime "#[fg=#green,bold] {format} " - datetime_format "%Y-%M-%d %H:%M" - datetime_timezone "Europe/Amsterdam" - } - } + layout { + pane size=1 borderless=true { + plugin location="tab-bar" + } + pane size=2 borderless=true { + plugin location="status-bar" + } + + + pane size=1 borderless=false { + plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + format_left "{mode} #[fg=cyan,bold]{session}" + format_center "{tabs}" + format_right "{command_git_branch} {datetime}" + format_space "" + + border_enabled "true" + border_char "─" + border_format "#[fg=green]{char}" + border_position "top" + + hide_frame_for_single_pane "false" + + mode_normal "#[bg=blue] " + mode_tmux "#[bg=blue] " + + tab_normal "#[fg=green] {name} " + tab_active "#[fg=red,bold,italic] {name} " + + command_git_branch_command "git rev-parse --abbrev-ref HEAD" + command_git_branch_format "#[fg=blue] {stdout} " + command_git_branch_interval "10" + command_git_branch_rendermode "static" + + datetime "#[fg=#green,bold] {format} " + datetime_format "%Y-%M-%d %H:%M" + datetime_timezone "Europe/Amsterdam" } + } } ''; in { From 473142eb13ee0f28c032d187f96e23f2799d73eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 14:18:50 +0200 Subject: [PATCH 1839/2308] Let's try again shall we --- home-manager/shared/shell/zellij.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 2a99171..a0887b3 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -7,16 +7,16 @@ layout = pkgs.writeText "default.kdl" '' - layout { - pane size=1 borderless=true { - plugin location="tab-bar" - } - pane size=2 borderless=true { - plugin location="status-bar" - } - - - pane size=1 borderless=false { + layout { + pane size=1 borderless=true { + plugin location="tab-bar" + } + pane + pane size=2 borderless=true { + plugin location="status-bar" + } + children + pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "{mode} #[fg=cyan,bold]{session}" format_center "{tabs}" From ea963cff84a221afce0625f6ac7d1963e4f32f56 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 14:28:40 +0200 Subject: [PATCH 1840/2308] Let's try this location to load the layout by default --- home-manager/shared/shell/zellij.nix | 39 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index a0887b3..7825dc1 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -19,31 +19,30 @@ pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "{mode} #[fg=cyan,bold]{session}" - format_center "{tabs}" - format_right "{command_git_branch} {datetime}" - format_space "" + format_right "{command_git_branch} {datetime}" + format_space "" - border_enabled "true" - border_char "─" - border_format "#[fg=green]{char}" - border_position "top" + border_enabled "true" + border_char "─" + border_format "#[fg=green]{char}" + border_position "top" - hide_frame_for_single_pane "false" + hide_frame_for_single_pane "false" - mode_normal "#[bg=blue] " - mode_tmux "#[bg=blue] " + mode_normal "#[bg=blue] " + mode_tmux "#[bg=blue] " - tab_normal "#[fg=green] {name} " - tab_active "#[fg=red,bold,italic] {name} " + tab_normal "#[fg=green] {name} " + tab_active "#[fg=red,bold,italic] {name} " - command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=blue] {stdout} " - command_git_branch_interval "10" - command_git_branch_rendermode "static" + command_git_branch_command "git rev-parse --abbrev-ref HEAD" + command_git_branch_format "#[fg=blue] {stdout} " + command_git_branch_interval "10" + command_git_branch_rendermode "static" - datetime "#[fg=#green,bold] {format} " - datetime_format "%Y-%M-%d %H:%M" - datetime_timezone "Europe/Amsterdam" + datetime "#[fg=#green,bold] {format} " + datetime_format "%Y-%M-%d %H:%M" + datetime_timezone "Europe/Amsterdam" } } } @@ -59,7 +58,7 @@ in { home.file = { "layout" = { source = "${layout}"; - target = ".config/zellij/config/layouts/default.kdl"; + target = ".config/zellij/layouts/default.kdl"; }; }; home.file = { From 0816c57dd9f20e5c8d15fc6946f5d254fa621674 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 14:48:42 +0200 Subject: [PATCH 1841/2308] Let's try this layout and replace the tab bar after --- home-manager/shared/shell/zellij.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 7825dc1..191b852 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -19,6 +19,7 @@ pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "{mode} #[fg=cyan,bold]{session}" + format_center "{tabs}" format_right "{command_git_branch} {datetime}" format_space "" @@ -32,8 +33,23 @@ mode_normal "#[bg=blue] " mode_tmux "#[bg=blue] " - tab_normal "#[fg=green] {name} " - tab_active "#[fg=red,bold,italic] {name} " + // formatting for inactive tabs + tab_normal "#[fg=green] {index} :: {name} " + tab_normal_fullscreen "#[fg=green] {index} :: {name} [] " + tab_normal_sync "#[fg=green] {index} :: {name} <> " + + // formatting for the current active tab + tab_active "#[fg=blue,bold,italic] {name} {floating_indicator}" + tab_active_fullscreen "#[fg=blue,bold,italic] {name} {fullscreen_indicator}" + tab_active_sync "#[fg=blue,bold,italic] {name} {sync_indicator}" + + // separator between the tabs + tab_separator "#[fg=green,bg=orange] | " + + // indicators + tab_sync_indicator "<> " + tab_fullscreen_indicator "[] " + tab_floating_indicator "⬚ " command_git_branch_command "git rev-parse --abbrev-ref HEAD" command_git_branch_format "#[fg=blue] {stdout} " From 4baf84a0f20f989da2a0f467fffea78be26cb59b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 14:54:57 +0200 Subject: [PATCH 1842/2308] Change some colours --- home-manager/shared/shell/zellij.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 191b852..69297ce 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -18,10 +18,10 @@ children pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { - format_left "{mode} #[fg=cyan,bold]{session}" - format_center "{tabs}" + format_left "{mode} Zellij #[fg=yellow,bold]({session})" + format_left "{tabs}" format_right "{command_git_branch} {datetime}" - format_space "" + format_space " " border_enabled "true" border_char "─" @@ -39,9 +39,9 @@ tab_normal_sync "#[fg=green] {index} :: {name} <> " // formatting for the current active tab - tab_active "#[fg=blue,bold,italic] {name} {floating_indicator}" - tab_active_fullscreen "#[fg=blue,bold,italic] {name} {fullscreen_indicator}" - tab_active_sync "#[fg=blue,bold,italic] {name} {sync_indicator}" + tab_active "#[fg=white,bold,italic] {name} {floating_indicator}" + tab_active_fullscreen "#[fg=white,bold,italic] {name} {fullscreen_indicator}" + tab_active_sync "#[fg=white,bold,italic] {name} {sync_indicator}" // separator between the tabs tab_separator "#[fg=green,bg=orange] | " @@ -52,11 +52,11 @@ tab_floating_indicator "⬚ " command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=blue] {stdout} " + command_git_branch_format "#[fg=yellow] {stdout} " command_git_branch_interval "10" command_git_branch_rendermode "static" - datetime "#[fg=#green,bold] {format} " + datetime "#[fg=#yellow,bold] {format} " datetime_format "%Y-%M-%d %H:%M" datetime_timezone "Europe/Amsterdam" } From 881b79887c4db3e4bbbbabfa4f73a57713db9d6e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 14:56:21 +0200 Subject: [PATCH 1843/2308] It won't show both left boo --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 69297ce..4145855 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -19,7 +19,7 @@ pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "{mode} Zellij #[fg=yellow,bold]({session})" - format_left "{tabs}" + format_center "{tabs}" format_right "{command_git_branch} {datetime}" format_space " " From d4372d37aa6009fdc5c33c6bfe6b08ad757c5956 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 15:31:43 +0200 Subject: [PATCH 1844/2308] let's replace the tab bar --- home-manager/shared/shell/zellij.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 4145855..d149812 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -8,14 +8,10 @@ pkgs.writeText "default.kdl" '' layout { - pane size=1 borderless=true { - plugin location="tab-bar" - } - pane - pane size=2 borderless=true { - plugin location="status-bar" - } - children + // pane size=1 borderless=true { + // plugin location="tab-bar" + //} + pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "{mode} Zellij #[fg=yellow,bold]({session})" @@ -61,6 +57,10 @@ datetime_timezone "Europe/Amsterdam" } } + pane + pane size=2 borderless=true { + plugin location="status-bar" + } } ''; in { From 05c019326883bc2637441331c66a660bd1b9cbba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 May 2024 15:35:25 +0200 Subject: [PATCH 1845/2308] don't use the minute for the month --- home-manager/shared/shell/zellij.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index d149812..3835392 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -53,7 +53,7 @@ command_git_branch_rendermode "static" datetime "#[fg=#yellow,bold] {format} " - datetime_format "%Y-%M-%d %H:%M" + datetime_format "%Y-%m-%d %H:%M" datetime_timezone "Europe/Amsterdam" } } From 796cc9c5c609dae369d4a47dff9a22900ad43d4b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 May 2024 10:24:47 +0200 Subject: [PATCH 1846/2308] Update plasma config --- .../package-configs/plasma-desktop.nix | 1326 +++++++++-------- 1 file changed, 666 insertions(+), 660 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 6324947..6d7f175 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -244,682 +244,688 @@ "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/org.kde.spectacle.desktop"."RecordRegion" = []; + "services/org.kde.spectacle.desktop"."RecordScreen" = []; "services/org.kde.spectacle.desktop"."RecordWindow" = []; "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "Meta+Print" "Ctrl+!"]; "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "Meta+Print" "Ctrl+!"]; "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { - "baloofilerc"."General"."dbVersion".value = 2; - "baloofilerc"."General"."exclude filters".value = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; - "baloofilerc"."General"."exclude filters version".value = 8; - "dolphinrc"."ExtractDialog"."1536x864 screen: Height".value = 560; - "dolphinrc"."ExtractDialog"."1536x864 screen: Width".value = 1024; - "dolphinrc"."ExtractDialog"."DirHistory[$e]".value = "/home/"; - "dolphinrc"."General"."RememberOpenedTabs".value = false; - "dolphinrc"."IconsMode"."PreviewSize".value = 80; - "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize".value = false; - "dolphinrc"."KFileDialog Settings"."Places Icons Static Size".value = 22; - "dolphinrc"."KFileDialog Settings"."detailViewIconSize".value = 16; - "dolphinrc"."PreviewSettings"."Plugins".value = "mobithumbnail,fontthumbnail,ebookthumbnail,kraorathumbnail,jpegthumbnail,windowsexethumbnail,comicbookthumbnail,djvuthumbnail,opendocumentthumbnail,windowsimagethumbnail,exrthumbnail,audiothumbnail,cursorthumbnail,svgthumbnail,blenderthumbnail,gsthumbnail,rawthumbnail,ffmpegthumbs,imagethumbnail,directorythumbnail"; - "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12".value = "Default"; - "kactivitymanagerdrc"."main"."currentActivity".value = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation".value = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll".value = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick".value = true; - "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation".value = true; - "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."NaturalScroll".value = true; - "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."TapToClick".value = true; - "kcminputrc"."Tmp"."update_info".value = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; - "kded5rc"."Module-browserintegrationreminder"."autoload".value = false; - "kded5rc"."Module-device_automounter"."autoload".value = false; - "kded5rc"."PlasmaBrowserIntegration"."shownCount".value = 1; - "kdeglobals"."General"."AccentColor".value = "184,117,220"; - "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions".value = true; - "kdeglobals"."General"."BrowserApplication".value = "firefox.desktop"; - "kdeglobals"."General"."LastUsedCustomAccentColor".value = "184,117,220"; - "kdeglobals"."KDE"."AnimationDurationFactor".value = 0.7071067811865475; - "kdeglobals"."KDE"."ShowDeleteCommand".value = false; - "kdeglobals"."KDE"."SingleClick".value = false; - "kdeglobals"."KFileDialog Settings"."Allow Expansion".value = false; - "kdeglobals"."KFileDialog Settings"."Automatically select filename extension".value = true; - "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation".value = false; - "kdeglobals"."KFileDialog Settings"."Decoration position".value = 2; - "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode".value = 5; - "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode".value = 5; - "kdeglobals"."KFileDialog Settings"."Show Bookmarks".value = false; - "kdeglobals"."KFileDialog Settings"."Show Full Path".value = false; - "kdeglobals"."KFileDialog Settings"."Show Inline Previews".value = true; - "kdeglobals"."KFileDialog Settings"."Show Preview".value = false; - "kdeglobals"."KFileDialog Settings"."Show Speedbar".value = true; - "kdeglobals"."KFileDialog Settings"."Show hidden files".value = false; - "kdeglobals"."KFileDialog Settings"."Sort by".value = "Date"; - "kdeglobals"."KFileDialog Settings"."Sort directories first".value = true; - "kdeglobals"."KFileDialog Settings"."Sort hidden files last".value = false; - "kdeglobals"."KFileDialog Settings"."Sort reversed".value = false; - "kdeglobals"."KFileDialog Settings"."Speedbar Width".value = 138; - "kdeglobals"."KFileDialog Settings"."View Style".value = "DetailTree"; - "kdeglobals"."KShortcutsDialog Settings"."Dialog Size".value = "600,480"; - "kdeglobals"."PreviewSettings"."MaximumRemoteSize".value = 0; - "kdeglobals"."WM"."activeBackground".value = "49,54,59"; - "kdeglobals"."WM"."activeBlend".value = "252,252,252"; - "kdeglobals"."WM"."activeForeground".value = "252,252,252"; - "kdeglobals"."WM"."inactiveBackground".value = "42,46,50"; - "kdeglobals"."WM"."inactiveBlend".value = "161,169,177"; - "kdeglobals"."WM"."inactiveForeground".value = "161,169,177"; - "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name".value = "Activity Manager"; - "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name".value = "Keyboard Layout Switcher"; - "kglobalshortcutsrc"."kaccess"."_k_friendly_name".value = "Accessibility"; - "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name".value = "Touchpad"; - "kglobalshortcutsrc"."khotkeys"."_k_friendly_name".value = "Custom Shortcuts Service"; - "kglobalshortcutsrc"."kmix"."_k_friendly_name".value = "Audio Volume"; - "kglobalshortcutsrc"."ksmserver"."_k_friendly_name".value = "Session Management"; - "kglobalshortcutsrc"."kwin"."_k_friendly_name".value = "KWin"; - "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name".value = "Media Controller"; - "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name".value = "KDE Power Management System"; - "kglobalshortcutsrc"."plasmashell"."_k_friendly_name".value = "plasmashell"; - "khotkeysrc"."Data"."DataCount".value = 3; - "khotkeysrc"."Data_1"."Comment".value = "KMenuEdit Global Shortcuts"; - "khotkeysrc"."Data_1"."DataCount".value = 1; - "khotkeysrc"."Data_1"."Enabled".value = true; - "khotkeysrc"."Data_1"."Name".value = "KMenuEdit"; - "khotkeysrc"."Data_1"."SystemGroup".value = 1; - "khotkeysrc"."Data_1"."Type".value = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_1Conditions"."Comment".value = ""; - "khotkeysrc"."Data_1Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_1_1"."Comment".value = "Comment"; - "khotkeysrc"."Data_1_1"."Enabled".value = true; - "khotkeysrc"."Data_1_1"."Name".value = "Search"; - "khotkeysrc"."Data_1_1"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_1_1Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_1_1Actions0"."CommandURL".value = "http://google.com"; - "khotkeysrc"."Data_1_1Actions0"."Type".value = "COMMAND_URL"; - "khotkeysrc"."Data_1_1Conditions"."Comment".value = ""; - "khotkeysrc"."Data_1_1Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_1_1Triggers"."Comment".value = "Simple_action"; - "khotkeysrc"."Data_1_1Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_1_1Triggers0"."Key".value = ""; - "khotkeysrc"."Data_1_1Triggers0"."Type".value = "SHORTCUT"; - "khotkeysrc"."Data_1_1Triggers0"."Uuid".value = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; - "khotkeysrc"."Data_2"."Comment".value = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; - "khotkeysrc"."Data_2"."DataCount".value = 8; - "khotkeysrc"."Data_2"."Enabled".value = false; - "khotkeysrc"."Data_2"."ImportId".value = "kde32b1"; - "khotkeysrc"."Data_2"."Name".value = "Examples"; - "khotkeysrc"."Data_2"."SystemGroup".value = 0; - "khotkeysrc"."Data_2"."Type".value = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_1"."Comment".value = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; - "khotkeysrc"."Data_2_1"."Enabled".value = false; - "khotkeysrc"."Data_2_1"."Name".value = "Activate KSIRC Window"; - "khotkeysrc"."Data_2_1"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_1Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_1Actions0"."Type".value = "ACTIVATE_WINDOW"; - "khotkeysrc"."Data_2_1Actions0Window"."Comment".value = "KSIRC window"; - "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount".value = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Class".value = "ksirc"; - "khotkeysrc"."Data_2_1Actions0Window0"."ClassType".value = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Comment".value = "KSIRC"; - "khotkeysrc"."Data_2_1Actions0Window0"."Role".value = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."RoleType".value = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Title".value = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."TitleType".value = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Type".value = "SIMPLE"; - "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes".value = 33; - "khotkeysrc"."Data_2_1Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_1Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_1Triggers"."Comment".value = "Simple_action"; - "khotkeysrc"."Data_2_1Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_2_1Triggers0"."Key".value = "Ctrl+Alt+I"; - "khotkeysrc"."Data_2_1Triggers0"."Type".value = "SHORTCUT"; - "khotkeysrc"."Data_2_1Triggers0"."Uuid".value = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; - "khotkeysrc"."Data_2_2"."Comment".value = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; - "khotkeysrc"."Data_2_2"."Enabled".value = false; - "khotkeysrc"."Data_2_2"."Name".value = "Type 'Hello'"; - "khotkeysrc"."Data_2_2"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_2Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_2Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_2_2Actions0"."Input".value = "Shift+H:E:L:L:O\n"; - "khotkeysrc"."Data_2_2Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_2Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_2Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_2Triggers"."Comment".value = "Simple_action"; - "khotkeysrc"."Data_2_2Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_2_2Triggers0"."Key".value = "Ctrl+Alt+H"; - "khotkeysrc"."Data_2_2Triggers0"."Type".value = "SHORTCUT"; - "khotkeysrc"."Data_2_2Triggers0"."Uuid".value = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; - "khotkeysrc"."Data_2_3"."Comment".value = "This action runs Konsole, after pressing Ctrl+Alt+T."; - "khotkeysrc"."Data_2_3"."Enabled".value = false; - "khotkeysrc"."Data_2_3"."Name".value = "Run Konsole"; - "khotkeysrc"."Data_2_3"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_3Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_3Actions0"."CommandURL".value = "konsole"; - "khotkeysrc"."Data_2_3Actions0"."Type".value = "COMMAND_URL"; - "khotkeysrc"."Data_2_3Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_3Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_3Triggers"."Comment".value = "Simple_action"; - "khotkeysrc"."Data_2_3Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_2_3Triggers0"."Key".value = "Ctrl+Alt+T"; - "khotkeysrc"."Data_2_3Triggers0"."Type".value = "SHORTCUT"; - "khotkeysrc"."Data_2_3Triggers0"."Uuid".value = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; - "khotkeysrc"."Data_2_4"."Comment".value = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; - "khotkeysrc"."Data_2_4"."Enabled".value = false; - "khotkeysrc"."Data_2_4"."Name".value = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; - "khotkeysrc"."Data_2_4"."Type".value = "GENERIC_ACTION_DATA"; - "khotkeysrc"."Data_2_4Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_4Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_2_4Actions0"."Input".value = "Ctrl+F4"; - "khotkeysrc"."Data_2_4Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_4Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_4Conditions"."ConditionsCount".value = 1; - "khotkeysrc"."Data_2_4Conditions0"."Type".value = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_4Conditions0Window"."Comment".value = "Qt Designer"; - "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount".value = 1; - "khotkeysrc"."Data_2_4Conditions0Window0"."Class".value = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType".value = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Comment".value = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."Role".value = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType".value = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Title".value = "Qt Designer by Trolltech"; - "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType".value = 2; - "khotkeysrc"."Data_2_4Conditions0Window0"."Type".value = "SIMPLE"; - "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes".value = 33; - "khotkeysrc"."Data_2_4Triggers"."Comment".value = ""; - "khotkeysrc"."Data_2_4Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_2_4Triggers0"."Key".value = "Ctrl+W"; - "khotkeysrc"."Data_2_4Triggers0"."Type".value = "SHORTCUT"; - "khotkeysrc"."Data_2_4Triggers0"."Uuid".value = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; - "khotkeysrc"."Data_2_5"."Comment".value = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; - "khotkeysrc"."Data_2_5"."Enabled".value = false; - "khotkeysrc"."Data_2_5"."Name".value = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; - "khotkeysrc"."Data_2_5"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_5Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_5Actions0"."Arguments".value = ""; - "khotkeysrc"."Data_2_5Actions0"."Call".value = "popupExecuteCommand"; - "khotkeysrc"."Data_2_5Actions0"."RemoteApp".value = "org.kde.krunner"; - "khotkeysrc"."Data_2_5Actions0"."RemoteObj".value = "/App"; - "khotkeysrc"."Data_2_5Actions0"."Type".value = "DBUS"; - "khotkeysrc"."Data_2_5Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_5Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_5Triggers"."Comment".value = "Simple_action"; - "khotkeysrc"."Data_2_5Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_2_5Triggers0"."Key".value = "Ctrl+Alt+W"; - "khotkeysrc"."Data_2_5Triggers0"."Type".value = "SHORTCUT"; - "khotkeysrc"."Data_2_5Triggers0"."Uuid".value = "{04f1cf14-2324-43a4-854e-867e289623db}"; - "khotkeysrc"."Data_2_6"."Comment".value = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; - "khotkeysrc"."Data_2_6"."Enabled".value = false; - "khotkeysrc"."Data_2_6"."Name".value = "Next in XMMS"; - "khotkeysrc"."Data_2_6"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_6Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_6Actions0"."DestinationWindow".value = 1; - "khotkeysrc"."Data_2_6Actions0"."Input".value = "B"; - "khotkeysrc"."Data_2_6Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment".value = "XMMS window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount".value = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class".value = "XMMS_Player"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType".value = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment".value = "XMMS Player window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role".value = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType".value = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title".value = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType".value = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type".value = "SIMPLE"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes".value = 33; - "khotkeysrc"."Data_2_6Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_6Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_6Triggers"."Comment".value = "Simple_action"; - "khotkeysrc"."Data_2_6Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_2_6Triggers0"."Key".value = "Ctrl+Alt+B"; - "khotkeysrc"."Data_2_6Triggers0"."Type".value = "SHORTCUT"; - "khotkeysrc"."Data_2_6Triggers0"."Uuid".value = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; - "khotkeysrc"."Data_2_7"."Comment".value = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; - "khotkeysrc"."Data_2_7"."DataCount".value = 4; - "khotkeysrc"."Data_2_7"."Enabled".value = false; - "khotkeysrc"."Data_2_7"."Name".value = "Konqi Gestures"; - "khotkeysrc"."Data_2_7"."SystemGroup".value = 0; - "khotkeysrc"."Data_2_7"."Type".value = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2_7Conditions"."Comment".value = "Konqueror window"; - "khotkeysrc"."Data_2_7Conditions"."ConditionsCount".value = 1; - "khotkeysrc"."Data_2_7Conditions0"."Type".value = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_7Conditions0Window"."Comment".value = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount".value = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Class".value = "konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType".value = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Comment".value = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."Role".value = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType".value = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Title".value = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType".value = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Type".value = "SIMPLE"; - "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes".value = 33; - "khotkeysrc"."Data_2_7_1"."Comment".value = ""; - "khotkeysrc"."Data_2_7_1"."Enabled".value = false; - "khotkeysrc"."Data_2_7_1"."Name".value = "Back"; - "khotkeysrc"."Data_2_7_1"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_1Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_2_7_1Actions0"."Input".value = "Alt+Left"; - "khotkeysrc"."Data_2_7_1Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_1Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_7_1Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount".value = 3; - "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData".value = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData".value = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers1"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData".value = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_1Triggers2"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_2"."Comment".value = ""; - "khotkeysrc"."Data_2_7_2"."Enabled".value = false; - "khotkeysrc"."Data_2_7_2"."Name".value = "Forward"; - "khotkeysrc"."Data_2_7_2"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_2Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_2_7_2Actions0"."Input".value = "Alt+Right"; - "khotkeysrc"."Data_2_7_2Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_2Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_7_2Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount".value = 3; - "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData".value = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData".value = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers1"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData".value = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_2Triggers2"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_3"."Comment".value = ""; - "khotkeysrc"."Data_2_7_3"."Enabled".value = false; - "khotkeysrc"."Data_2_7_3"."Name".value = "Up"; - "khotkeysrc"."Data_2_7_3"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_3Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_2_7_3Actions0"."Input".value = "Alt+Up"; - "khotkeysrc"."Data_2_7_3Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_3Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_7_3Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount".value = 3; - "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData".value = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData".value = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_3Triggers1"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData".value = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers2"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_4"."Comment".value = ""; - "khotkeysrc"."Data_2_7_4"."Enabled".value = false; - "khotkeysrc"."Data_2_7_4"."Name".value = "Reload"; - "khotkeysrc"."Data_2_7_4"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_4Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_2_7_4Actions0"."Input".value = "F5"; - "khotkeysrc"."Data_2_7_4Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_4Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_7_4Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount".value = 3; - "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData".value = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData".value = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_4Triggers1"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData".value = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers2"."Type".value = "GESTURE"; - "khotkeysrc"."Data_2_8"."Comment".value = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; - "khotkeysrc"."Data_2_8"."Enabled".value = false; - "khotkeysrc"."Data_2_8"."Name".value = "Go to KDE Website"; - "khotkeysrc"."Data_2_8"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_8Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_2_8Actions0"."CommandURL".value = "http://www.kde.org"; - "khotkeysrc"."Data_2_8Actions0"."Type".value = "COMMAND_URL"; - "khotkeysrc"."Data_2_8Conditions"."Comment".value = ""; - "khotkeysrc"."Data_2_8Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_2_8Triggers"."Comment".value = "Simple_action"; - "khotkeysrc"."Data_2_8Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_2_8Triggers0"."Key".value = "Meta+E"; - "khotkeysrc"."Data_2_8Triggers0"."Type".value = "SHORTCUT"; - "khotkeysrc"."Data_2_8Triggers0"."Uuid".value = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; - "khotkeysrc"."Data_3"."Comment".value = "Basic Konqueror gestures."; - "khotkeysrc"."Data_3"."DataCount".value = 14; - "khotkeysrc"."Data_3"."Enabled".value = true; - "khotkeysrc"."Data_3"."ImportId".value = "konqueror_gestures_kde321"; - "khotkeysrc"."Data_3"."Name".value = "Konqueror Gestures"; - "khotkeysrc"."Data_3"."SystemGroup".value = 0; - "khotkeysrc"."Data_3"."Type".value = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_3Conditions"."Comment".value = "Konqueror window"; - "khotkeysrc"."Data_3Conditions"."ConditionsCount".value = 1; - "khotkeysrc"."Data_3Conditions0"."Type".value = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_3Conditions0Window"."Comment".value = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window"."WindowsCount".value = 1; - "khotkeysrc"."Data_3Conditions0Window0"."Class".value = "^konquerors"; - "khotkeysrc"."Data_3Conditions0Window0"."ClassType".value = 3; - "khotkeysrc"."Data_3Conditions0Window0"."Comment".value = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."Role".value = "konqueror-mainwindow#1"; - "khotkeysrc"."Data_3Conditions0Window0"."RoleType".value = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Title".value = "file:/ - Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."TitleType".value = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Type".value = "SIMPLE"; - "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes".value = 1; - "khotkeysrc"."Data_3_1"."Comment".value = "Press, move left, release."; - "khotkeysrc"."Data_3_1"."Enabled".value = true; - "khotkeysrc"."Data_3_1"."Name".value = "Back"; - "khotkeysrc"."Data_3_1"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10"."Comment".value = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; - "khotkeysrc"."Data_3_10"."Enabled".value = false; - "khotkeysrc"."Data_3_10"."Name".value = "Stop Loading"; - "khotkeysrc"."Data_3_10"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_10Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_10Actions0"."Input".value = "Escape\n"; - "khotkeysrc"."Data_3_10Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_10Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_10Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_10Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_10Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_10Triggers0"."GesturePointData".value = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_10Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_11"."Comment".value = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; - "khotkeysrc"."Data_3_11"."Enabled".value = true; - "khotkeysrc"."Data_3_11"."Name".value = "Up"; - "khotkeysrc"."Data_3_11"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_11Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_11Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_11Actions0"."Input".value = "Alt+Up"; - "khotkeysrc"."Data_3_11Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_11Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_11Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_11Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_11Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_11Triggers0"."GesturePointData".value = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; - "khotkeysrc"."Data_3_11Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_12"."Comment".value = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; - "khotkeysrc"."Data_3_12"."Enabled".value = false; - "khotkeysrc"."Data_3_12"."Name".value = "Up #2"; - "khotkeysrc"."Data_3_12"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_12Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_12Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_12Actions0"."Input".value = "Alt+Up\n"; - "khotkeysrc"."Data_3_12Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_12Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_12Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_12Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_12Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_12Triggers0"."GesturePointData".value = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_12Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_13"."Comment".value = "Press, move up, move right, release."; - "khotkeysrc"."Data_3_13"."Enabled".value = true; - "khotkeysrc"."Data_3_13"."Name".value = "Activate Next Tab"; - "khotkeysrc"."Data_3_13"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_13Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_13Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_13Actions0"."Input".value = "Ctrl+.\n"; - "khotkeysrc"."Data_3_13Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_13Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_13Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_13Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_13Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_13Triggers0"."GesturePointData".value = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; - "khotkeysrc"."Data_3_13Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_14"."Comment".value = "Press, move up, move left, release."; - "khotkeysrc"."Data_3_14"."Enabled".value = true; - "khotkeysrc"."Data_3_14"."Name".value = "Activate Previous Tab"; - "khotkeysrc"."Data_3_14"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_14Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_14Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_14Actions0"."Input".value = "Ctrl+,"; - "khotkeysrc"."Data_3_14Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_14Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_14Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_14Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_14Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_14Triggers0"."GesturePointData".value = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_14Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_1Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_1Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_1Actions0"."Input".value = "Alt+Left"; - "khotkeysrc"."Data_3_1Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_1Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_1Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_1Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_1Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_1Triggers0"."GesturePointData".value = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_3_1Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_2"."Comment".value = "Press, move down, move up, move down, release."; - "khotkeysrc"."Data_3_2"."Enabled".value = true; - "khotkeysrc"."Data_3_2"."Name".value = "Duplicate Tab"; - "khotkeysrc"."Data_3_2"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_2Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_2Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_2Actions0"."Input".value = "Ctrl+Shift+D\n"; - "khotkeysrc"."Data_3_2Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_2Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_2Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_2Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_2Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_2Triggers0"."GesturePointData".value = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_2Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_3"."Comment".value = "Press, move down, move up, release."; - "khotkeysrc"."Data_3_3"."Enabled".value = true; - "khotkeysrc"."Data_3_3"."Name".value = "Duplicate Window"; - "khotkeysrc"."Data_3_3"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_3Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_3Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_3Actions0"."Input".value = "Ctrl+D\n"; - "khotkeysrc"."Data_3_3Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_3Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_3Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_3Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_3Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_3Triggers0"."GesturePointData".value = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_3Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_4"."Comment".value = "Press, move right, release."; - "khotkeysrc"."Data_3_4"."Enabled".value = true; - "khotkeysrc"."Data_3_4"."Name".value = "Forward"; - "khotkeysrc"."Data_3_4"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_4Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_4Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_4Actions0"."Input".value = "Alt+Right"; - "khotkeysrc"."Data_3_4Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_4Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_4Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_4Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_4Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_4Triggers0"."GesturePointData".value = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_3_4Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_5"."Comment".value = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; - "khotkeysrc"."Data_3_5"."Enabled".value = true; - "khotkeysrc"."Data_3_5"."Name".value = "Home"; - "khotkeysrc"."Data_3_5"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_5Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_5Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_5Actions0"."Input".value = "Alt+Home\n"; - "khotkeysrc"."Data_3_5Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_5Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_5Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_5Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_5Triggers"."TriggersCount".value = 2; - "khotkeysrc"."Data_3_5Triggers0"."GesturePointData".value = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_5Triggers1"."GesturePointData".value = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers1"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_6"."Comment".value = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; - "khotkeysrc"."Data_3_6"."Enabled".value = true; - "khotkeysrc"."Data_3_6"."Name".value = "Close Tab"; - "khotkeysrc"."Data_3_6"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_6Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_6Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_6Actions0"."Input".value = "Ctrl+W\n"; - "khotkeysrc"."Data_3_6Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_6Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_6Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_6Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_6Triggers"."TriggersCount".value = 2; - "khotkeysrc"."Data_3_6Triggers0"."GesturePointData".value = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_6Triggers1"."GesturePointData".value = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers1"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_7"."Comment".value = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; - "khotkeysrc"."Data_3_7"."Enabled".value = true; - "khotkeysrc"."Data_3_7"."Name".value = "New Tab"; - "khotkeysrc"."Data_3_7"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_7Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_7Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_7Actions0"."Input".value = "Ctrl+Shift+N"; - "khotkeysrc"."Data_3_7Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_7Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_7Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_7Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_7Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_7Triggers0"."GesturePointData".value = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_7Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_8"."Comment".value = "Press, move down, release."; - "khotkeysrc"."Data_3_8"."Enabled".value = true; - "khotkeysrc"."Data_3_8"."Name".value = "New Window"; - "khotkeysrc"."Data_3_8"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_8Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_8Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_8Actions0"."Input".value = "Ctrl+N\n"; - "khotkeysrc"."Data_3_8Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_8Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_8Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_8Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_8Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_8Triggers0"."GesturePointData".value = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_8Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."Data_3_9"."Comment".value = "Press, move up, move down, release."; - "khotkeysrc"."Data_3_9"."Enabled".value = true; - "khotkeysrc"."Data_3_9"."Name".value = "Reload"; - "khotkeysrc"."Data_3_9"."Type".value = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_9Actions"."ActionsCount".value = 1; - "khotkeysrc"."Data_3_9Actions0"."DestinationWindow".value = 2; - "khotkeysrc"."Data_3_9Actions0"."Input".value = "F5"; - "khotkeysrc"."Data_3_9Actions0"."Type".value = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_9Conditions"."Comment".value = ""; - "khotkeysrc"."Data_3_9Conditions"."ConditionsCount".value = 0; - "khotkeysrc"."Data_3_9Triggers"."Comment".value = "Gesture_triggers"; - "khotkeysrc"."Data_3_9Triggers"."TriggersCount".value = 1; - "khotkeysrc"."Data_3_9Triggers0"."GesturePointData".value = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_9Triggers0"."Type".value = "GESTURE"; - "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions[$d]".value = ""; - "khotkeysrc"."General"."BrowserApplication[$d]".value = ""; - "khotkeysrc"."General"."ColorSchemeHash[$d]".value = ""; - "khotkeysrc"."General"."ColorScheme[$d]".value = ""; - "khotkeysrc"."Gestures"."Disabled".value = true; - "khotkeysrc"."Gestures"."MouseButton".value = 2; - "khotkeysrc"."Gestures"."Timeout".value = 300; - "khotkeysrc"."GesturesExclude"."Comment".value = ""; - "khotkeysrc"."GesturesExclude"."WindowsCount".value = 0; - "khotkeysrc"."Icons"."Theme[$d]".value = ""; - "khotkeysrc"."KDE"."AnimationDurationFactor[$d]".value = ""; - "khotkeysrc"."KDE"."LookAndFeelPackage[$d]".value = ""; - "khotkeysrc"."KDE"."ShowDeleteCommand[$d]".value = ""; - "khotkeysrc"."KDE"."SingleClick[$d]".value = ""; - "khotkeysrc"."KDE"."widgetStyle[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Sort by[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]".value = ""; - "khotkeysrc"."KFileDialog Settings"."View Style[$d]".value = ""; - "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]".value = ""; - "khotkeysrc"."Main"."AlreadyImported".value = "defaults,kde32b1,konqueror_gestures_kde321"; - "khotkeysrc"."Main"."Disabled".value = false; - "khotkeysrc"."PreviewSettings"."MaximumRemoteSize[$d]".value = ""; - "khotkeysrc"."Voice"."Shortcut".value = ""; - "khotkeysrc"."WM"."activeBackground[$d]".value = ""; - "khotkeysrc"."WM"."activeBlend[$d]".value = ""; - "khotkeysrc"."WM"."activeForeground[$d]".value = ""; - "khotkeysrc"."WM"."inactiveBackground[$d]".value = ""; - "khotkeysrc"."WM"."inactiveBlend[$d]".value = ""; - "khotkeysrc"."WM"."inactiveForeground[$d]".value = ""; - "kiorc"."Confirmations"."ConfirmDelete".value = true; - "kiorc"."Confirmations"."ConfirmEmptyTrash".value = true; - "kiorc"."Confirmations"."ConfirmTrash".value = false; - "kiorc"."Executable scripts"."behaviourOnLaunch".value = "alwaysAsk"; - "krunnerrc"."Plugins"."baloosearchEnabled".value = false; - "krunnerrc"."Plugins"."locationsEnabled".value = true; - "krunnerrc"."Plugins"."placesEnabled".value = true; - "krunnerrc"."Plugins"."recentdocumentsEnabled".value = true; - "kservicemenurc"."Show"."compressfileitemaction".value = true; - "kservicemenurc"."Show"."extractfileitemaction".value = true; - "kservicemenurc"."Show"."forgetfileitemaction".value = true; - "kservicemenurc"."Show"."installFont".value = true; - "kservicemenurc"."Show"."kactivitymanagerd_fileitem_linking_plugin".value = true; - "kservicemenurc"."Show"."kdeconnectfileitemaction".value = true; - "kservicemenurc"."Show"."kio-admin".value = true; - "kservicemenurc"."Show"."mountisoaction".value = true; - "kservicemenurc"."Show"."nextclouddolphinactionplugin".value = true; - "kservicemenurc"."Show"."runInKonsole".value = true; - "kservicemenurc"."Show"."setAsWallpaper".value = true; - "kservicemenurc"."Show"."slideshowfileitemaction".value = true; - "kservicemenurc"."Show"."tagsfileitemaction".value = true; - "kwalletrc"."Wallet"."First Use".value = false; - "kwinrc"."Desktops"."Id_1".value = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; - "kwinrc"."Desktops"."Id_2".value = "389927fc-9c76-4f84-ae0d-011cf76868e6"; - "kwinrc"."Desktops"."Id_3".value = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; - "kwinrc"."Desktops"."Id_4".value = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; - "kwinrc"."Desktops"."Number".value = 4; - "kwinrc"."Desktops"."Rows".value = 2; - "kwinrc"."Effect-diminactive"."Strength".value = 15; - "kwinrc"."Effect-magiclamp"."AnimationDuration".value = 20; - "kwinrc"."NightColor"."Active".value = true; - "kwinrc"."NightColor"."LatitudeFixed".value = 52.31865273558926; - "kwinrc"."NightColor"."LongitudeFixed".value = 5.44; - "kwinrc"."NightColor"."Mode".value = "Location"; - "kwinrc"."NightColor"."NightTemperature".value = 1400; - "kwinrc"."Plugins"."diminactiveEnabled".value = true; - "kwinrc"."Plugins"."dimscreenEnabled".value = true; - "kwinrc"."Plugins"."wobblywindowsEnabled".value = true; - "kwinrc"."Tiling"."padding".value = 4; - "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}],\"width\":1}]}"; - "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles".value = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5231481481481481,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.4979166666666667},{\"width\":0.5020833333333333}]},{\"height\":0.47685185185185075,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.49895833333333334},{\"width\":0.5010416666666666}]}],\"width\":1}]}"; - "kwinrc"."Xwayland"."Scale".value = 1; - "kxkbrc"."Layout"."Options".value = "compose:caps"; - "kxkbrc"."Layout"."ResetOldOptions".value = true; - "plasma-localerc"."Formats"."LANG".value = "en_US.UTF-8"; - "plasma-localerc"."Formats"."LC_ADDRESS".value = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MEASUREMENT".value = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MONETARY".value = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NAME".value = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NUMERIC".value = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_PAPER".value = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TELEPHONE".value = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TIME".value = "en_DK.UTF-8"; - "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize".value = 16; + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 8; + "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; + "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; + "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; + "dolphinrc"."General"."RememberOpenedTabs" = false; + "dolphinrc"."IconsMode"."PreviewSize" = 80; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "dolphinrc"."PreviewSettings"."Plugins" = "mobithumbnail,fontthumbnail,ebookthumbnail,kraorathumbnail,jpegthumbnail,windowsexethumbnail,comicbookthumbnail,djvuthumbnail,opendocumentthumbnail,windowsimagethumbnail,exrthumbnail,audiothumbnail,cursorthumbnail,svgthumbnail,blenderthumbnail,gsthumbnail,rawthumbnail,ffmpegthumbs,imagethumbnail,directorythumbnail"; + "dolphinrc"."Search"."Location" = "Everywhere"; + "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Mouse"."cursorSize" = 32; + "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."General"."AccentColor" = "184,117,220"; + "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; + "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; + "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; + "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; + "kdeglobals"."KDE"."ShowDeleteCommand" = false; + "kdeglobals"."KDE"."SingleClick" = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Preview" = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; + "kdeglobals"."PreviewSettings"."MaximumRemoteSize" = 0; + "kdeglobals"."WM"."activeBackground" = "49,54,59"; + "kdeglobals"."WM"."activeBlend" = "252,252,252"; + "kdeglobals"."WM"."activeForeground" = "252,252,252"; + "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; + "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; + "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; + "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; + "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; + "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; + "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; + "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; + "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; + "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; + "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "KDE Power Management System"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "plasmashell"; + "khotkeysrc"."Data"."DataCount" = 3; + "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; + "khotkeysrc"."Data_1"."DataCount" = 1; + "khotkeysrc"."Data_1"."Enabled" = true; + "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; + "khotkeysrc"."Data_1"."SystemGroup" = 1; + "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1"."Comment" = "Comment"; + "khotkeysrc"."Data_1_1"."Enabled" = true; + "khotkeysrc"."Data_1_1"."Name" = "Search"; + "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; + "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; + "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; + "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; + "khotkeysrc"."Data_2"."DataCount" = 8; + "khotkeysrc"."Data_2"."Enabled" = false; + "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; + "khotkeysrc"."Data_2"."Name" = "Examples"; + "khotkeysrc"."Data_2"."SystemGroup" = 0; + "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; + "khotkeysrc"."Data_2_1"."Enabled" = false; + "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; + "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; + "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; + "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; + "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; + "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; + "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; + "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; + "khotkeysrc"."Data_2_2"."Enabled" = false; + "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; + "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; + "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; + "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; + "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; + "khotkeysrc"."Data_2_3"."Enabled" = false; + "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; + "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; + "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; + "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; + "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; + "khotkeysrc"."Data_2_4"."Enabled" = false; + "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; + "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; + "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; + "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; + "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; + "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; + "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; + "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; + "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; + "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; + "khotkeysrc"."Data_2_5"."Enabled" = false; + "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; + "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; + "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; + "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; + "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; + "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; + "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; + "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; + "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; + "khotkeysrc"."Data_2_6"."Enabled" = false; + "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; + "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; + "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; + "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; + "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; + "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; + "khotkeysrc"."Data_2_7"."DataCount" = 4; + "khotkeysrc"."Data_2_7"."Enabled" = false; + "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; + "khotkeysrc"."Data_2_7"."SystemGroup" = 0; + "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_7_1"."Comment" = ""; + "khotkeysrc"."Data_2_7_1"."Enabled" = false; + "khotkeysrc"."Data_2_7_1"."Name" = "Back"; + "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2"."Comment" = ""; + "khotkeysrc"."Data_2_7_2"."Enabled" = false; + "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; + "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3"."Comment" = ""; + "khotkeysrc"."Data_2_7_3"."Enabled" = false; + "khotkeysrc"."Data_2_7_3"."Name" = "Up"; + "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4"."Comment" = ""; + "khotkeysrc"."Data_2_7_4"."Enabled" = false; + "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; + "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; + "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; + "khotkeysrc"."Data_2_8"."Enabled" = false; + "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; + "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; + "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; + "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; + "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; + "khotkeysrc"."Data_3"."DataCount" = 14; + "khotkeysrc"."Data_3"."Enabled" = true; + "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; + "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; + "khotkeysrc"."Data_3"."SystemGroup" = 0; + "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konquerors"; + "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; + "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; + "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; + "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; + "khotkeysrc"."Data_3_1"."Enabled" = true; + "khotkeysrc"."Data_3_1"."Name" = "Back"; + "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; + "khotkeysrc"."Data_3_10"."Enabled" = false; + "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; + "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; + "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; + "khotkeysrc"."Data_3_11"."Enabled" = true; + "khotkeysrc"."Data_3_11"."Name" = "Up"; + "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; + "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; + "khotkeysrc"."Data_3_12"."Enabled" = false; + "khotkeysrc"."Data_3_12"."Name" = "Up #2"; + "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; + "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; + "khotkeysrc"."Data_3_13"."Enabled" = true; + "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; + "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; + "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; + "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; + "khotkeysrc"."Data_3_14"."Enabled" = true; + "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; + "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; + "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; + "khotkeysrc"."Data_3_2"."Enabled" = true; + "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; + "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; + "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; + "khotkeysrc"."Data_3_3"."Enabled" = true; + "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; + "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; + "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; + "khotkeysrc"."Data_3_4"."Enabled" = true; + "khotkeysrc"."Data_3_4"."Name" = "Forward"; + "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; + "khotkeysrc"."Data_3_5"."Enabled" = true; + "khotkeysrc"."Data_3_5"."Name" = "Home"; + "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; + "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; + "khotkeysrc"."Data_3_6"."Enabled" = true; + "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; + "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; + "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; + "khotkeysrc"."Data_3_7"."Enabled" = true; + "khotkeysrc"."Data_3_7"."Name" = "New Tab"; + "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; + "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; + "khotkeysrc"."Data_3_8"."Enabled" = true; + "khotkeysrc"."Data_3_8"."Name" = "New Window"; + "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; + "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; + "khotkeysrc"."Data_3_9"."Enabled" = true; + "khotkeysrc"."Data_3_9"."Name" = "Reload"; + "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; + "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions[$d]" = ""; + "khotkeysrc"."General"."BrowserApplication[$d]" = ""; + "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; + "khotkeysrc"."General"."ColorScheme[$d]" = ""; + "khotkeysrc"."Gestures"."Disabled" = true; + "khotkeysrc"."Gestures"."MouseButton" = 2; + "khotkeysrc"."Gestures"."Timeout" = 300; + "khotkeysrc"."GesturesExclude"."Comment" = ""; + "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; + "khotkeysrc"."Icons"."Theme[$d]" = ""; + "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; + "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; + "khotkeysrc"."KDE"."ShowDeleteCommand[$d]" = ""; + "khotkeysrc"."KDE"."SingleClick[$d]" = ""; + "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; + "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; + "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."PreviewSettings"."MaximumRemoteSize[$d]" = ""; + "khotkeysrc"."Voice"."Shortcut" = ""; + "khotkeysrc"."WM"."activeBackground[$d]" = ""; + "khotkeysrc"."WM"."activeBlend[$d]" = ""; + "khotkeysrc"."WM"."activeForeground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; + "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; + "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; + "kiorc"."Confirmations"."ConfirmDelete" = true; + "kiorc"."Confirmations"."ConfirmEmptyTrash" = true; + "kiorc"."Confirmations"."ConfirmTrash" = false; + "kiorc"."Executable scripts"."behaviourOnLaunch" = "alwaysAsk"; + "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "krunnerrc"."Plugins"."locationsEnabled" = true; + "krunnerrc"."Plugins"."placesEnabled" = true; + "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; + "kservicemenurc"."Show"."compressfileitemaction" = true; + "kservicemenurc"."Show"."extractfileitemaction" = true; + "kservicemenurc"."Show"."forgetfileitemaction" = true; + "kservicemenurc"."Show"."installFont" = true; + "kservicemenurc"."Show"."kactivitymanagerd_fileitem_linking_plugin" = true; + "kservicemenurc"."Show"."kdeconnectfileitemaction" = true; + "kservicemenurc"."Show"."kio-admin" = true; + "kservicemenurc"."Show"."mountisoaction" = true; + "kservicemenurc"."Show"."nextclouddolphinactionplugin" = true; + "kservicemenurc"."Show"."runInKonsole" = true; + "kservicemenurc"."Show"."setAsWallpaper" = true; + "kservicemenurc"."Show"."slideshowfileitemaction" = true; + "kservicemenurc"."Show"."tagsfileitemaction" = true; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; + "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; + "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; + "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; + "kwinrc"."Desktops"."Number" = 4; + "kwinrc"."Desktops"."Rows" = 2; + "kwinrc"."Effect-diminactive"."Strength" = 15; + "kwinrc"."Effect-magiclamp"."AnimationDuration" = 20; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; + "kwinrc"."NightColor"."LongitudeFixed" = 5.44; + "kwinrc"."NightColor"."Mode" = "Location"; + "kwinrc"."NightColor"."NightTemperature" = 1400; + "kwinrc"."Plugins"."diminactiveEnabled" = true; + "kwinrc"."Plugins"."dimscreenEnabled" = true; + "kwinrc"."Plugins"."wobblywindowsEnabled" = true; + "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}],\"width\":1}]}"; + "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5231481481481481,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.4979166666666667},{\"width\":0.5020833333333333}]},{\"height\":0.47685185185185075,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.49895833333333334},{\"width\":0.5010416666666666}]}],\"width\":1}]}"; + "kwinrc"."Xwayland"."Scale" = 1; + "kxkbrc"."Layout"."Options" = "compose:caps"; + "kxkbrc"."Layout"."ResetOldOptions" = true; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "plasmarc"."Wallpapers"."usersWallpapers" = ""; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; }; }; } From 48536af2368f722c1a59b078881d5710b119f25c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 May 2024 11:37:39 +0200 Subject: [PATCH 1847/2308] update flake lock --- flake.lock | 65 +++++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index d54eec1..4aeb659 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1714422957, - "narHash": "sha256-fQ1NP//CLQSj/te/qUxO+YiHlz6KYPxzVFSW5ldQGMA=", + "lastModified": 1714607657, + "narHash": "sha256-AnmN+JOzrpHv7Uw7JSPJ9JEjuqF7gjhx29UuuldNpas=", "owner": "catppuccin", "repo": "nix", - "rev": "f46dffa3345aba8b315ed7ddd1be4bc12f9e9e78", + "rev": "b0dc7f3181063daa6532dc5f757ded1a605dfbd5", "type": "github" }, "original": { @@ -57,15 +57,16 @@ "complement": { "flake": false, "locked": { - "lastModified": 1713458251, - "narHash": "sha256-hom/Lt0gZzLWqFhUJG0X2i88CAMIILInO5w0tPj6G3s=", + "lastModified": 1714472853, + "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=", "owner": "matrix-org", "repo": "complement", - "rev": "d73c81a091604b0fc5b6b0617dcac58c25763f57", + "rev": "891d18872c153d39a9ce63b545045efddb845738", "type": "github" }, "original": { "owner": "matrix-org", + "ref": "main", "repo": "complement", "type": "github" } @@ -85,11 +86,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1714111420, - "narHash": "sha256-ax+Z3K9y2N43C/+1gwyTbtXKHuWYY1NYN+tV5NcJ+zI=", + "lastModified": 1714717104, + "narHash": "sha256-c+LnBnWKPQxNK6ebEe9RYlvGDkhEKJbSO6n0pZrKjdY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "341bafb91e77cd95775d9cfa4f0810309889b176", + "rev": "42e3567153f20ace6f287d46fff2d7c070b68840", "type": "github" }, "original": { @@ -191,11 +192,11 @@ ] }, "locked": { - "lastModified": 1714405407, - "narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=", + "lastModified": 1714612856, + "narHash": "sha256-W7+rtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E=", "owner": "nix-community", "repo": "disko", - "rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf", + "rev": "d57058eb09dd5ec00c746df34fe0a603ea744370", "type": "github" }, "original": { @@ -213,15 +214,16 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1713680591, - "narHash": "sha256-3pbv7UgAgetwz9YdjzIT/lZ6Rgj6wj6MR4mphBLyDjU=", + "lastModified": 1714544767, + "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", "owner": "nix-community", "repo": "fenix", - "rev": "19aaa94a73cc670a4d87e84f0909966cd8f8cd79", + "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", "type": "github" }, "original": { "owner": "nix-community", + "ref": "main", "repo": "fenix", "type": "github" } @@ -254,6 +256,7 @@ }, "original": { "owner": "edolstra", + "ref": "master", "repo": "flake-compat", "type": "github" } @@ -340,6 +343,7 @@ }, "original": { "owner": "numtide", + "ref": "main", "repo": "flake-utils", "type": "github" } @@ -427,11 +431,11 @@ ] }, "locked": { - "lastModified": 1714515075, - "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", + "lastModified": 1714679908, + "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", + "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "type": "github" }, "original": { @@ -447,11 +451,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1714464433, - "narHash": "sha256-ztvukQ2LvrRQBtiRiut8FgCOyKXgqLTIp3Deg/OguUY=", + "lastModified": 1714720101, + "narHash": "sha256-Dxlj52coLzQZVV4a9IMMc/2xU5FIpj0iaHBigPwoNjM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2a5194b960801b68cfc4c811eb1733cf3aa8ece6", + "rev": "68b6bfacf67fcb1660c024b8dcd9376af38bbafe", "type": "github" }, "original": { @@ -495,6 +499,7 @@ }, "original": { "owner": "numtide", + "ref": "main", "repo": "nix-filter", "type": "github" } @@ -659,11 +664,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { @@ -707,11 +712,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { @@ -778,11 +783,11 @@ ] }, "locked": { - "lastModified": 1714468356, - "narHash": "sha256-GdOqQ94WnMkHHRH+Fu7Nx5pMhfs5eou8yxI1hr3PIqM=", + "lastModified": 1714563800, + "narHash": "sha256-6G6/28zu3SxHgGGbN9IeVOcGidTt5dUdQbZEI39goEM=", "owner": "pjones", "repo": "plasma-manager", - "rev": "22ae742b456e1f8fb6fea1b19037f50e9c80e1ec", + "rev": "4b56c71c9cdb9728316cbb5dd99446b31c585913", "type": "github" }, "original": { From 28c916d0ef88491c5786ca6e2c08c41ef96d6091 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 3 May 2024 11:49:13 +0200 Subject: [PATCH 1848/2308] The hash for the cattpuccin macchiato theme for firefox was wrong --- nixos/desktop/package-configs/firefox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 5065913..9324703 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -29,7 +29,7 @@ ExtensionSettings = { # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below # Catppuccin Macchiato - Lavender theme: - "{15cb5e64-94bd-41aa-91cf-751bb1a84972}" = { + "{6396519b-0923-41a4-948a-3cb54a3918b3}" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-lavender/latest.xpi"; installation_mode = "force_installed"; }; From a4f8f48f4bad6c4d3aebf91f4f6f119730ea9903 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 6 May 2024 15:55:51 +0200 Subject: [PATCH 1849/2308] All the updates after this mess, should be good now --- .gitignore | 1 + disko/queen/default.nix | 45 +++++++ flake.nix | 78 +++++++++++ home-manager/desktop/default.nix | 27 ++++ .../konsole/Catppuccin-Macchiato.colorscheme | 96 +++++++++++++ .../konsole/Catppuccin.profile | 8 ++ .../package-configs/konsole/default.nix | 25 ++++ .../desktop/package-configs/konsole/konsolerc | 15 +++ home-manager/hosts/iso_server/default.nix | 13 ++ home-manager/hosts/iso_server/lillian.nix | 29 ++++ nixos/hosts/iso_server/configuration.nix | 127 ++++++++++++++++++ nixos/hosts/iso_server/secrets/sops.yaml | 21 +++ nixos/hosts/queen/configuration.nix | 51 +++---- nixos/hosts/queen/hardware-configuration.nix | 17 ++- pkgs/install-nix-no-inhibit/default.nix | 6 +- pkgs/rebuild-no-inhibit/default.nix | 2 +- pkgs/update/default.nix | 2 +- result | 1 - 18 files changed, 532 insertions(+), 32 deletions(-) create mode 100644 .gitignore create mode 100644 disko/queen/default.nix create mode 100644 home-manager/desktop/package-configs/konsole/Catppuccin-Macchiato.colorscheme create mode 100644 home-manager/desktop/package-configs/konsole/Catppuccin.profile create mode 100644 home-manager/desktop/package-configs/konsole/default.nix create mode 100644 home-manager/desktop/package-configs/konsole/konsolerc create mode 100644 home-manager/hosts/iso_server/default.nix create mode 100644 home-manager/hosts/iso_server/lillian.nix create mode 100644 nixos/hosts/iso_server/configuration.nix create mode 100644 nixos/hosts/iso_server/secrets/sops.yaml delete mode 120000 result diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..82e0cdf --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/result \ No newline at end of file diff --git a/disko/queen/default.nix b/disko/queen/default.nix new file mode 100644 index 0000000..c382b28 --- /dev/null +++ b/disko/queen/default.nix @@ -0,0 +1,45 @@ +{ + disko.devices = { + disk = { + nvme0n1 = { + type = "disk"; + device = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "defaults" + ]; + }; + }; + swap = { + size = "16G"; + content = { + type = "swap"; + resumeDevice = true; # resume from hiberation from this device + }; + }; + root = { + size = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + mountOptions = [ + "defaults" + ]; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/flake.nix b/flake.nix index 219d683..9cab11d 100644 --- a/flake.nix +++ b/flake.nix @@ -20,8 +20,12 @@ # catpuccin theme catppuccin.url = "github:catppuccin/nix"; + # catpuccin theme + catppuccin.url = "github:catppuccin/nix"; + # Conduit fork without all the fuss and drama conduit = { + url = "github:girlbossceo/conduwuit"; url = "github:girlbossceo/conduwuit"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -30,6 +34,10 @@ nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + # Nix index database files + nix-index-database.url = "github:nix-community/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + # Secret management with sops sops-nix.url = "github:Mic92/sops-nix"; @@ -61,6 +69,8 @@ zjstatus.url = "github:dj95/zjstatus"; + zjstatus.url = "github:dj95/zjstatus"; + # Fix for steam cursor not being visible under wayland # Add any other flake you might need @@ -71,6 +81,10 @@ # url = "github:mindsbackyard/linger-flake"; # inputs.flake-utils.follows = "flake-utils"; # }; + # linger = { + # url = "github:mindsbackyard/linger-flake"; + # inputs.flake-utils.follows = "flake-utils"; + # }; # pihole = { # url = "github:mindsbackyard/pihole-flake"; @@ -78,6 +92,12 @@ # inputs.flake-utils.follows = "flake-utils"; # inputs.linger.follows = "linger"; # }; + # pihole = { + # url = "github:mindsbackyard/pihole-flake"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.flake-utils.follows = "flake-utils"; + # inputs.linger.follows = "linger"; + # }; }; outputs = { @@ -85,6 +105,7 @@ nixpkgs, nixos-generators, catppuccin, + catppuccin, disko, home-manager, sops-nix, @@ -93,10 +114,14 @@ zjstatus, # linger, # pihole, + zjstatus, + # linger, + # pihole, lanzaboote, jovian, nixos-hardware, nix-index-database, + nix-index-database, conduit, ... } @ inputs: let @@ -112,6 +137,11 @@ in { # Your custom packages # Accessible through 'nix build', 'nix shell', etc + packages = forAllSystems (system: + import ./pkgs (import nixpkgs { + inherit system; + config.allowUnfree = true; + })); packages = forAllSystems (system: import ./pkgs (import nixpkgs { inherit system; @@ -147,11 +177,17 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin inputs.plasma-manager.homeManagerModules.plasma-manager ]; + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + inputs.plasma-manager.homeManagerModules.plasma-manager + ]; } ]; }; @@ -168,11 +204,17 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin inputs.plasma-manager.homeManagerModules.plasma-manager ]; + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + inputs.plasma-manager.homeManagerModules.plasma-manager + ]; } ]; }; @@ -192,6 +234,12 @@ inputs.catppuccin.homeManagerModules.catppuccin ]; } + catppuccin.nixosModules.catppuccin + { + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + ]; + } ]; }; @@ -207,11 +255,16 @@ jovian.nixosModules.jovian home-manager.nixosModules.home-manager catppuccin.nixosModules.catppuccin + catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager inputs.catppuccin.homeManagerModules.catppuccin ]; + home-manager.sharedModules = [ + inputs.plasma-manager.homeManagerModules.plasma-manager + inputs.catppuccin.homeManagerModules.catppuccin + ]; } ]; }; @@ -227,11 +280,36 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager inputs.catppuccin.homeManagerModules.catppuccin ]; + home-manager.sharedModules = [ + inputs.plasma-manager.homeManagerModules.plasma-manager + inputs.catppuccin.homeManagerModules.catppuccin + ]; + } + ]; + }; + + iso_server = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = {inherit inputs outputs;}; + modules = [ + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" + "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + ./nixos/hosts/iso_server/configuration.nix + sops-nix.nixosModules.sops + home-manager.nixosModules.home-manager + nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin + { + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + ]; } ]; }; diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 7970c5e..525e5be 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -18,6 +18,7 @@ # ./nvim.nix ./package-configs/plasma-desktop.nix ./package-configs/firefox.nix + ./package-configs/konsole ]; nixpkgs = { # You can add overlays here @@ -44,6 +45,19 @@ customUIColors = {}; }); }) + (final: prev: { + catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { + accent = "mauve"; + boldKeywords = true; + italicComments = true; + italicKeywords = true; + extraBordersEnabled = false; + workbenchMode = "default"; + bracketMode = "rainbow"; + colorOverrides = {}; + customUIColors = {}; + }); + }) ]; # Configure your nixpkgs instance config = { @@ -66,6 +80,7 @@ direnv git git-credential-manager + git-credential-manager ruff kate @@ -105,8 +120,17 @@ }) catppuccin-sddm-corners + # Theming: + catppuccin-cursors + (catppuccin-kde.override { + flavour = ["macchiato"]; + accents = ["mauve"]; + }) + catppuccin-sddm-corners + # Web browsing: firefoxpwa + firefoxpwa ungoogled-chromium ]; @@ -114,6 +138,8 @@ enable = true; package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc-icons charliermarsh.ruff @@ -158,6 +184,7 @@ "*.vscode" ".envrc" "venv" + "venv" ]; }; diff --git a/home-manager/desktop/package-configs/konsole/Catppuccin-Macchiato.colorscheme b/home-manager/desktop/package-configs/konsole/Catppuccin-Macchiato.colorscheme new file mode 100644 index 0000000..63bfb35 --- /dev/null +++ b/home-manager/desktop/package-configs/konsole/Catppuccin-Macchiato.colorscheme @@ -0,0 +1,96 @@ +[Background] +Color=36,39,58 + +[BackgroundFaint] +Color=36,39,58 + +[BackgroundIntense] +Color=36,39,58 + +[Color0] +Color=110,115,141 + +[Color0Faint] +Color=110,115,141 + +[Color0Intense] +Color=110,115,141 + +[Color1] +Color=237,135,150 + +[Color1Faint] +Color=237,135,150 + +[Color1Intense] +Color=237,135,150 + +[Color2] +Color=166,218,149 + +[Color2Faint] +Color=166,218,149 + +[Color2Intense] +Color=166,218,149 + +[Color3] +Color=238,212,159 + +[Color3Faint] +Color=238,212,159 + +[Color3Intense] +Color=238,212,159 + +[Color4] +Color=138,173,244 + +[Color4Faint] +Color=138,173,244 + +[Color4Intense] +Color=138,173,244 + +[Color5] +Color=198,160,246 + +[Color5Faint] +Color=198,160,246 + +[Color5Intense] +Color=198,160,246 + +[Color6] +Color=137,220,227 + +[Color6Faint] +Color=137,220,227 + +[Color6Intense] +Color=137,220,227 + +[Color7] +Color=202,211,245 + +[Color7Faint] +Color=202,211,245 + +[Color7Intense] +Color=202,211,245 + +[Foreground] +Color=202,211,245 + +[ForegroundFaint] +Color=202,211,245 + +[ForegroundIntense] +Color=202,211,245 + +[General] +Blur=false +ColorRandomization=false +Description=Catppuccin Macchiato +Opacity=1 +Wallpaper= diff --git a/home-manager/desktop/package-configs/konsole/Catppuccin.profile b/home-manager/desktop/package-configs/konsole/Catppuccin.profile new file mode 100644 index 0000000..4a140a8 --- /dev/null +++ b/home-manager/desktop/package-configs/konsole/Catppuccin.profile @@ -0,0 +1,8 @@ +[Appearance] +ColorScheme=Catppuccin-Macchiato + +[General] +Name=Catppuccin +Parent=FALLBACK/ +StartInCurrentSessionDir=true +TerminalRows=30 diff --git a/home-manager/desktop/package-configs/konsole/default.nix b/home-manager/desktop/package-configs/konsole/default.nix new file mode 100644 index 0000000..a704737 --- /dev/null +++ b/home-manager/desktop/package-configs/konsole/default.nix @@ -0,0 +1,25 @@ +{ + lib, + pkgs, + inputs, + ... +}: { + home.file = { + "profile" = { + source = ./Catppuccin.profile; + target = ".local/share/konsole/Catppuccin.profile"; + }; + }; + home.file = { + "colorscheme" = { + source = ./Catppuccin-Macchiato.colorscheme; + target = ".local/share/konsole/Catppuccin-Macchiato.colorscheme"; + }; + }; + home.file = { + "konsolerc" = { + source = ./konsolerc; + target = ".config/konsolerc"; + }; + }; +} diff --git a/home-manager/desktop/package-configs/konsole/konsolerc b/home-manager/desktop/package-configs/konsole/konsolerc new file mode 100644 index 0000000..ea270b8 --- /dev/null +++ b/home-manager/desktop/package-configs/konsole/konsolerc @@ -0,0 +1,15 @@ +[Desktop Entry] +DefaultProfile=Catppuccin.profile + +[General] +ConfigVersion=1 + +[MainWindow] +1920x1080 screen: Height=524 +1920x1080 screen: Width=911 +RestorePositionForNextInstance=false +State=AAAA/wAAAAD9AAAAAQAAAAAAAAAAAAAAAPwCAAAAAvsAAAAcAFMAUwBIAE0AYQBuAGEAZwBlAHIARABvAGMAawAAAAAA/////wAAAREA////+wAAACIAUQB1AGkAYwBrAEMAbwBtAG0AYQBuAGQAcwBEAG8AYwBrAAAAAAD/////AAABcgD///8AAAOPAAAB3gAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAACAAAAFgBtAGEAaQBuAFQAbwBvAGwAQgBhAHIBAAAAAP////8AAAAAAAAAAAAAABwAcwBlAHMAcwBpAG8AbgBUAG8AbwBsAGIAYQByAQAAAOj/////AAAAAAAAAAA= +ToolBarsMovable=Disabled + +[UiSettings] +ColorScheme= diff --git a/home-manager/hosts/iso_server/default.nix b/home-manager/hosts/iso_server/default.nix new file mode 100644 index 0000000..c17b81a --- /dev/null +++ b/home-manager/hosts/iso_server/default.nix @@ -0,0 +1,13 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + ./lillian.nix + ]; +} diff --git a/home-manager/hosts/iso_server/lillian.nix b/home-manager/hosts/iso_server/lillian.nix new file mode 100644 index 0000000..139340c --- /dev/null +++ b/home-manager/hosts/iso_server/lillian.nix @@ -0,0 +1,29 @@ +# This is your home-manager configuration file +# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + # You can import other home-manager modules here + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.default + + # You can also split up your configuration and import pieces of it here: + # ./nvim.nix + ../../shared + ]; + + home.packages = with pkgs; [ + ]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + home.stateVersion = "24.05"; +} diff --git a/nixos/hosts/iso_server/configuration.nix b/nixos/hosts/iso_server/configuration.nix new file mode 100644 index 0000000..a38c7d0 --- /dev/null +++ b/nixos/hosts/iso_server/configuration.nix @@ -0,0 +1,127 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + nixpkgs-stable, + ... +}: { + imports = [ + # If you want to use modules your own flake exports (from modules/home-manager): + # outputs.homeManagerModules.example + # outputs.nixosModules.contabo.wan + inputs.home-manager.nixosModules.home-manager + # Or modules exported from other flakes (such as nix-colors): + # inputs.nix-colors.homeManagerModules.defaults + + # Import shared settings + ../../shared + ]; + + programs.command-not-found.enable = lib.mkForce false; + programs.nix-index.enable = true; + programs.nix-index-database.comma.enable = true; + + boot.tmp.cleanOnBoot = true; + zramSwap.enable = false; + networking.domain = ""; + services.openssh = { + enable = true; + # require public key authentication for better security + settings.PasswordAuthentication = false; + settings.KbdInteractiveAuthentication = false; + }; + + nixpkgs = { + # You can add overlays here + overlays = [ + ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys + sops.defaultSopsFile = ./secrets/sops.yaml; + + environment.systemPackages = with pkgs; [ + # Custom tools + dvd + dvt + servo + restart + install-nix + + # System tools + aha + direnv + efitools + git-filter-repo + gnupg + pciutils + sbctl + tpm2-tools + tpm2-tss + zsh + ]; + + # Contabo ipv6 nameservers: "2a02:c207::1:53" "2a02:c207::2:53" + + networking.firewall.enable = true; + + networking.firewall.allowedTCPPorts = [22]; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = ""; + options = "terminate:ctrl_alt_bksp,compose:caps_toggle"; + }; + + security.tpm2.enable = true; + security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so + security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables + users.users.lillian.extraGroups = ["tss"]; # tss group has access to TPM devices + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + programs.git = { + enable = true; + }; + + programs.direnv = { + enable = true; + }; + + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; + + # kde power settings do not turn off screen + systemd = { + services.sshd.wantedBy = pkgs.lib.mkForce ["multi-user.target"]; + targets = { + sleep.enable = false; + suspend.enable = false; + hibernate.enable = false; + hybrid-sleep.enable = false; + }; + }; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../../home-manager/hosts/iso_server; + }; + }; + + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + boot.supportedFilesystems = lib.mkForce ["bcachefs" "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"]; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "unstable"; +} diff --git a/nixos/hosts/iso_server/secrets/sops.yaml b/nixos/hosts/iso_server/secrets/sops.yaml new file mode 100644 index 0000000..779cbb4 --- /dev/null +++ b/nixos/hosts/iso_server/secrets/sops.yaml @@ -0,0 +1,21 @@ +lillian-password: ENC[AES256_GCM,data:kDP9LpmtLR2UEjCY0kgcdHmYAYLipOd/9I3NuiRHzLDhCX44M5QGfbQrle7bi9EOVD4eNB3uNtk+oBClr7cc21E9YtMIp5vg2g==,iv:EWB/hMRtWZfEn48Qmjo/V30BtSLrOsmo/cuEKnfW6Wk=,tag:vjiOkVga18BLKjf3GnZM2Q==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrTFI5MDRiUkp1TGF2eHlG + VmwyVEdXQVR4dFJaZTNxeTRXQXZNbkN6T1dRClZyMU1LbFFmY0RwK1pmNDNWY0hW + bUJGYXI5ZEFIdDhUak1kMzF1WTE2SGsKLS0tIHpUQUVEWml1a251RmhQSGt1dm5E + a1hsN3NaVzNvRXlwcEpPd0RVQndiZk0KJ7/cnWzw1zSmgn+bOJn4Y1xRHqlk+zRM + Om0p+V9tUCCS5yGzacp8pFCa2DQNj0OVdyB2ZpjAiOzK7vWY8EU5XA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-05-03T14:29:41Z" + mac: ENC[AES256_GCM,data:ezq0K/lFSNSog0UzvsVNNpCewzBKmKJdsXlkWzZ8nhXN7/1lHeoONQnoEooNhNhpmFF1yCvcArZ6Suy7+R4UuybKBky+6r62fyz0BKrAO9y0Xb/HFiAJPAYwP7/5sRFq/jDdtMAbjLxJhoH128md5LoHXhUUc3sws/SIQvdan4I=,iv:/IxAO3rw4lc8ZzDWUtfJb3siGCtzCxid5NfhEnad01Q=,tag:IRg7LV7hnFmWl5WhWD2ZSg==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1 diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 673b614..c724024 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -24,6 +24,9 @@ # Import server settings ../../server + + # Import disko + # ../../../disko/queen ]; boot.tmp.cleanOnBoot = true; @@ -87,34 +90,34 @@ ]; # Create an auto-update systemd service that runs every day - system.autoUpgrade = { - flake = "git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git"; - dates = "daily"; - enable = true; - }; + # system.autoUpgrade = { + # flake = "git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git"; + # dates = "daily"; + # enable = true; + # }; - systemd.services.systemd-networkd.serviceConfig.Environment = "SYSTEMD_LOG_LEVEL=debug"; + # systemd.services.systemd-networkd.serviceConfig.Environment = "SYSTEMD_LOG_LEVEL=debug"; # Enable networking - networking.networkmanager.enable = true; - networking.nat.enable = true; - networking.nat.internalInterfaces = ["ve-+"]; - networking.nat.externalInterface = "ens18"; - networking.enableIPv6 = lib.mkForce true; - networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; + # networking.networkmanager.enable = true; + # networking.nat.enable = true; + # networking.nat.internalInterfaces = ["ve-+"]; + # networking.nat.externalInterface = "ens18"; + # networking.enableIPv6 = lib.mkForce true; + # networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; - networking.interfaces.ens18.ipv4.addresses = [ - { - address = "62.171.160.195"; - prefixLength = 32; - } - ]; + # networking.interfaces.ens18.ipv4.addresses = [ + # { + # address = "62.171.160.195"; + # prefixLength = 32; + # } + # ]; - networking.interfaces.ens18.ipv6.addresses = [ - { - address = "2a02:c207:2063:2448::1"; - prefixLength = 64; - } - ]; + # networking.interfaces.ens18.ipv6.addresses = [ + # { + # address = "2a02:c207:2063:2448::1"; + # prefixLength = 64; + # } + # ]; # Open ports in the firewall. networking.firewall = { diff --git a/nixos/hosts/queen/hardware-configuration.nix b/nixos/hosts/queen/hardware-configuration.nix index 52ea2b5..3357ba6 100644 --- a/nixos/hosts/queen/hardware-configuration.nix +++ b/nixos/hosts/queen/hardware-configuration.nix @@ -7,12 +7,21 @@ }: { imports = [(modulesPath + "/profiles/qemu-guest.nix")]; boot.loader.grub.device = "/dev/sda"; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod"]; boot.initrd.kernelModules = ["nvme"]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + networking.useDHCP = lib.mkDefault true; + fileSystems."/" = { - device = "/dev/sda3"; + device = "/dev/disk/by-uuid/dc10d09c-9394-4854-acd5-93ceccd2f448"; fsType = "ext4"; }; - swapDevices = [{device = "/dev/sda2";}]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + fileSystems."/nix/store" = { + device = "/nix/store"; + fsType = "none"; + options = ["bind"]; + }; + + swapDevices = []; } diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index 86cf589..3be2efb 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -3,6 +3,8 @@ stdenv, git, gum, + git, + gum, writeShellApplication, }: writeShellApplication @@ -16,7 +18,7 @@ writeShellApplication set -e pushd /tmp > /dev/null rm -rf ./install-nix - git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix + git clone https://codeberg.org/Lillian-Violet/NixOS-Config.git ./install-nix pushd ./install-nix/nixos/hosts > /dev/null echo "Please choose the hostname you are installing to from the following list:" i=1 @@ -39,9 +41,11 @@ writeShellApplication "./disko/''${dir}/default.nix" echo "NixOS Installing..." sudo nixos-install --flake .#"''${dir}" + sudo nixos-install --flake .#"''${dir}" popd > /dev/null echo "Cleaning up repository in '/tmp/install-nix'..." rm -rf ./install-nix + rm -rf ./install-nix popd > /dev/null echo "NixOS Install Succeeded!" ''; diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix index 627bd05..4503fcc 100644 --- a/pkgs/rebuild-no-inhibit/default.nix +++ b/pkgs/rebuild-no-inhibit/default.nix @@ -15,7 +15,7 @@ writeShellApplication set -e pushd /tmp > /dev/null rm -rf ./rebuild - git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild + git clone https://codeberg.org/Lillian-Violet/NixOS-Config.git ./rebuild pushd ./rebuild > /dev/null echo "NixOS Rebuilding..." sudo nixos-rebuild switch --flake .# diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix index 76f5760..a965b8c 100644 --- a/pkgs/update/default.nix +++ b/pkgs/update/default.nix @@ -14,7 +14,7 @@ writeShellApplication set -e pushd /tmp > /dev/null rm -rf ./update - git clone forgejo@git.lillianviolet.dev:Lillian-Violet/NixOS-Config.git ./update + git clone git@codeberg.org:Lillian-Violet/NixOS-Config.git ./update pushd ./update > /dev/null echo "Updating flake lock..." nix flake update diff --git a/result b/result deleted file mode 120000 index ed246ab..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/a9kdf62qv1r5s0nb40a1ij9lm2vsh418-nixos-24.05.20240319.b06025f-x86_64-linux.iso \ No newline at end of file From 79169ce8e51838c52a12e1d5ea908a5123fe834a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 6 May 2024 15:59:06 +0200 Subject: [PATCH 1850/2308] Remove the duplication shit --- flake.nix | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/flake.nix b/flake.nix index 9cab11d..fd6aa3a 100644 --- a/flake.nix +++ b/flake.nix @@ -20,12 +20,8 @@ # catpuccin theme catppuccin.url = "github:catppuccin/nix"; - # catpuccin theme - catppuccin.url = "github:catppuccin/nix"; - # Conduit fork without all the fuss and drama conduit = { - url = "github:girlbossceo/conduwuit"; url = "github:girlbossceo/conduwuit"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -34,10 +30,6 @@ nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - # Nix index database files - nix-index-database.url = "github:nix-community/nix-index-database"; - nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - # Secret management with sops sops-nix.url = "github:Mic92/sops-nix"; @@ -69,8 +61,6 @@ zjstatus.url = "github:dj95/zjstatus"; - zjstatus.url = "github:dj95/zjstatus"; - # Fix for steam cursor not being visible under wayland # Add any other flake you might need @@ -105,7 +95,6 @@ nixpkgs, nixos-generators, catppuccin, - catppuccin, disko, home-manager, sops-nix, @@ -114,14 +103,10 @@ zjstatus, # linger, # pihole, - zjstatus, - # linger, - # pihole, lanzaboote, jovian, nixos-hardware, nix-index-database, - nix-index-database, conduit, ... } @ inputs: let @@ -137,11 +122,6 @@ in { # Your custom packages # Accessible through 'nix build', 'nix shell', etc - packages = forAllSystems (system: - import ./pkgs (import nixpkgs { - inherit system; - config.allowUnfree = true; - })); packages = forAllSystems (system: import ./pkgs (import nixpkgs { inherit system; @@ -177,17 +157,11 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin - nix-index-database.nixosModules.nix-index - catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin inputs.plasma-manager.homeManagerModules.plasma-manager ]; - home-manager.sharedModules = [ - inputs.catppuccin.homeManagerModules.catppuccin - inputs.plasma-manager.homeManagerModules.plasma-manager - ]; } ]; }; @@ -211,10 +185,6 @@ inputs.catppuccin.homeManagerModules.catppuccin inputs.plasma-manager.homeManagerModules.plasma-manager ]; - home-manager.sharedModules = [ - inputs.catppuccin.homeManagerModules.catppuccin - inputs.plasma-manager.homeManagerModules.plasma-manager - ]; } ]; }; @@ -234,12 +204,6 @@ inputs.catppuccin.homeManagerModules.catppuccin ]; } - catppuccin.nixosModules.catppuccin - { - home-manager.sharedModules = [ - inputs.catppuccin.homeManagerModules.catppuccin - ]; - } ]; }; @@ -261,10 +225,6 @@ inputs.plasma-manager.homeManagerModules.plasma-manager inputs.catppuccin.homeManagerModules.catppuccin ]; - home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager - inputs.catppuccin.homeManagerModules.catppuccin - ]; } ]; }; @@ -287,10 +247,6 @@ inputs.plasma-manager.homeManagerModules.plasma-manager inputs.catppuccin.homeManagerModules.catppuccin ]; - home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager - inputs.catppuccin.homeManagerModules.catppuccin - ]; } ]; }; From a659cd9f8021a0e8099268d2c301379b9c343ecf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 6 May 2024 16:01:46 +0200 Subject: [PATCH 1851/2308] This one too --- pkgs/install-nix-no-inhibit/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index 3be2efb..f9365fe 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -3,8 +3,6 @@ stdenv, git, gum, - git, - gum, writeShellApplication, }: writeShellApplication From 2cc062923a04ec81a4d5655f37ff0e140d871046 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 6 May 2024 16:03:46 +0200 Subject: [PATCH 1852/2308] Missed two --- flake.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/flake.nix b/flake.nix index fd6aa3a..b9741b2 100644 --- a/flake.nix +++ b/flake.nix @@ -178,8 +178,6 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin - nix-index-database.nixosModules.nix-index - catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -219,7 +217,6 @@ jovian.nixosModules.jovian home-manager.nixosModules.home-manager catppuccin.nixosModules.catppuccin - catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager @@ -240,8 +237,6 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin - nix-index-database.nixosModules.nix-index - catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager From 0c0385e9970039e741bc40861a76c9b7af8f0214 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 6 May 2024 17:02:26 +0200 Subject: [PATCH 1853/2308] Enable zellij on queen again --- home-manager/hosts/queen/lillian.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index f2c7c2b..3dc5e4f 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -41,10 +41,6 @@ }; }; - programs.zellij = { - enable = lib.mkForce false; - }; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "24.05"; } From a53784fd9fa578fc74946416f08bfc3e7473fb5c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 6 May 2024 17:02:50 +0200 Subject: [PATCH 1854/2308] Ignore .envrc --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 82e0cdf..7fe6033 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/result \ No newline at end of file +/result +.envrc \ No newline at end of file From da7d5b55f9d7077822098e16892d192b3cfc12e6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 6 May 2024 17:03:38 +0200 Subject: [PATCH 1855/2308] Update flake lock --- flake.lock | 88 +++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 4aeb659..132ea34 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1714717104, - "narHash": "sha256-c+LnBnWKPQxNK6ebEe9RYlvGDkhEKJbSO6n0pZrKjdY=", + "lastModified": 1714981510, + "narHash": "sha256-5+/XUDuqqtmFuHspgShYFsX1gYRhLK0La6D8i31djwQ=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "42e3567153f20ace6f287d46fff2d7c070b68840", + "rev": "7b25ef2e6c828f4c541b63706d8651b03e4c896d", "type": "github" }, "original": { @@ -192,11 +192,11 @@ ] }, "locked": { - "lastModified": 1714612856, - "narHash": "sha256-W7+rtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E=", + "lastModified": 1714959124, + "narHash": "sha256-oYmauPDpSgWjY9hvzwd815igGfP8Ds5Bk6bTo5JrBRk=", "owner": "nix-community", "repo": "disko", - "rev": "d57058eb09dd5ec00c746df34fe0a603ea744370", + "rev": "e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d", "type": "github" }, "original": { @@ -431,11 +431,11 @@ ] }, "locked": { - "lastModified": 1714679908, - "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "type": "github" }, "original": { @@ -451,11 +451,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1714720101, - "narHash": "sha256-Dxlj52coLzQZVV4a9IMMc/2xU5FIpj0iaHBigPwoNjM=", + "lastModified": 1714803703, + "narHash": "sha256-4m9wG6mZR0I2d7itErhpY0JqSHomNnUdoKfkjnYp+wI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "68b6bfacf67fcb1660c024b8dcd9376af38bbafe", + "rev": "d0799ebebfb37fd2df6409dc8da622738c5930bb", "type": "github" }, "original": { @@ -533,11 +533,11 @@ ] }, "locked": { - "lastModified": 1714273701, - "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", + "lastModified": 1714878592, + "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "941c4973c824509e0356be455d89613611f76c8a", + "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", "type": "github" }, "original": { @@ -584,11 +584,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1714465198, - "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=", + "lastModified": 1714984131, + "narHash": "sha256-kjIvFbbKb6RGIJyOgcF+BBWHNzhNSNqRTxX/SkrkRno=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4", + "rev": "e148ccbecbd2fe4dc4768fba67f6db828466ad06", "type": "github" }, "original": { @@ -648,11 +648,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1713638189, - "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", + "lastModified": 1714858427, + "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74574c38577914733b4f7a775dd77d24245081dd", + "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", "type": "github" }, "original": { @@ -664,11 +664,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -712,11 +712,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -743,11 +743,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1713596654, - "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", + "lastModified": 1714809261, + "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", + "rev": "d32560238207b8e26d88b265207b216ee46b8450", "type": "github" }, "original": { @@ -783,11 +783,11 @@ ] }, "locked": { - "lastModified": 1714563800, - "narHash": "sha256-6G6/28zu3SxHgGGbN9IeVOcGidTt5dUdQbZEI39goEM=", + "lastModified": 1714856962, + "narHash": "sha256-2te5GG8TVNBF44uMF4G0XFGW+Jt02i/ZkspSNFzjgT0=", "owner": "pjones", "repo": "plasma-manager", - "rev": "4b56c71c9cdb9728316cbb5dd99446b31c585913", + "rev": "1554e19ede17de46106dd95820eeea05086a5720", "type": "github" }, "original": { @@ -830,15 +830,15 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1713810944, - "narHash": "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc=", - "owner": "facebook", + "lastModified": 1714770052, + "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=", + "owner": "girlbossceo", "repo": "rocksdb", - "rev": "6f7cabeac80a3a6150be2c8a8369fcecb107bf43", + "rev": "db6df0b185774778457dabfcbd822cb81760cade", "type": "github" }, "original": { - "owner": "facebook", + "owner": "girlbossceo", "ref": "v9.1.1", "repo": "rocksdb", "type": "github" @@ -939,11 +939,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1714298568, - "narHash": "sha256-HzgySE+n7Ri8faGo+uxYdjlCicgVGV0eJT86cWYIvo4=", + "lastModified": 1714720456, + "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "ef4756bcfc8a6791adbcae2b32f87e2f0a00525d", + "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", "type": "gitlab" }, "original": { @@ -959,11 +959,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1713892811, - "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", + "lastModified": 1714878026, + "narHash": "sha256-YJ1k/jyd6vKqmVgGkkAb4n+ZfPPAt8+L5a73eAThqFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", + "rev": "10dc39496d5b027912038bde8d68c836576ad0bc", "type": "github" }, "original": { From 3b9876bb103f1704c08cb90412694c3ecb5d86ec Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 7 May 2024 09:59:35 +0200 Subject: [PATCH 1856/2308] let's try ipv6 without that weird debug thing, hope that's what broke the server --- nixos/hosts/queen/configuration.nix | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index c724024..b896703 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -98,26 +98,26 @@ # systemd.services.systemd-networkd.serviceConfig.Environment = "SYSTEMD_LOG_LEVEL=debug"; # Enable networking - # networking.networkmanager.enable = true; - # networking.nat.enable = true; - # networking.nat.internalInterfaces = ["ve-+"]; - # networking.nat.externalInterface = "ens18"; - # networking.enableIPv6 = lib.mkForce true; - # networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; + networking.networkmanager.enable = true; + networking.nat.enable = true; + networking.nat.internalInterfaces = ["ve-+"]; + networking.nat.externalInterface = "ens18"; + networking.enableIPv6 = lib.mkForce true; + networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; - # networking.interfaces.ens18.ipv4.addresses = [ - # { - # address = "62.171.160.195"; - # prefixLength = 32; - # } - # ]; + networking.interfaces.ens18.ipv4.addresses = [ + { + address = "62.171.160.195"; + prefixLength = 32; + } + ]; - # networking.interfaces.ens18.ipv6.addresses = [ - # { - # address = "2a02:c207:2063:2448::1"; - # prefixLength = 64; - # } - # ]; + networking.interfaces.ens18.ipv6.addresses = [ + { + address = "2a02:c207:2063:2448::1"; + prefixLength = 64; + } + ]; # Open ports in the firewall. networking.firewall = { From 2ce48ca0b6c26e660801b11a84642b51fc560463 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 7 May 2024 10:26:15 +0200 Subject: [PATCH 1857/2308] Disable the networking tweaks for queen first, test later so we can roll back --- .envrc | 1 + nixos/hosts/queen/configuration.nix | 40 ++++++++++++++++------------- 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..490e97b --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake "git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git?dir=nix" diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index b896703..1ccf8b5 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -98,26 +98,30 @@ # systemd.services.systemd-networkd.serviceConfig.Environment = "SYSTEMD_LOG_LEVEL=debug"; # Enable networking - networking.networkmanager.enable = true; - networking.nat.enable = true; - networking.nat.internalInterfaces = ["ve-+"]; - networking.nat.externalInterface = "ens18"; - networking.enableIPv6 = lib.mkForce true; - networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; + # networking.networkmanager.enable = true; + # networking.nat.enable = true; + # networking.nat.internalInterfaces = ["ve-+"]; + # networking.nat.externalInterface = "ens18"; + # networking.enableIPv6 = lib.mkForce true; + # networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; - networking.interfaces.ens18.ipv4.addresses = [ - { - address = "62.171.160.195"; - prefixLength = 32; - } - ]; + # networking.interfaces.ens18.ipv4.addresses = [ + # { + # address = "62.171.160.195"; + # prefixLength = 32; + # } + # ]; - networking.interfaces.ens18.ipv6.addresses = [ - { - address = "2a02:c207:2063:2448::1"; - prefixLength = 64; - } - ]; + # networking.interfaces.ens18.ipv6.addresses = [ + # { + # address = "2a02:c207:2063:2448::1"; + # prefixLength = 64; + # } + # ]; + # networking.defaultGateway6 = { + # address = "fe80::1"; + # interface = "ens18"; + # }; # Open ports in the firewall. networking.firewall = { From 6d71d805100831dc40e506fe1ca2042c1d9c09a8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 7 May 2024 10:28:34 +0200 Subject: [PATCH 1858/2308] Let's try minor tweaks to the interface and see if it craps out --- nixos/hosts/queen/configuration.nix | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1ccf8b5..89eae45 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -105,23 +105,23 @@ # networking.enableIPv6 = lib.mkForce true; # networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; - # networking.interfaces.ens18.ipv4.addresses = [ - # { - # address = "62.171.160.195"; - # prefixLength = 32; - # } - # ]; + networking.interfaces.ens18.ipv4.addresses = [ + { + address = "62.171.160.195"; + prefixLength = 32; + } + ]; - # networking.interfaces.ens18.ipv6.addresses = [ - # { - # address = "2a02:c207:2063:2448::1"; - # prefixLength = 64; - # } - # ]; - # networking.defaultGateway6 = { - # address = "fe80::1"; - # interface = "ens18"; - # }; + networking.interfaces.ens18.ipv6.addresses = [ + { + address = "2a02:c207:2063:2448::1"; + prefixLength = 64; + } + ]; + networking.defaultGateway6 = { + address = "fe80::1"; + interface = "ens18"; + }; # Open ports in the firewall. networking.firewall = { From b033214d792df7985296840670e3c5d0aa86ff5d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 7 May 2024 10:32:15 +0200 Subject: [PATCH 1859/2308] Disable again, let's try some more tweaks --- nixos/hosts/queen/configuration.nix | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 89eae45..1ccf8b5 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -105,23 +105,23 @@ # networking.enableIPv6 = lib.mkForce true; # networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; - networking.interfaces.ens18.ipv4.addresses = [ - { - address = "62.171.160.195"; - prefixLength = 32; - } - ]; + # networking.interfaces.ens18.ipv4.addresses = [ + # { + # address = "62.171.160.195"; + # prefixLength = 32; + # } + # ]; - networking.interfaces.ens18.ipv6.addresses = [ - { - address = "2a02:c207:2063:2448::1"; - prefixLength = 64; - } - ]; - networking.defaultGateway6 = { - address = "fe80::1"; - interface = "ens18"; - }; + # networking.interfaces.ens18.ipv6.addresses = [ + # { + # address = "2a02:c207:2063:2448::1"; + # prefixLength = 64; + # } + # ]; + # networking.defaultGateway6 = { + # address = "fe80::1"; + # interface = "ens18"; + # }; # Open ports in the firewall. networking.firewall = { From 41ca870d1c24c3ff804432eb50443d79c621c30c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 7 May 2024 10:33:28 +0200 Subject: [PATCH 1860/2308] Same tweaks as before but added the nameservers --- nixos/hosts/queen/configuration.nix | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1ccf8b5..977d1b0 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -102,26 +102,26 @@ # networking.nat.enable = true; # networking.nat.internalInterfaces = ["ve-+"]; # networking.nat.externalInterface = "ens18"; - # networking.enableIPv6 = lib.mkForce true; - # networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; + networking.enableIPv6 = lib.mkForce true; + networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; - # networking.interfaces.ens18.ipv4.addresses = [ - # { - # address = "62.171.160.195"; - # prefixLength = 32; - # } - # ]; + networking.interfaces.ens18.ipv4.addresses = [ + { + address = "62.171.160.195"; + prefixLength = 32; + } + ]; - # networking.interfaces.ens18.ipv6.addresses = [ - # { - # address = "2a02:c207:2063:2448::1"; - # prefixLength = 64; - # } - # ]; - # networking.defaultGateway6 = { - # address = "fe80::1"; - # interface = "ens18"; - # }; + networking.interfaces.ens18.ipv6.addresses = [ + { + address = "2a02:c207:2063:2448::1"; + prefixLength = 64; + } + ]; + networking.defaultGateway6 = { + address = "fe80::1"; + interface = "ens18"; + }; # Open ports in the firewall. networking.firewall = { From 00179e7f623e21f3f2bd1424563eee30bbfa4529 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 7 May 2024 10:36:30 +0200 Subject: [PATCH 1861/2308] That broke ipv4 but not 6! Let's try and see if this works --- nixos/hosts/queen/configuration.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 977d1b0..8c6a6a4 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -103,14 +103,14 @@ # networking.nat.internalInterfaces = ["ve-+"]; # networking.nat.externalInterface = "ens18"; networking.enableIPv6 = lib.mkForce true; - networking.nameservers = ["79.143.183.251" "79.143.183.252" "2a02:c207::1:53" "2a02:c207::2:53"]; + networking.nameservers = ["2a02:c207::1:53" "2a02:c207::2:53"]; - networking.interfaces.ens18.ipv4.addresses = [ - { - address = "62.171.160.195"; - prefixLength = 32; - } - ]; + # networking.interfaces.ens18.ipv4.addresses = [ + # { + # address = "62.171.160.195"; + # prefixLength = 32; + # } + # ]; networking.interfaces.ens18.ipv6.addresses = [ { From 31a47c71bec9d850ddf20098a7f75e4981dbf98c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 7 May 2024 14:04:41 +0200 Subject: [PATCH 1862/2308] update flake lock --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 132ea34..34d85ce 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1714981510, - "narHash": "sha256-5+/XUDuqqtmFuHspgShYFsX1gYRhLK0La6D8i31djwQ=", + "lastModified": 1715064295, + "narHash": "sha256-/JXeVDvv2pkxbIoxmiVw9LwRmj4yMeKqFJN7eukP5G4=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "7b25ef2e6c828f4c541b63706d8651b03e4c896d", + "rev": "43b07be3fc81f8cabfba193784fb92c997fd2293", "type": "github" }, "original": { @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1713979152, - "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=", + "lastModified": 1714864355, + "narHash": "sha256-uXNW6bapWFfkYIkK1EagydSrFMqycOYEDSq75GmUpjk=", "owner": "ipetkov", "repo": "crane", - "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c", + "rev": "442a7a6152f49b907e73206dc8e1f46a61e8e873", "type": "github" }, "original": { @@ -192,11 +192,11 @@ ] }, "locked": { - "lastModified": 1714959124, - "narHash": "sha256-oYmauPDpSgWjY9hvzwd815igGfP8Ds5Bk6bTo5JrBRk=", + "lastModified": 1715070411, + "narHash": "sha256-5CNvkH0Nf7yMwgKhjUNg/lUK40C7DXB4zKOuA2jVO90=", "owner": "nix-community", "repo": "disko", - "rev": "e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d", + "rev": "4677f6c53482a8b01ee93957e3bdd569d51261d6", "type": "github" }, "original": { @@ -431,11 +431,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1715077503, + "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "6e277d9566de9976f47228dd8c580b97488734d4", "type": "github" }, "original": { @@ -584,11 +584,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1714984131, - "narHash": "sha256-kjIvFbbKb6RGIJyOgcF+BBWHNzhNSNqRTxX/SkrkRno=", + "lastModified": 1715010655, + "narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e148ccbecbd2fe4dc4768fba67f6db828466ad06", + "rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb", "type": "github" }, "original": { @@ -759,11 +759,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1714091391, - "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", + "lastModified": 1715037484, + "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", + "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", "type": "github" }, "original": { @@ -918,11 +918,11 @@ ] }, "locked": { - "lastModified": 1714097613, - "narHash": "sha256-044xbpBszupqN3nl/CGOCJtTQ4O6Aca81mJpX45i8/I=", + "lastModified": 1715048276, + "narHash": "sha256-SqWSTvCjNBBnV/WIQdaxVi5V9H3VJ7cOJAxPQdR1TBY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2a42c742ab04b61d9b2f1edf392842cf9f27ebfd", + "rev": "b037d65c988421b54024e62691eace4f2fe623bc", "type": "github" }, "original": { @@ -959,11 +959,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1714878026, - "narHash": "sha256-YJ1k/jyd6vKqmVgGkkAb4n+ZfPPAt8+L5a73eAThqFU=", + "lastModified": 1715035358, + "narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "10dc39496d5b027912038bde8d68c836576ad0bc", + "rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1", "type": "github" }, "original": { @@ -1073,11 +1073,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1714117167, - "narHash": "sha256-Dw+x2AWL5BKmkZL1Aewlh8Elp+4bhsR0ukaukqnm2Uo=", + "lastModified": 1715068400, + "narHash": "sha256-KlUQXz2tJD5texFCH9fpuJHmCqZjTCAauYc0fUCxlGQ=", "owner": "dj95", "repo": "zjstatus", - "rev": "cda2388764cc96832d7260e4114fc5c5c8699de3", + "rev": "3f91eda1cd51e34f35020110a1fa1c092a2f6d84", "type": "github" }, "original": { From 5080d69f9d9c458b89e5a2a9f9c4daa9b5095d0f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 8 May 2024 11:16:20 +0200 Subject: [PATCH 1863/2308] Switch to lix --- flake.nix | 17 +++++++++++++++++ nixos/shared/default.nix | 2 ++ 2 files changed, 19 insertions(+) diff --git a/flake.nix b/flake.nix index b9741b2..45b9d48 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,16 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + lix = { + url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; + flake = false; + }; + lix-module = { + url = "git+https://git.lix.systems/lix-project/nixos-module"; + inputs.lix.follows = "lix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # Disko for declaratively setting disk formatting @@ -104,6 +114,7 @@ # linger, # pihole, lanzaboote, + lix-module, jovian, nixos-hardware, nix-index-database, @@ -156,6 +167,7 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index + lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -177,6 +189,7 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index + lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -197,6 +210,7 @@ disko.nixosModules.disko simple-nixos-mailserver.nixosModule catppuccin.nixosModules.catppuccin + lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -216,6 +230,7 @@ disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager + lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -237,6 +252,7 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager @@ -257,6 +273,7 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 43711d2..100badc 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -33,6 +33,8 @@ experimental-features = "nix-command flakes"; # Deduplicate and optimize nix store auto-optimise-store = true; + extra-substituters = ["https://cache.lix.systems"]; + trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="]; }; }; From a537cf8e2c83ce1b5769909990fdb21ea58dbef6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 8 May 2024 11:17:35 +0200 Subject: [PATCH 1864/2308] update flake lock --- flake.lock | 116 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 104 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 34d85ce..ccea06d 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1714607657, - "narHash": "sha256-AnmN+JOzrpHv7Uw7JSPJ9JEjuqF7gjhx29UuuldNpas=", + "lastModified": 1715128602, + "narHash": "sha256-KmIgXJ5fZmYsb+QeGZcauZIX7eN7PyTJI+t2LzuSLnU=", "owner": "catppuccin", "repo": "nix", - "rev": "b0dc7f3181063daa6532dc5f757ded1a605dfbd5", + "rev": "eaa6e281f144a5ac90510d9a07d74bf5e9a4459f", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1715064295, - "narHash": "sha256-/JXeVDvv2pkxbIoxmiVw9LwRmj4yMeKqFJN7eukP5G4=", + "lastModified": 1715140745, + "narHash": "sha256-ypZHG+F4EOLhpc02mOTr6H50ybgF4qPsVrpLf58Oi1c=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "43b07be3fc81f8cabfba193784fb92c997fd2293", + "rev": "245c34e65918738e6d07685aadfe97da9a274791", "type": "github" }, "original": { @@ -386,7 +386,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -402,6 +402,39 @@ "type": "github" } }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -488,6 +521,48 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1714955862, + "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", + "ref": "refs/tags/2.90-beta.1", + "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", + "revCount": 15501, + "type": "git", + "url": "https://git@git.lix.systems/lix-project/lix" + }, + "original": { + "ref": "refs/tags/2.90-beta.1", + "type": "git", + "url": "https://git@git.lix.systems/lix-project/lix" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_5", + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715038983, + "narHash": "sha256-DCZbFoNM8sx6YhEtu/xkNZfRwEt7RucJr3zuVVkugIw=", + "ref": "refs/heads/main", + "rev": "aaf759cd93d1946336247808e7551df714cfd332", + "revCount": 70, + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + } + }, "nix-filter": { "locked": { "lastModified": 1710156097, @@ -584,11 +659,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715010655, - "narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=", + "lastModified": 1715148395, + "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb", + "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", "type": "github" }, "original": { @@ -853,6 +928,8 @@ "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", + "lix": "lix", + "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", @@ -1047,9 +1124,24 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1709126324, @@ -1068,7 +1160,7 @@ "zjstatus": { "inputs": { "crane": "crane_4", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay_2" }, From 416d45d06efe1af689af97d31bfd5e48d603d4f0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 8 May 2024 14:35:08 +0200 Subject: [PATCH 1865/2308] Remove the pihole stuff completely --- flake.nix | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/flake.nix b/flake.nix index 45b9d48..0d5bafd 100644 --- a/flake.nix +++ b/flake.nix @@ -75,29 +75,6 @@ # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; - - # Required for making sure that Pi-hole continues running if the executing user has no active session. - # linger = { - # url = "github:mindsbackyard/linger-flake"; - # inputs.flake-utils.follows = "flake-utils"; - # }; - # linger = { - # url = "github:mindsbackyard/linger-flake"; - # inputs.flake-utils.follows = "flake-utils"; - # }; - - # pihole = { - # url = "github:mindsbackyard/pihole-flake"; - # inputs.nixpkgs.follows = "nixpkgs"; - # inputs.flake-utils.follows = "flake-utils"; - # inputs.linger.follows = "linger"; - # }; - # pihole = { - # url = "github:mindsbackyard/pihole-flake"; - # inputs.nixpkgs.follows = "nixpkgs"; - # inputs.flake-utils.follows = "flake-utils"; - # inputs.linger.follows = "linger"; - # }; }; outputs = { @@ -111,8 +88,6 @@ simple-nixos-mailserver, plasma-manager, zjstatus, - # linger, - # pihole, lanzaboote, lix-module, jovian, @@ -281,26 +256,6 @@ } ]; }; - - # wheatley = nixpkgs.lib.nixosSystem { - # system = "armv7l-linux"; - # specialArgs = {inherit inputs outputs;}; - # modules = [ - # catppuccin.nixosModules.catppuccin - # # make the module declared by the linger flake available to our config - # #linger.nixosModules."armv7l-linux".default - # #pihole.nixosModules."armv7l-linux".default - # disko.nixosModules.disko - # # > Our main nixos configuration file < - # ./nixos/hosts/wheatley/configuration.nix - # sops-nix.nixosModules.sops - # { - # home-manager.sharedModules = [ - # inputs.catppuccin.homeManagerModules.catppuccin - # ]; - # } - # ]; - # }; }; }; } From 54c4a4972599ac8d15a6afb17bc578bbbc4d68b7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 8 May 2024 14:57:34 +0200 Subject: [PATCH 1866/2308] Disable shutdown and reboot timers --- home-manager/shared/shell/zsh.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index f6ea06b..d68ee10 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -20,6 +20,8 @@ cat = "bat"; tree = "tre"; neofetch = "hyfetch"; + shutdown = "shutdown 0"; + reboot = "reboot 0"; }; plugins = [ { From f3971937d7bcd09b30c30227924632be5ddc03f4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 9 May 2024 22:05:37 +0200 Subject: [PATCH 1867/2308] update flake lock --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index ccea06d..d92671c 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1715128602, - "narHash": "sha256-KmIgXJ5fZmYsb+QeGZcauZIX7eN7PyTJI+t2LzuSLnU=", + "lastModified": 1715210854, + "narHash": "sha256-88jxvd+LIP/XwlvJ3+QPbGCFMChmBfIbUNp1mEP9DJY=", "owner": "catppuccin", "repo": "nix", - "rev": "eaa6e281f144a5ac90510d9a07d74bf5e9a4459f", + "rev": "e5322f7b4001aa8aab38ca5a0f42cafc590f42b6", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1715140745, - "narHash": "sha256-ypZHG+F4EOLhpc02mOTr6H50ybgF4qPsVrpLf58Oi1c=", + "lastModified": 1715272490, + "narHash": "sha256-fw7rqekeep3RUW9YTkcv6zmOErX5G0VA8crssZcjqfk=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "245c34e65918738e6d07685aadfe97da9a274791", + "rev": "6de9f52d5abcf5915be97996ec00d9d3c2aac006", "type": "github" }, "original": { @@ -192,11 +192,11 @@ ] }, "locked": { - "lastModified": 1715070411, - "narHash": "sha256-5CNvkH0Nf7yMwgKhjUNg/lUK40C7DXB4zKOuA2jVO90=", + "lastModified": 1715217706, + "narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=", "owner": "nix-community", "repo": "disko", - "rev": "4677f6c53482a8b01ee93957e3bdd569d51261d6", + "rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046", "type": "github" }, "original": { @@ -484,11 +484,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1714803703, - "narHash": "sha256-4m9wG6mZR0I2d7itErhpY0JqSHomNnUdoKfkjnYp+wI=", + "lastModified": 1715173236, + "narHash": "sha256-Ulq7fV0V1TqbYTXcDcRYrnMBwAvXJGfv4fnpaXXpsY0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d0799ebebfb37fd2df6409dc8da622738c5930bb", + "rev": "c8af9ea43d928f1e1f2c0ac100e75519ea76565d", "type": "github" }, "original": { @@ -550,11 +550,11 @@ ] }, "locked": { - "lastModified": 1715038983, - "narHash": "sha256-DCZbFoNM8sx6YhEtu/xkNZfRwEt7RucJr3zuVVkugIw=", + "lastModified": 1715278311, + "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=", "ref": "refs/heads/main", - "rev": "aaf759cd93d1946336247808e7551df714cfd332", - "revCount": 70, + "rev": "c8ab1e79ba0140bc75731c75177242089506260b", + "revCount": 75, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -739,11 +739,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1715087517, + "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", "type": "github" }, "original": { @@ -787,11 +787,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1715087517, + "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", "type": "github" }, "original": { @@ -1036,11 +1036,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1715035358, - "narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=", + "lastModified": 1715244550, + "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1", + "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1715068400, - "narHash": "sha256-KlUQXz2tJD5texFCH9fpuJHmCqZjTCAauYc0fUCxlGQ=", + "lastModified": 1715177960, + "narHash": "sha256-47EdSIRvRfn0ZIOGHeoBQxpA2nyY29VjFPjSRYel/tU=", "owner": "dj95", "repo": "zjstatus", - "rev": "3f91eda1cd51e34f35020110a1fa1c092a2f6d84", + "rev": "d124427b2fa597aacd330d0f73557e4fb20fbbdd", "type": "github" }, "original": { From 6bd990c51b3de676968997e048531f8866ea4a38 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 May 2024 00:22:27 +0200 Subject: [PATCH 1868/2308] Let's see if this makes sliding sync work --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 83e0acd..f223d08 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -123,7 +123,7 @@ in { add_header Access-Control-Allow-Origin "*"; ''; }; - locations."/_matrix/client/unstable/org.matrix.msc3575/sync" = { + locations."~ ^(/_matrix/client/unstable/org.matrix.msc3575/sync)" = { proxyPass = "http://backend_conduit/client/unstable/org.matrix.msc3575/sync"; proxyWebsockets = true; extraConfig = '' From c802a38b9189f8d802a4cef440d3a75667dd7e76 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 May 2024 00:25:11 +0200 Subject: [PATCH 1869/2308] That didn't work, no clue tbh --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index f223d08..83e0acd 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -123,7 +123,7 @@ in { add_header Access-Control-Allow-Origin "*"; ''; }; - locations."~ ^(/_matrix/client/unstable/org.matrix.msc3575/sync)" = { + locations."/_matrix/client/unstable/org.matrix.msc3575/sync" = { proxyPass = "http://backend_conduit/client/unstable/org.matrix.msc3575/sync"; proxyWebsockets = true; extraConfig = '' From 05fc4b8e28d84719115493b49e72e5085d8bffa6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 May 2024 00:27:22 +0200 Subject: [PATCH 1870/2308] Maybe disabling this will help? --- nixos/server/package-configs/conduit/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 83e0acd..1464dbe 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -63,7 +63,7 @@ in { # Configure NGINX as a reverse proxy services.nginx = { enable = true; - recommendedProxySettings = true; + recommendedProxySettings = false; virtualHosts = { "${server_name}" = { @@ -126,6 +126,7 @@ in { locations."/_matrix/client/unstable/org.matrix.msc3575/sync" = { proxyPass = "http://backend_conduit/client/unstable/org.matrix.msc3575/sync"; proxyWebsockets = true; + recommendedProxySettings = false; extraConfig = '' proxy_set_header Host $host; proxy_buffering off; From b2b81b1964a040d7249c72c727caed528bfc4359 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 10 May 2024 00:28:27 +0200 Subject: [PATCH 1871/2308] Can't put that there --- nixos/server/package-configs/conduit/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 1464dbe..db316af 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -63,7 +63,6 @@ in { # Configure NGINX as a reverse proxy services.nginx = { enable = true; - recommendedProxySettings = false; virtualHosts = { "${server_name}" = { From 62a6706db040c7e49f10838c23cccf93ff8a71f6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 11 May 2024 14:38:11 +0200 Subject: [PATCH 1872/2308] update flake lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d92671c..2c85447 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1715272490, - "narHash": "sha256-fw7rqekeep3RUW9YTkcv6zmOErX5G0VA8crssZcjqfk=", + "lastModified": 1715396204, + "narHash": "sha256-IYT/n9vFWOXDergfXe5iOFGTe8TrjI+rYcwQQEWy2iY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "6de9f52d5abcf5915be97996ec00d9d3c2aac006", + "rev": "18e43e1d35c70e71b5fbaf44059f96a0bc4cf49e", "type": "github" }, "original": { @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1715077503, - "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", + "lastModified": 1715380449, + "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e277d9566de9976f47228dd8c580b97488734d4", + "rev": "d7682620185f213df384c363288093b486b2883f", "type": "github" }, "original": { @@ -484,11 +484,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1715173236, - "narHash": "sha256-Ulq7fV0V1TqbYTXcDcRYrnMBwAvXJGfv4fnpaXXpsY0=", + "lastModified": 1715417624, + "narHash": "sha256-Wp3vGZRQYVrEveB9UXXZRDvRFrkw6rXXXLxj/6sbg7M=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c8af9ea43d928f1e1f2c0ac100e75519ea76565d", + "rev": "8fef078acb3206be58ae5892a32d6ed75b695647", "type": "github" }, "original": { @@ -739,11 +739,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -787,11 +787,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { From f2e6c756f4e7ed5889445850f9ebf70b0b734874 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 11 May 2024 20:39:23 +0200 Subject: [PATCH 1873/2308] hide the top bar in konsole --- home-manager/desktop/package-configs/konsole/konsolerc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/home-manager/desktop/package-configs/konsole/konsolerc b/home-manager/desktop/package-configs/konsole/konsolerc index ea270b8..15754ac 100644 --- a/home-manager/desktop/package-configs/konsole/konsolerc +++ b/home-manager/desktop/package-configs/konsole/konsolerc @@ -4,11 +4,13 @@ DefaultProfile=Catppuccin.profile [General] ConfigVersion=1 +[KonsoleWindow] +RememberWindowSize=false + [MainWindow] -1920x1080 screen: Height=524 +1920x1080 screen: Height=512 1920x1080 screen: Width=911 -RestorePositionForNextInstance=false -State=AAAA/wAAAAD9AAAAAQAAAAAAAAAAAAAAAPwCAAAAAvsAAAAcAFMAUwBIAE0AYQBuAGEAZwBlAHIARABvAGMAawAAAAAA/////wAAAREA////+wAAACIAUQB1AGkAYwBrAEMAbwBtAG0AYQBuAGQAcwBEAG8AYwBrAAAAAAD/////AAABcgD///8AAAOPAAAB3gAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAACAAAAFgBtAGEAaQBuAFQAbwBvAGwAQgBhAHIBAAAAAP////8AAAAAAAAAAAAAABwAcwBlAHMAcwBpAG8AbgBUAG8AbwBsAGIAYQByAQAAAOj/////AAAAAAAAAAA= +State=AAAA/wAAAAD9AAAAAQAAAAAAAAAAAAAAAPwCAAAAAvsAAAAcAFMAUwBIAE0AYQBuAGEAZwBlAHIARABvAGMAawAAAAAA/////wAAAREA////+wAAACIAUQB1AGkAYwBrAEMAbwBtAG0AYQBuAGQAcwBEAG8AYwBrAAAAAAD/////AAABcgD///8AAAOPAAACDAAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAACAAAAFgBtAGEAaQBuAFQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAAAAABwAcwBlAHMAcwBpAG8AbgBUAG8AbwBsAGIAYQByAAAAAAD/////AAAAAAAAAAA= ToolBarsMovable=Disabled [UiSettings] From acccba01c0f102aab72474391dbda878504e884d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 11 May 2024 21:26:22 +0200 Subject: [PATCH 1874/2308] Update plasma and add foot as terminal emulator --- home-manager/desktop/default.nix | 1 + .../desktop/package-configs/foot/default.nix | 20 +++ .../package-configs/plasma-desktop.nix | 160 ++++++++++-------- 3 files changed, 114 insertions(+), 67 deletions(-) create mode 100644 home-manager/desktop/package-configs/foot/default.nix diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 525e5be..088d5ca 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -19,6 +19,7 @@ ./package-configs/plasma-desktop.nix ./package-configs/firefox.nix ./package-configs/konsole + ./package-configs/foot ]; nixpkgs = { # You can add overlays here diff --git a/home-manager/desktop/package-configs/foot/default.nix b/home-manager/desktop/package-configs/foot/default.nix new file mode 100644 index 0000000..464925f --- /dev/null +++ b/home-manager/desktop/package-configs/foot/default.nix @@ -0,0 +1,20 @@ +{ + lib, + pkgs, + inputs, + ... +}: { + programs.foot = { + enable = true; + catppuccin.enable = true; + settings = { + main = { + font = "Fira Code:size=11"; + }; + + mouse = { + hide-when-typing = "yes"; + }; + }; + }; +} diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 6d7f175..4aa2f94 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -1,11 +1,4 @@ { - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { programs.plasma = { enable = true; shortcuts = { @@ -15,7 +8,7 @@ "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kcm_touchpad"."Toggle Touchpad" = ["" "Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; @@ -23,10 +16,10 @@ "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mic_mute" = ["" "Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; "ksmserver"."Halt Without Confirmation" = []; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Lock Session" = ["" "Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; "ksmserver"."Log Out Without Confirmation" = []; "ksmserver"."Reboot" = []; @@ -39,7 +32,7 @@ "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeAll" = ["" "Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = []; "kwin"."Grid View" = "Meta+G"; @@ -189,7 +182,7 @@ "kwin"."Window to Screen 6" = []; "kwin"."Window to Screen 7" = []; "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; + "kwin"."view_zoom_in" = ["" "Meta++" "Meta+\x3d"]; "kwin"."view_zoom_out" = "Meta+-"; "mediacontrol"."mediavolumedown" = []; "mediacontrol"."mediavolumeup" = []; @@ -211,7 +204,7 @@ "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = []; - "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"]; + "org_kde_powerdevil"."powerProfile" = ["" "Battery" "Meta+B"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; "plasmashell"."activate task manager entry 10" = []; "plasmashell"."activate task manager entry 2" = "Meta+2"; @@ -240,33 +233,33 @@ "plasmashell"."switch to previous activity" = []; "plasmashell"."toggle do not disturb" = []; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "Meta+Print" "Ctrl+!"]; "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "Ctrl+$" "Shift+Print"]; "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/org.kde.spectacle.desktop"."RecordRegion" = []; "services/org.kde.spectacle.desktop"."RecordScreen" = []; "services/org.kde.spectacle.desktop"."RecordWindow" = []; - "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; - "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "Ctrl+@" "Meta+Shift+Print"]; + "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "Meta+Print" "Ctrl+!"]; "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { @@ -276,6 +269,7 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; "dolphinrc"."IconsMode"."PreviewSize" = 80; @@ -823,50 +817,82 @@ "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions[$d]" = ""; - "khotkeysrc"."General"."BrowserApplication[$d]" = ""; - "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; - "khotkeysrc"."General"."ColorScheme[$d]" = ""; + "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions" = ""; + "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions\x5b$d\x5d" = ""; + "khotkeysrc"."General"."BrowserApplication" = ""; + "khotkeysrc"."General"."BrowserApplication\x5b$d\x5d" = ""; + "khotkeysrc"."General"."ColorSchemeHash\x5b$d\x5d" = ""; + "khotkeysrc"."General"."ColorScheme\x5b$d\x5d" = ""; "khotkeysrc"."Gestures"."Disabled" = true; "khotkeysrc"."Gestures"."MouseButton" = 2; "khotkeysrc"."Gestures"."Timeout" = 300; "khotkeysrc"."GesturesExclude"."Comment" = ""; "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; - "khotkeysrc"."Icons"."Theme[$d]" = ""; - "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = ""; - "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = ""; - "khotkeysrc"."KDE"."ShowDeleteCommand[$d]" = ""; - "khotkeysrc"."KDE"."SingleClick[$d]" = ""; - "khotkeysrc"."KDE"."widgetStyle[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = ""; - "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; - "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; + "khotkeysrc"."Icons"."Theme\x5b$d\x5d" = ""; + "khotkeysrc"."KDE"."AnimationDurationFactor" = ""; + "khotkeysrc"."KDE"."AnimationDurationFactor\x5b$d\x5d" = ""; + "khotkeysrc"."KDE"."LookAndFeelPackage\x5b$d\x5d" = ""; + "khotkeysrc"."KDE"."ShowDeleteCommand" = ""; + "khotkeysrc"."KDE"."ShowDeleteCommand\x5b$d\x5d" = ""; + "khotkeysrc"."KDE"."SingleClick" = ""; + "khotkeysrc"."KDE"."SingleClick\x5b$d\x5d" = ""; + "khotkeysrc"."KDE"."widgetStyle" = ""; + "khotkeysrc"."KDE"."widgetStyle\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width\x5b$d\x5d" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style\x5b$d\x5d" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size\x5b$d\x5d" = ""; "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; "khotkeysrc"."Main"."Disabled" = false; - "khotkeysrc"."PreviewSettings"."MaximumRemoteSize[$d]" = ""; + "khotkeysrc"."PreviewSettings"."MaximumRemoteSize" = ""; + "khotkeysrc"."PreviewSettings"."MaximumRemoteSize\x5b$d\x5d" = ""; "khotkeysrc"."Voice"."Shortcut" = ""; - "khotkeysrc"."WM"."activeBackground[$d]" = ""; - "khotkeysrc"."WM"."activeBlend[$d]" = ""; - "khotkeysrc"."WM"."activeForeground[$d]" = ""; - "khotkeysrc"."WM"."inactiveBackground[$d]" = ""; - "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; - "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; + "khotkeysrc"."WM"."activeBackground" = ""; + "khotkeysrc"."WM"."activeBackground\x5b$d\x5d" = ""; + "khotkeysrc"."WM"."activeBlend" = ""; + "khotkeysrc"."WM"."activeBlend\x5b$d\x5d" = ""; + "khotkeysrc"."WM"."activeForeground" = ""; + "khotkeysrc"."WM"."activeForeground\x5b$d\x5d" = ""; + "khotkeysrc"."WM"."inactiveBackground" = ""; + "khotkeysrc"."WM"."inactiveBackground\x5b$d\x5d" = ""; + "khotkeysrc"."WM"."inactiveBlend" = ""; + "khotkeysrc"."WM"."inactiveBlend\x5b$d\x5d" = ""; + "khotkeysrc"."WM"."inactiveForeground" = ""; + "khotkeysrc"."WM"."inactiveForeground\x5b$d\x5d" = ""; "kiorc"."Confirmations"."ConfirmDelete" = true; "kiorc"."Confirmations"."ConfirmEmptyTrash" = true; "kiorc"."Confirmations"."ConfirmTrash" = false; @@ -906,12 +932,12 @@ "kwinrc"."Plugins"."dimscreenEnabled" = true; "kwinrc"."Plugins"."wobblywindowsEnabled" = true; "kwinrc"."Tiling"."padding" = 4; - "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}],\"width\":1}]}"; - "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; - "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5231481481481481,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.4979166666666667},{\"width\":0.5020833333333333}]},{\"height\":0.47685185185185075,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.49895833333333334},{\"width\":0.5010416666666666}]}],\"width\":1}]}"; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}\x5d}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}\x5d}"; + "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"layoutDirection\":\"vertical\",\"tiles\":\x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.5},{\"width\":0.5}\x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.5},{\"width\":0.5}\x5d}\x5d,\"width\":1}\x5d}"; + "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}\x5d}"; + "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}\x5d}"; + "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"layoutDirection\":\"vertical\",\"tiles\":\x5b{\"height\":0.5231481481481481,\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.4979166666666667},{\"width\":0.5020833333333333}\x5d},{\"height\":0.47685185185185075,\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.49895833333333334},{\"width\":0.5010416666666666}\x5d}\x5d,\"width\":1}\x5d}"; "kwinrc"."Xwayland"."Scale" = 1; "kxkbrc"."Layout"."Options" = "compose:caps"; "kxkbrc"."Layout"."ResetOldOptions" = true; From ccf1e416cfa42f9026337e5d54e9151f751e1a71 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 May 2024 18:03:05 +0200 Subject: [PATCH 1875/2308] Update plasma manager, update zellij layout to re-enable mode switching for panels --- .../package-configs/plasma-desktop.nix | 88 ++++--------- home-manager/shared/shell/zellij.nix | 119 ++++++++++-------- 2 files changed, 95 insertions(+), 112 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 4aa2f94..5d68046 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -8,7 +8,7 @@ "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["" "Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; @@ -16,10 +16,10 @@ "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["" "Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; "ksmserver"."Halt Without Confirmation" = []; - "ksmserver"."Lock Session" = ["" "Meta+L" "Screensaver"]; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; "ksmserver"."Log Out Without Confirmation" = []; "ksmserver"."Reboot" = []; @@ -32,7 +32,7 @@ "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["" "Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = []; "kwin"."Grid View" = "Meta+G"; @@ -182,7 +182,7 @@ "kwin"."Window to Screen 6" = []; "kwin"."Window to Screen 7" = []; "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["" "Meta++" "Meta+\x3d"]; + "kwin"."view_zoom_in" = "Meta++"; "kwin"."view_zoom_out" = "Meta+-"; "mediacontrol"."mediavolumedown" = []; "mediacontrol"."mediavolumeup" = []; @@ -204,7 +204,7 @@ "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = []; - "org_kde_powerdevil"."powerProfile" = ["" "Battery" "Meta+B"]; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; "plasmashell"."activate task manager entry 10" = []; "plasmashell"."activate task manager entry 2" = "Meta+2"; @@ -233,33 +233,33 @@ "plasmashell"."switch to previous activity" = []; "plasmashell"."toggle do not disturb" = []; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "Meta+Print" "Ctrl+!"]; + "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "Ctrl+$" "Shift+Print"]; + "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/org.kde.spectacle.desktop"."RecordRegion" = []; "services/org.kde.spectacle.desktop"."RecordScreen" = []; "services/org.kde.spectacle.desktop"."RecordWindow" = []; - "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "Ctrl+@" "Meta+Shift+Print"]; - "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { @@ -269,8 +269,6 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; - "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; - "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; "dolphinrc"."IconsMode"."PreviewSize" = 80; "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; @@ -818,81 +816,45 @@ "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions" = ""; - "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions\x5b$d\x5d" = ""; "khotkeysrc"."General"."BrowserApplication" = ""; - "khotkeysrc"."General"."BrowserApplication\x5b$d\x5d" = ""; - "khotkeysrc"."General"."ColorSchemeHash\x5b$d\x5d" = ""; - "khotkeysrc"."General"."ColorScheme\x5b$d\x5d" = ""; "khotkeysrc"."Gestures"."Disabled" = true; "khotkeysrc"."Gestures"."MouseButton" = 2; "khotkeysrc"."Gestures"."Timeout" = 300; "khotkeysrc"."GesturesExclude"."Comment" = ""; "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; - "khotkeysrc"."Icons"."Theme\x5b$d\x5d" = ""; "khotkeysrc"."KDE"."AnimationDurationFactor" = ""; - "khotkeysrc"."KDE"."AnimationDurationFactor\x5b$d\x5d" = ""; - "khotkeysrc"."KDE"."LookAndFeelPackage\x5b$d\x5d" = ""; "khotkeysrc"."KDE"."ShowDeleteCommand" = ""; - "khotkeysrc"."KDE"."ShowDeleteCommand\x5b$d\x5d" = ""; "khotkeysrc"."KDE"."SingleClick" = ""; - "khotkeysrc"."KDE"."SingleClick\x5b$d\x5d" = ""; "khotkeysrc"."KDE"."widgetStyle" = ""; - "khotkeysrc"."KDE"."widgetStyle\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Allow Expansion" = ""; - "khotkeysrc"."KFileDialog Settings"."Allow Expansion\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension" = ""; - "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation" = ""; - "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Decoration position" = ""; - "khotkeysrc"."KFileDialog Settings"."Decoration position\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode" = ""; - "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode" = ""; - "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Show Bookmarks" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Bookmarks\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Show Full Path" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Full Path\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Show Inline Previews" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Inline Previews\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Show Preview" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Preview\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Show Speedbar" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Speedbar\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Show hidden files" = ""; - "khotkeysrc"."KFileDialog Settings"."Show hidden files\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Sort by" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort by\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Sort directories first" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort directories first\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Sort hidden files last" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort hidden files last\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Sort reversed" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort reversed\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."Speedbar Width" = ""; - "khotkeysrc"."KFileDialog Settings"."Speedbar Width\x5b$d\x5d" = ""; "khotkeysrc"."KFileDialog Settings"."View Style" = ""; - "khotkeysrc"."KFileDialog Settings"."View Style\x5b$d\x5d" = ""; "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size" = ""; - "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size\x5b$d\x5d" = ""; "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; "khotkeysrc"."Main"."Disabled" = false; "khotkeysrc"."PreviewSettings"."MaximumRemoteSize" = ""; - "khotkeysrc"."PreviewSettings"."MaximumRemoteSize\x5b$d\x5d" = ""; "khotkeysrc"."Voice"."Shortcut" = ""; "khotkeysrc"."WM"."activeBackground" = ""; - "khotkeysrc"."WM"."activeBackground\x5b$d\x5d" = ""; "khotkeysrc"."WM"."activeBlend" = ""; - "khotkeysrc"."WM"."activeBlend\x5b$d\x5d" = ""; "khotkeysrc"."WM"."activeForeground" = ""; - "khotkeysrc"."WM"."activeForeground\x5b$d\x5d" = ""; "khotkeysrc"."WM"."inactiveBackground" = ""; - "khotkeysrc"."WM"."inactiveBackground\x5b$d\x5d" = ""; "khotkeysrc"."WM"."inactiveBlend" = ""; - "khotkeysrc"."WM"."inactiveBlend\x5b$d\x5d" = ""; "khotkeysrc"."WM"."inactiveForeground" = ""; - "khotkeysrc"."WM"."inactiveForeground\x5b$d\x5d" = ""; "kiorc"."Confirmations"."ConfirmDelete" = true; "kiorc"."Confirmations"."ConfirmEmptyTrash" = true; "kiorc"."Confirmations"."ConfirmTrash" = false; @@ -931,13 +893,13 @@ "kwinrc"."Plugins"."diminactiveEnabled" = true; "kwinrc"."Plugins"."dimscreenEnabled" = true; "kwinrc"."Plugins"."wobblywindowsEnabled" = true; - "kwinrc"."Tiling"."padding" = 4; - "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}\x5d}"; - "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}\x5d}"; - "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"layoutDirection\":\"vertical\",\"tiles\":\x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.5},{\"width\":0.5}\x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.5},{\"width\":0.5}\x5d}\x5d,\"width\":1}\x5d}"; - "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}\x5d}"; - "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}\x5d}"; - "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"layoutDirection\":\"vertical\",\"tiles\":\x5b{\"height\":0.5231481481481481,\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.4979166666666667},{\"width\":0.5020833333333333}\x5d},{\"height\":0.47685185185185075,\"layoutDirection\":\"horizontal\",\"tiles\":\x5b{\"width\":0.49895833333333334},{\"width\":0.5010416666666666}\x5d}\x5d,\"width\":1}\x5d}"; + "kwinrc"."Tiling"."padding" = 0; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"layoutDirection\":\"vertical\",\"tiles\":x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d}x5d,\"width\":1}x5d}"; + "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}"; "kwinrc"."Xwayland"."Scale" = 1; "kxkbrc"."Layout"."Options" = "compose:caps"; "kxkbrc"."Layout"."ResetOldOptions" = true; diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij.nix index 3835392..2affadd 100644 --- a/home-manager/shared/shell/zellij.nix +++ b/home-manager/shared/shell/zellij.nix @@ -8,58 +8,79 @@ pkgs.writeText "default.kdl" '' layout { - // pane size=1 borderless=true { - // plugin location="tab-bar" - //} + tab { + pane + } - pane size=1 borderless=true { - plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { - format_left "{mode} Zellij #[fg=yellow,bold]({session})" - format_center "{tabs}" - format_right "{command_git_branch} {datetime}" - format_space " " - - border_enabled "true" - border_char "─" - border_format "#[fg=green]{char}" - border_position "top" - - hide_frame_for_single_pane "false" - - mode_normal "#[bg=blue] " - mode_tmux "#[bg=blue] " - - // formatting for inactive tabs - tab_normal "#[fg=green] {index} :: {name} " - tab_normal_fullscreen "#[fg=green] {index} :: {name} [] " - tab_normal_sync "#[fg=green] {index} :: {name} <> " - - // formatting for the current active tab - tab_active "#[fg=white,bold,italic] {name} {floating_indicator}" - tab_active_fullscreen "#[fg=white,bold,italic] {name} {fullscreen_indicator}" - tab_active_sync "#[fg=white,bold,italic] {name} {sync_indicator}" - - // separator between the tabs - tab_separator "#[fg=green,bg=orange] | " - - // indicators - tab_sync_indicator "<> " - tab_fullscreen_indicator "[] " - tab_floating_indicator "⬚ " - - command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=yellow] {stdout} " - command_git_branch_interval "10" - command_git_branch_rendermode "static" - - datetime "#[fg=#yellow,bold] {format} " - datetime_format "%Y-%m-%d %H:%M" - datetime_timezone "Europe/Amsterdam" + swap_tiled_layout name="vertical" { + tab max_panes=5 { + pane split_direction="vertical" { + pane + pane { children; } + } + } + tab max_panes=8 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + pane { pane; pane; pane; pane; } + } } } - pane - pane size=2 borderless=true { - plugin location="status-bar" + + swap_tiled_layout name="horizontal" { + tab max_panes=5 { + pane + pane + } + tab max_panes=8 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + } + + default_tab_template { + pane size=1 borderless=true { + plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + format_left "#[fg=#yellow,bold] {session} {mode} {tabs}" + format_right "#[bg=bg,fg=fg] #[bg=bg,fg=fg,bold]{datetime} #[bg=bg,fg=fg]" + + mode_locked "#[fg=magenta,bold] {name} " + mode_normal "#[fg=green,bold] {name} " + mode_resize "#[fg=orange,bold] {name} " + mode_default_to_mode "resize" + + tab_normal "#[bg=bg,fg=fg] #[bg=bg,fg=fg,bold]{name} {sync_indicator}{fullscreen_indicator}{floating_indicator} #[bg=white,fg=cyan]" + tab_active "#[bg=bg,fg=fg] #[bg=black,fg=yellow,bold]{name} {sync_indicator}{fullscreen_indicator}{floating_indicator} #[bg=white,fg=cyan]" + + tab_sync_indicator " " + tab_fullscreen_indicator "□ " + tab_floating_indicator "󰉈 " + + datetime "#[fg=#yellow,bold] {format} " + datetime_format "%Y-%m-%d %H:%M" + datetime_timezone "Europe/Amsterdam" + } + } + children + pane size=2 borderless=true { + plugin location="status-bar" + } } } ''; From 2e0fd8c174c38899a175cbc58021918484a55731 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 May 2024 19:41:33 +0200 Subject: [PATCH 1876/2308] Little refactor for the shell scripts --- home-manager/shared/default.nix | 4 ++-- home-manager/shared/shell/{helix.nix => helix/default.nix} | 0 home-manager/shared/shell/{ => helix}/snippets.toml | 0 home-manager/shared/shell/{zellij.nix => zellij/default.nix} | 0 home-manager/shared/shell/{ => zellij}/zellij.kdl | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename home-manager/shared/shell/{helix.nix => helix/default.nix} (100%) rename home-manager/shared/shell/{ => helix}/snippets.toml (100%) rename home-manager/shared/shell/{zellij.nix => zellij/default.nix} (100%) rename home-manager/shared/shell/{ => zellij}/zellij.kdl (100%) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 6a99e2a..465a8ce 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -7,8 +7,8 @@ ... }: { imports = [ - ./shell/helix.nix - ./shell/zellij.nix + ./shell/helix + ./shell/zellij ./shell/zsh.nix ./shell/starship.nix ./shell/eza.nix diff --git a/home-manager/shared/shell/helix.nix b/home-manager/shared/shell/helix/default.nix similarity index 100% rename from home-manager/shared/shell/helix.nix rename to home-manager/shared/shell/helix/default.nix diff --git a/home-manager/shared/shell/snippets.toml b/home-manager/shared/shell/helix/snippets.toml similarity index 100% rename from home-manager/shared/shell/snippets.toml rename to home-manager/shared/shell/helix/snippets.toml diff --git a/home-manager/shared/shell/zellij.nix b/home-manager/shared/shell/zellij/default.nix similarity index 100% rename from home-manager/shared/shell/zellij.nix rename to home-manager/shared/shell/zellij/default.nix diff --git a/home-manager/shared/shell/zellij.kdl b/home-manager/shared/shell/zellij/zellij.kdl similarity index 100% rename from home-manager/shared/shell/zellij.kdl rename to home-manager/shared/shell/zellij/zellij.kdl From 639d1c236d3e86345179d70da84cb86aaccb10c0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 May 2024 22:09:32 +0200 Subject: [PATCH 1877/2308] Add waypipe to the desktops --- nixos/desktop/package-configs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/package-configs/default.nix b/nixos/desktop/package-configs/default.nix index 95564cd..f631f36 100644 --- a/nixos/desktop/package-configs/default.nix +++ b/nixos/desktop/package-configs/default.nix @@ -9,4 +9,5 @@ imports = [ ./firefox ]; + environment.systemPackages = with pkgs; [waypipe]; } From 38786640443408bf4d9007ff570f5596eabdbcf9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 May 2024 23:07:49 +0200 Subject: [PATCH 1878/2308] Give shodan the term emu upgrades --- home-manager/hosts/shodan/lillian.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index ee7fec6..5a0feb4 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -21,6 +21,8 @@ ../../desktop/package-configs/plasma-desktop.nix ../../desktop/package-configs/firefox.nix + ../../desktop/package-configs/konsole + ../../desktop/package-configs/foot ../../shared ]; nixpkgs = { From 840ec6d23e8d3430d4668d2f6886605225089454 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 May 2024 23:11:43 +0200 Subject: [PATCH 1879/2308] Make home manager backup overwritten files by default --- nixos/shared/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 100badc..ee1dff2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -43,6 +43,8 @@ console.catppuccin.enable = true; + home-manager.backupFileExtension = "backup"; + users.users.lillian = { isNormalUser = true; extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; From 14f52739474775416a091fe048db4b269c60f9a3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 12 May 2024 23:15:11 +0200 Subject: [PATCH 1880/2308] Make this more consistent and add waypipe to shodan --- nixos/desktop/default.nix | 1 + nixos/desktop/package-configs/default.nix | 1 - nixos/hosts/shodan/configuration.nix | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 2baa9c0..615f6b8 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -55,6 +55,7 @@ virtualgl vulkan-tools waydroid + waypipe wayland-utils xwaylandvideobridge yubikey-personalization diff --git a/nixos/desktop/package-configs/default.nix b/nixos/desktop/package-configs/default.nix index f631f36..95564cd 100644 --- a/nixos/desktop/package-configs/default.nix +++ b/nixos/desktop/package-configs/default.nix @@ -9,5 +9,4 @@ imports = [ ./firefox ]; - environment.systemPackages = with pkgs; [waypipe]; } diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 4277525..c40a85a 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -63,6 +63,7 @@ sbctl udisks util-linux + waypipe #KDE: krunner-translator From bb30a9e93ba1bdf1c1877eea3866e2aa4c5bbb65 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 16 May 2024 14:26:46 +0200 Subject: [PATCH 1881/2308] update the lix to use nixpkgs, and update the flake lock --- flake.lock | 200 +++++++++++---------------------------- flake.nix | 17 ---- nixos/shared/default.nix | 2 +- 3 files changed, 55 insertions(+), 164 deletions(-) diff --git a/flake.lock b/flake.lock index 2c85447..b957ebe 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1715210854, - "narHash": "sha256-88jxvd+LIP/XwlvJ3+QPbGCFMChmBfIbUNp1mEP9DJY=", + "lastModified": 1715659881, + "narHash": "sha256-emodPGTXLVqlcOkqbJiOUkf5vo8WWujgzKxms1B+iBs=", "owner": "catppuccin", "repo": "nix", - "rev": "e5322f7b4001aa8aab38ca5a0f42cafc590f42b6", + "rev": "d6344610c04af0f8e315fef45dd3b854014b119e", "type": "github" }, "original": { @@ -57,11 +57,11 @@ "complement": { "flake": false, "locked": { - "lastModified": 1714472853, - "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=", + "lastModified": 1715700731, + "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", "owner": "matrix-org", "repo": "complement", - "rev": "891d18872c153d39a9ce63b545045efddb845738", + "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1715396204, - "narHash": "sha256-IYT/n9vFWOXDergfXe5iOFGTe8TrjI+rYcwQQEWy2iY=", + "lastModified": 1715798361, + "narHash": "sha256-NkUaW/o2oVLkD+DSgS8ktFP2H2w6cLrakiwheu3vCaM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "18e43e1d35c70e71b5fbaf44059f96a0bc4cf49e", + "rev": "4389e086868cc10b97a464478e88c03dc4f2e00a", "type": "github" }, "original": { @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1713738183, - "narHash": "sha256-qd/MuLm7OfKQKyd4FAMqV4H6zYyOfef5lLzRrmXwKJM=", + "lastModified": 1715274763, + "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", "owner": "ipetkov", "repo": "crane", - "rev": "f6c6a2fb1b8bd9b65d65ca9342dd0eb180a63f11", + "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", "type": "github" }, "original": { @@ -192,11 +192,11 @@ ] }, "locked": { - "lastModified": 1715217706, - "narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=", + "lastModified": 1715822638, + "narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=", "owner": "nix-community", "repo": "disko", - "rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046", + "rev": "476eef8d85aa09389ae7baf6e6b60357f6a01432", "type": "github" }, "original": { @@ -214,11 +214,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1714544767, - "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", + "lastModified": 1715322226, + "narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=", "owner": "nix-community", "repo": "fenix", - "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", + "rev": "297c756ba6249d483c1dafe42378560458842173", "type": "github" }, "original": { @@ -386,7 +386,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -402,39 +402,6 @@ "type": "github" } }, - "flake-utils_6": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -464,11 +431,11 @@ ] }, "locked": { - "lastModified": 1715380449, - "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7682620185f213df384c363288093b486b2883f", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -484,11 +451,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1715417624, - "narHash": "sha256-Wp3vGZRQYVrEveB9UXXZRDvRFrkw6rXXXLxj/6sbg7M=", + "lastModified": 1715845522, + "narHash": "sha256-zKv1tlYvIrboMrXo0RD8PZsAAUHB2cKD/BpA31LsPRI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8fef078acb3206be58ae5892a32d6ed75b695647", + "rev": "6aa9ba0cda3a3b2e3ce503d67c55d7d6eaf89e6f", "type": "github" }, "original": { @@ -521,48 +488,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1714955862, - "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", - "ref": "refs/tags/2.90-beta.1", - "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", - "revCount": 15501, - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" - }, - "original": { - "ref": "refs/tags/2.90-beta.1", - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_5", - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715278311, - "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=", - "ref": "refs/heads/main", - "rev": "c8ab1e79ba0140bc75731c75177242089506260b", - "revCount": 75, - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - } - }, "nix-filter": { "locked": { "lastModified": 1710156097, @@ -608,11 +533,11 @@ ] }, "locked": { - "lastModified": 1714878592, - "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", + "lastModified": 1715483403, + "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", + "rev": "f9027322f48b427da23746aa359a6510dfcd0228", "type": "github" }, "original": { @@ -723,11 +648,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1714858427, - "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", + "lastModified": 1715458492, + "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", + "rev": "8e47858badee5594292921c2668c11004c3b0142", "type": "github" }, "original": { @@ -739,11 +664,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -755,11 +680,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -787,11 +712,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -818,11 +743,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1714809261, - "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", + "lastModified": 1715413075, + "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d32560238207b8e26d88b265207b216ee46b8450", + "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d", "type": "github" }, "original": { @@ -928,8 +853,6 @@ "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", - "lix": "lix", - "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", @@ -944,11 +867,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1713628977, - "narHash": "sha256-iN5QUlUq527lswmBC+RopfXdu6Xx7mmTaBSH2l59FtM=", + "lastModified": 1715255944, + "narHash": "sha256-vLLgYpdtKBaGYTamNLg1rbRo1bPXp4Jgded/gnprPVw=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "55d9a533b309119c8acd13061581b43ae8840823", + "rev": "5bf2f85c8054d80424899fa581db1b192230efb5", "type": "github" }, "original": { @@ -1036,11 +959,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1715244550, - "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=", + "lastModified": 1715482972, + "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f", + "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", "type": "github" }, "original": { @@ -1124,24 +1047,9 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1709126324, @@ -1160,16 +1068,16 @@ "zjstatus": { "inputs": { "crane": "crane_4", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1715177960, - "narHash": "sha256-47EdSIRvRfn0ZIOGHeoBQxpA2nyY29VjFPjSRYel/tU=", + "lastModified": 1715776884, + "narHash": "sha256-jGAwhJ9FPa5jbysuYjOhcW2OQOdXEtLloq+3wTlHzO0=", "owner": "dj95", "repo": "zjstatus", - "rev": "d124427b2fa597aacd330d0f73557e4fb20fbbdd", + "rev": "25e3a56f8be3732661a622352590886957c5a59a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0d5bafd..5e0a94b 100644 --- a/flake.nix +++ b/flake.nix @@ -5,16 +5,6 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - lix = { - url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; - flake = false; - }; - lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module"; - inputs.lix.follows = "lix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # Disko for declaratively setting disk formatting @@ -89,7 +79,6 @@ plasma-manager, zjstatus, lanzaboote, - lix-module, jovian, nixos-hardware, nix-index-database, @@ -142,7 +131,6 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index - lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -164,7 +152,6 @@ disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index - lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -185,7 +172,6 @@ disko.nixosModules.disko simple-nixos-mailserver.nixosModule catppuccin.nixosModules.catppuccin - lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -205,7 +191,6 @@ disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager - lix-module.nixosModules.default catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ @@ -227,7 +212,6 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin - lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager @@ -248,7 +232,6 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin - lix-module.nixosModules.default { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index ee1dff2..ba083a3 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -14,7 +14,7 @@ sops.secrets."lillian-password".neededForUsers = true; nix = { - package = pkgs.nixFlakes; + package = pkgs.lix; gc = { automatic = true; dates = "weekly"; From e3f8df4b53123a04e46e21bee41211ccf7bfdda3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 19 May 2024 23:35:27 +0200 Subject: [PATCH 1882/2308] Add the bcachefs fix --- nixos/desktop/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 615f6b8..e3a2f56 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -16,6 +16,17 @@ nixpkgs = { # You can add overlays here overlays = [ + (final: prev: { + bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs.overrideAttrs (oldAttrs: { + patches = [ + (pkgs.fetchpatch { + # FIXME: remove when https://github.com/koverstreet/bcachefs-tools/pull/263 is merged + url = "https://github.com/koverstreet/bcachefs-tools/pull/263.patch"; + hash = "sha256-M5FhW5ZWQdfXbLzb/Rr+rNtLLPRIdlOBnxQzDpnoyyw="; + }) + ]; + }); + }) # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions outputs.overlays.modifications From 4b1eff9221131c28b5c98535dcd2a0f982c6cd6c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 19 May 2024 23:46:32 +0200 Subject: [PATCH 1883/2308] Forgot to add this to the flake --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 5e0a94b..3e0a5c1 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,8 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; + bcachefs-tools.url = "github:koverstreet/bcachefs-tools"; + # Nixos generators for creating ISOs nixos-generators = { url = "github:nix-community/nixos-generators"; From 8e036783043f77971c1b1ac6b716e7b49fdf604b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 May 2024 00:07:08 +0200 Subject: [PATCH 1884/2308] update flake lock --- flake.lock | 258 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 172 insertions(+), 86 deletions(-) diff --git a/flake.lock b/flake.lock index b957ebe..8e9b465 100644 --- a/flake.lock +++ b/flake.lock @@ -3,9 +3,9 @@ "attic": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -23,6 +23,26 @@ "type": "github" } }, + "bcachefs-tools": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "utils": "utils" + }, + "locked": { + "lastModified": 1715290148, + "narHash": "sha256-ZmkeYPiCy7vkXnMFbtUF4761K+I+Ef7UbmSY7dJG09U=", + "owner": "koverstreet", + "repo": "bcachefs-tools", + "rev": "3ac510f6a41feb1b695381fa30869d557c00b822", + "type": "github" + }, + "original": { + "owner": "koverstreet", + "repo": "bcachefs-tools", + "type": "github" + } + }, "blobs": { "flake": false, "locked": { @@ -77,7 +97,7 @@ "complement": "complement", "crane": "crane_2", "fenix": "fenix", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", "nix-filter": "nix-filter", "nixpkgs": [ @@ -86,11 +106,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1715798361, - "narHash": "sha256-NkUaW/o2oVLkD+DSgS8ktFP2H2w6cLrakiwheu3vCaM=", + "lastModified": 1715983991, + "narHash": "sha256-2OL8zPpDHXgOxNqXlWqd1aJ2uZJCAuoqBWaabwWUg2M=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "4389e086868cc10b97a464478e88c03dc4f2e00a", + "rev": "8bffcfe82b3cc50bb095f41afc585fabacb963e3", "type": "github" }, "original": { @@ -172,11 +192,11 @@ ] }, "locked": { - "lastModified": 1714864355, - "narHash": "sha256-uXNW6bapWFfkYIkK1EagydSrFMqycOYEDSq75GmUpjk=", + "lastModified": 1716080827, + "narHash": "sha256-2R9LBCR8TlMuK4Md9ELwPVuwRQWI3pAh7Nj9e318Hk4=", "owner": "ipetkov", "repo": "crane", - "rev": "442a7a6152f49b907e73206dc8e1f46a61e8e873", + "rev": "a7146b04405d93b24a1bac76d93270787872c8be", "type": "github" }, "original": { @@ -192,11 +212,11 @@ ] }, "locked": { - "lastModified": 1715822638, - "narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=", + "lastModified": 1716126753, + "narHash": "sha256-fdodsQ2AWreGj4arHk6cKcnqlWrNiLb64eRrHtMZ5cw=", "owner": "nix-community", "repo": "disko", - "rev": "476eef8d85aa09389ae7baf6e6b60357f6a01432", + "rev": "601be8412d2ab72f752448766fe0fb2f00d5c40c", "type": "github" }, "original": { @@ -231,11 +251,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -247,16 +267,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { "owner": "edolstra", - "ref": "master", "repo": "flake-compat", "type": "github" } @@ -273,6 +292,7 @@ }, "original": { "owner": "edolstra", + "ref": "master", "repo": "flake-compat", "type": "github" } @@ -293,6 +313,22 @@ "type": "github" } }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -331,7 +367,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -350,7 +386,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -368,7 +404,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -386,7 +422,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -431,11 +467,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -448,14 +484,14 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1715845522, - "narHash": "sha256-zKv1tlYvIrboMrXo0RD8PZsAAUHB2cKD/BpA31LsPRI=", + "lastModified": 1716107076, + "narHash": "sha256-aB15oIMUv6N/UFsLHzgcGRUvU4YfOjE3gEirIP/k82s=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6aa9ba0cda3a3b2e3ce503d67c55d7d6eaf89e6f", + "rev": "e8de93b7b4c384650977a20c1f192e23c6e7a12f", "type": "github" }, "original": { @@ -467,10 +503,10 @@ "lanzaboote": { "inputs": { "crane": "crane_3", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -533,11 +569,11 @@ ] }, "locked": { - "lastModified": 1715483403, - "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", + "lastModified": 1716088072, + "narHash": "sha256-ZXzV39r4ShjS6lvhOX+oN0Vazg5A/zibJDzE2r1jlRM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f9027322f48b427da23746aa359a6510dfcd0228", + "rev": "6b94c48c3bb22d5181333c3fb71beff44116e251", "type": "github" }, "original": { @@ -569,11 +605,11 @@ ] }, "locked": { - "lastModified": 1713783234, - "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", + "lastModified": 1716123454, + "narHash": "sha256-U2o4UPM/UsEyIX2p11+YEQgR9HY3PmjZ2mRl/x5e4xo=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", + "rev": "a63e0c83dd83fe28cc571b97129e13373436bd82", "type": "github" }, "original": { @@ -584,11 +620,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715148395, - "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", + "lastModified": 1716141623, + "narHash": "sha256-4NEvf7sULDyYoXIgeXHWGe7mXlr7+UL7TvgDkMqpbPY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", + "rev": "f0cf56878046c42ec2096a2ade89203e7348917b", "type": "github" }, "original": { @@ -600,16 +636,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", - "owner": "NixOS", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -648,11 +684,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1715458492, - "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=", + "lastModified": 1716061101, + "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8e47858badee5594292921c2668c11004c3b0142", + "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "type": "github" }, "original": { @@ -664,11 +700,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1715961556, + "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", "type": "github" }, "original": { @@ -679,6 +715,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1715787315, "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", @@ -694,7 +746,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1711297276, "narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=", @@ -710,13 +762,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1715961556, + "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", "type": "github" }, "original": { @@ -726,7 +778,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1709703039, "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", @@ -741,13 +793,13 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1715413075, - "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", + "lastModified": 1716062047, + "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d", + "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", "type": "github" }, "original": { @@ -757,13 +809,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1715037484, - "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", + "lastModified": 1716097317, + "narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", + "rev": "8535fb92661f37ff9f0da3007fbc942f7d134b41", "type": "github" }, "original": { @@ -783,11 +835,11 @@ ] }, "locked": { - "lastModified": 1714856962, - "narHash": "sha256-2te5GG8TVNBF44uMF4G0XFGW+Jt02i/ZkspSNFzjgT0=", + "lastModified": 1716145823, + "narHash": "sha256-S2cfXdWCRf6Z+Gas6GN1kMSYqG01583uuJKITDVQp0o=", "owner": "pjones", "repo": "plasma-manager", - "rev": "1554e19ede17de46106dd95820eeea05086a5720", + "rev": "5db76cbb4d66231769cd8939472ae00c55c24a44", "type": "github" }, "original": { @@ -846,6 +898,7 @@ }, "root": { "inputs": { + "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", "conduit": "conduit", "disko": "disko", @@ -856,7 +909,7 @@ "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -918,11 +971,11 @@ ] }, "locked": { - "lastModified": 1715048276, - "narHash": "sha256-SqWSTvCjNBBnV/WIQdaxVi5V9H3VJ7cOJAxPQdR1TBY=", + "lastModified": 1716085073, + "narHash": "sha256-3+9gI93XxszWA2+9S2xZfws1QArPX/MC6nahOGpcMB4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b037d65c988421b54024e62691eace4f2fe623bc", + "rev": "cfc8776011bd83508324115d353222475e1601c0", "type": "github" }, "original": { @@ -934,9 +987,9 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_5", - "utils": "utils" + "flake-compat": "flake-compat_5", + "nixpkgs": "nixpkgs_6", + "utils": "utils_2" }, "locked": { "lastModified": 1714720456, @@ -955,15 +1008,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1715482972, - "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", + "lastModified": 1716087663, + "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", + "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5", "type": "github" }, "original": { @@ -1047,9 +1100,42 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { + "inputs": { + "systems": "systems_5" }, "locked": { "lastModified": 1709126324, @@ -1069,15 +1155,15 @@ "inputs": { "crane": "crane_4", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1715776884, - "narHash": "sha256-jGAwhJ9FPa5jbysuYjOhcW2OQOdXEtLloq+3wTlHzO0=", + "lastModified": 1716113978, + "narHash": "sha256-S0gs4t4yNKGwf5l4pdSFMNVm2GBGEyURh+WEOoQdEBM=", "owner": "dj95", "repo": "zjstatus", - "rev": "25e3a56f8be3732661a622352590886957c5a59a", + "rev": "3247cf2559aed324f92c3857551e2ac9a7caaa2a", "type": "github" }, "original": { From a79ab5b9ba5ef914e1c165ab03aa84c2b3fb03a1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 May 2024 13:18:35 +0200 Subject: [PATCH 1885/2308] Disable lanzaboote on glados for now --- nixos/hosts/GLaDOS/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index ac4a843..2e060ad 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -67,12 +67,12 @@ }; }; - boot.loader.systemd-boot.enable = lib.mkForce false; + boot.loader.systemd-boot.enable = true; - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; + # boot.lanzaboote = { + # enable = true; + # pkiBundle = "/etc/secureboot"; + # }; users.users.lillian.extraGroups = ["gamemode"]; From 680feacd38bcc4ac25ce9370a4c3b4a8601987eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 May 2024 13:20:33 +0200 Subject: [PATCH 1886/2308] From the flake too --- flake.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 3e0a5c1..db564ca 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,6 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; - bcachefs-tools.url = "github:koverstreet/bcachefs-tools"; - # Nixos generators for creating ISOs nixos-generators = { url = "github:nix-community/nixos-generators"; @@ -150,7 +148,7 @@ # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops - lanzaboote.nixosModules.lanzaboote + #lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index From 221ed043bbdde0db1958b79c3cb7fadc84d1b936 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 May 2024 13:22:57 +0200 Subject: [PATCH 1887/2308] This wasn't supposed to be deleted... --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index db564ca..3d77850 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,8 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; + bcachefs-tools.url = "github:koverstreet/bcachefs-tools"; + # Nixos generators for creating ISOs nixos-generators = { url = "github:nix-community/nixos-generators"; From 0bb4cc8669f267fa01dc1d4ea3bf1e8958c50c97 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 May 2024 21:52:39 +0200 Subject: [PATCH 1888/2308] Set up jovian like k900, see if that fixes decky --- nixos/hosts/shodan/configuration.nix | 42 +++++++++++----------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index c40a85a..d7a6554 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -84,31 +84,23 @@ rare ]; - #Enable steam deck steam interface - jovian.steam.enable = true; - - #Autostart this inteface at login - jovian.steam.autoStart = true; - - #What desktop to start when switching to desktop session - jovian.steam.desktopSession = "plasma"; - - jovian.steam.user = "lillian"; - - #Enable gyro service for CEMU - jovian.devices.steamdeck.enableGyroDsuService = true; - - #Enable steam deck specific services - jovian.devices.steamdeck.enable = true; - - #Enable auto updates for the BIOS and controller firmware - jovian.devices.steamdeck.autoUpdate = true; - - jovian.decky-loader.enable = true; - - jovian.decky-loader.user = "lillian"; - - jovian.hardware.has.amd.gpu = true; + jovian = { + steam = { + enable = true; + autoStart = true; + user = "lillian"; + desktopSession = "plasma"; + }; + decky-loader = { + enable = true; + package = pkgs.decky-loader-prerelease; + }; + devices.steamdeck = { + enable = true; + autoUpdate = true; + enableGyroDsuService = true; + }; + }; programs.steam = lib.mkForce { enable = true; From 08f859a81026003420b8e00c0944560decd3b164 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 May 2024 22:03:32 +0200 Subject: [PATCH 1889/2308] shodan is complaining python3 is not installed, let's try this then --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index d7a6554..3580c9e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -64,6 +64,7 @@ udisks util-linux waypipe + python3 #KDE: krunner-translator From 77b2b41c3aea5e9a766f292dba7a47d8b8b7b11a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 May 2024 22:08:37 +0200 Subject: [PATCH 1890/2308] Not in it's path, let's try doing it this way then --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 3580c9e..207ca0a 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -95,6 +95,7 @@ decky-loader = { enable = true; package = pkgs.decky-loader-prerelease; + extraPackages = [pkgs.python3]; }; devices.steamdeck = { enable = true; From b0af058fca56f5d5dc8d47dfe7dbc4c32b3102ef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 25 May 2024 16:30:53 +0200 Subject: [PATCH 1891/2308] Update a bunch of things to fix the flake lock update, conduwuit is broken rn --- flake.lock | 510 ++++++++++++++---- flake.nix | 2 +- home-manager/hosts/EDI/lillian.nix | 2 +- home-manager/hosts/GLaDOS/lillian.nix | 2 +- home-manager/hosts/iso/lillian.nix | 2 +- home-manager/hosts/iso_server/lillian.nix | 2 +- home-manager/hosts/queen/lillian.nix | 2 +- home-manager/hosts/shodan/lillian.nix | 2 +- home-manager/shared/shell/starship.nix | 6 +- nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 2 +- nixos/hosts/iso/configuration.nix | 2 +- nixos/hosts/queen/configuration.nix | 3 +- nixos/hosts/shodan/configuration.nix | 2 +- .../package-configs/conduit/default.nix | 2 +- nixos/shared/default.nix | 2 +- 16 files changed, 438 insertions(+), 107 deletions(-) diff --git a/flake.lock b/flake.lock index 8e9b465..4489a9e 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,29 @@ "type": "github" } }, + "attic_2": { + "inputs": { + "crane": "crane_3", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4", + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1711742460, + "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", + "type": "github" + } + }, "bcachefs-tools": { "inputs": { "flake-compat": "flake-compat", @@ -61,11 +84,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1715659881, - "narHash": "sha256-emodPGTXLVqlcOkqbJiOUkf5vo8WWujgzKxms1B+iBs=", + "lastModified": 1716337435, + "narHash": "sha256-eZqH1vLI9eKL/N5toXxOrQO80G0y4pWZrYCp472YBVQ=", "owner": "catppuccin", "repo": "nix", - "rev": "d6344610c04af0f8e315fef45dd3b854014b119e", + "rev": "fea5242c0eacc5efa81be0e36206a62e889dbd82", "type": "github" }, "original": { @@ -91,6 +114,23 @@ "type": "github" } }, + "complement_2": { + "flake": false, + "locked": { + "lastModified": 1715700731, + "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", + "owner": "matrix-org", + "repo": "complement", + "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", + "type": "github" + }, + "original": { + "owner": "matrix-org", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, "conduit": { "inputs": { "attic": "attic", @@ -100,17 +140,42 @@ "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "rocksdb": "rocksdb" }, "locked": { "lastModified": 1715983991, "narHash": "sha256-2OL8zPpDHXgOxNqXlWqd1aJ2uZJCAuoqBWaabwWUg2M=", + "path": "/nix/store/2h6yxx9z1if5pqwsr7m6pr07h8i498qz-source", + "rev": "8bffcfe82b3cc50bb095f41afc585fabacb963e3", + "type": "path" + }, + "original": { + "id": "conduit", + "type": "indirect" + } + }, + "conduwuit": { + "inputs": { + "attic": "attic_2", + "complement": "complement_2", + "crane": "crane_4", + "fenix": "fenix_2", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_4", + "liburing": "liburing", + "nix-filter": "nix-filter_2", + "nixpkgs": [ + "nixpkgs" + ], + "rocksdb": "rocksdb_2" + }, + "locked": { + "lastModified": 1716588782, + "narHash": "sha256-DXJrpcNUkgbsd07fmhq3XmTfybrN6LwSh24lZnvKUSo=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "8bffcfe82b3cc50bb095f41afc585fabacb963e3", + "rev": "f3427afc7fc7a0e67a8c78be24cba898a6bdba2e", "type": "github" }, "original": { @@ -164,6 +229,50 @@ } }, "crane_3": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1702918879, + "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "owner": "ipetkov", + "repo": "crane", + "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_4": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715274763, + "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", + "owner": "ipetkov", + "repo": "crane", + "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "crane_5": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -184,7 +293,7 @@ "type": "github" } }, - "crane_4": { + "crane_6": { "inputs": { "nixpkgs": [ "zjstatus", @@ -212,11 +321,11 @@ ] }, "locked": { - "lastModified": 1716126753, - "narHash": "sha256-fdodsQ2AWreGj4arHk6cKcnqlWrNiLb64eRrHtMZ5cw=", + "lastModified": 1716431128, + "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", "owner": "nix-community", "repo": "disko", - "rev": "601be8412d2ab72f752448766fe0fb2f00d5c40c", + "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", "type": "github" }, "original": { @@ -248,6 +357,29 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1715322226, + "narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=", + "owner": "nix-community", + "repo": "fenix", + "rev": "297c756ba6249d483c1dafe42378560458842173", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -298,6 +430,39 @@ } }, "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -313,7 +478,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -385,6 +550,21 @@ } }, "flake-utils_3": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "inputs": { "systems": "systems_3" }, @@ -398,11 +578,12 @@ }, "original": { "owner": "numtide", + "ref": "main", "repo": "flake-utils", "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { "systems": "systems_4" }, @@ -420,9 +601,27 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -467,11 +666,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1716457508, + "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", "type": "github" }, "original": { @@ -484,14 +683,14 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1716107076, - "narHash": "sha256-aB15oIMUv6N/UFsLHzgcGRUvU4YfOjE3gEirIP/k82s=", + "lastModified": 1716618639, + "narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e8de93b7b4c384650977a20c1f192e23c6e7a12f", + "rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38", "type": "github" }, "original": { @@ -502,11 +701,11 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_3", - "flake-compat": "flake-compat_4", + "crane": "crane_5", + "flake-compat": "flake-compat_6", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_4", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -524,6 +723,23 @@ "type": "github" } }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1716398759, + "narHash": "sha256-fDlOR13WmwVgMxGUMQXWSZAoy2VhZ5AfZRPF9qmQjSc=", + "owner": "axboe", + "repo": "liburing", + "rev": "49be3cad491ae8b3c40348b8d78ae2b0d3726b78", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1710156097, @@ -540,6 +756,22 @@ "type": "github" } }, + "nix-filter_2": { + "locked": { + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "nix-filter", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -569,11 +801,11 @@ ] }, "locked": { - "lastModified": 1716088072, - "narHash": "sha256-ZXzV39r4ShjS6lvhOX+oN0Vazg5A/zibJDzE2r1jlRM=", + "lastModified": 1716170277, + "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "6b94c48c3bb22d5181333c3fb71beff44116e251", + "rev": "e0638db3db43b582512a7de8c0f8363a162842b9", "type": "github" }, "original": { @@ -605,11 +837,11 @@ ] }, "locked": { - "lastModified": 1716123454, - "narHash": "sha256-U2o4UPM/UsEyIX2p11+YEQgR9HY3PmjZ2mRl/x5e4xo=", + "lastModified": 1716210724, + "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "a63e0c83dd83fe28cc571b97129e13373436bd82", + "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", "type": "github" }, "original": { @@ -620,11 +852,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716141623, - "narHash": "sha256-4NEvf7sULDyYoXIgeXHWGe7mXlr7+UL7TvgDkMqpbPY=", + "lastModified": 1716173274, + "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f0cf56878046c42ec2096a2ade89203e7348917b", + "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", "type": "github" }, "original": { @@ -636,11 +868,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "lastModified": 1716293225, + "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" }, "original": { @@ -667,6 +899,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1710695816, "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", @@ -682,7 +930,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1716061101, "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", @@ -700,11 +948,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715961556, - "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -714,6 +962,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1716097317, + "narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8535fb92661f37ff9f0da3007fbc942f7d134b41", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1711401922, @@ -732,11 +996,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -747,6 +1011,38 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1711297276, "narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=", @@ -762,13 +1058,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { - "lastModified": 1715961556, - "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -778,7 +1074,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1709703039, "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", @@ -793,7 +1089,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1716062047, "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", @@ -809,22 +1105,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1716097317, - "narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8535fb92661f37ff9f0da3007fbc942f7d134b41", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -835,11 +1115,11 @@ ] }, "locked": { - "lastModified": 1716145823, - "narHash": "sha256-S2cfXdWCRf6Z+Gas6GN1kMSYqG01583uuJKITDVQp0o=", + "lastModified": 1716497069, + "narHash": "sha256-R8tGjY7wUKWY5O3iZiy1gyg0+8pdXcOeP3RppdKgLLM=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5db76cbb4d66231769cd8939472ae00c55c24a44", + "rev": "6d697a8dd6d0699bce69424dbed55184212ff21a", "type": "github" }, "original": { @@ -863,7 +1143,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1710923068, @@ -896,20 +1176,38 @@ "type": "github" } }, + "rocksdb_2": { + "flake": false, + "locked": { + "lastModified": 1714770052, + "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "db6df0b185774778457dabfcbd822cb81760cade", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "v9.1.1", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", "conduit": "conduit", + "conduwuit": "conduwuit", "disko": "disko", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_5", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -934,6 +1232,23 @@ "type": "github" } }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1715255944, + "narHash": "sha256-vLLgYpdtKBaGYTamNLg1rbRo1bPXp4Jgded/gnprPVw=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "5bf2f85c8054d80424899fa581db1b192230efb5", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "flake-utils": [ @@ -987,8 +1302,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_5", - "nixpkgs": "nixpkgs_6", + "flake-compat": "flake-compat_7", + "nixpkgs": "nixpkgs_8", "utils": "utils_2" }, "locked": { @@ -1008,15 +1323,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7", - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs": "nixpkgs_9", + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1716087663, - "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=", + "lastModified": 1716400300, + "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5", + "rev": "b549832718b8946e875c016a4785d204fcfc2e53", "type": "github" }, "original": { @@ -1115,16 +1430,31 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -1135,7 +1465,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1709126324, @@ -1153,17 +1483,17 @@ }, "zjstatus": { "inputs": { - "crane": "crane_4", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_8", + "crane": "crane_6", + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1716113978, - "narHash": "sha256-S0gs4t4yNKGwf5l4pdSFMNVm2GBGEyURh+WEOoQdEBM=", + "lastModified": 1716629375, + "narHash": "sha256-ezO9HPZLhsvRXY5BeGho6WvqsYQ0+bLFJhGfFHuSc2U=", "owner": "dj95", "repo": "zjstatus", - "rev": "3247cf2559aed324f92c3857551e2ac9a7caaa2a", + "rev": "c186c82cad5dac26c0a2214a9fc89c5ff2c4f112", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3d77850..669d5ff 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - conduit = { + conduwuit = { url = "github:girlbossceo/conduwuit"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 192f9c3..351470d 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -26,5 +26,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 3dcac9e..c71456a 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -33,5 +33,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix index 192f9c3..351470d 100644 --- a/home-manager/hosts/iso/lillian.nix +++ b/home-manager/hosts/iso/lillian.nix @@ -26,5 +26,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/iso_server/lillian.nix b/home-manager/hosts/iso_server/lillian.nix index 139340c..9acd9c2 100644 --- a/home-manager/hosts/iso_server/lillian.nix +++ b/home-manager/hosts/iso_server/lillian.nix @@ -25,5 +25,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index 3dc5e4f..680ef4e 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -42,5 +42,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 5a0feb4..c37facd 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -109,5 +109,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/shared/shell/starship.nix b/home-manager/shared/shell/starship.nix index e07cd6b..4cbba8e 100644 --- a/home-manager/shared/shell/starship.nix +++ b/home-manager/shared/shell/starship.nix @@ -4,7 +4,7 @@ ... }: { programs.starship = let - flavour = "macchiato"; # One of `latte`, `frappe`, `macchiato`, or `mocha` + flavor = "macchiato"; # One of `latte`, `frappe`, `macchiato`, or `mocha` in { enable = true; settings = @@ -35,7 +35,7 @@ git_branch.style = "bold blue"; directory.style = "bold blue"; direnv.disabled = false; - palette = "catppuccin_${flavour}"; + palette = "catppuccin_${flavor}"; } // builtins.fromTOML (builtins.readFile (pkgs.fetchFromGitHub @@ -45,6 +45,6 @@ rev = "5629d23"; # Replace with the latest commit hash sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; } - + /palettes/${flavour}.toml)); + + /palettes/${flavor}.toml)); }; } diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 44c00d4..78ee9f7 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -58,5 +58,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; } diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 2e060ad..f6e14d1 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -87,5 +87,5 @@ networking.hostName = "GLaDOS"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; } diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index 2585dc7..becff32 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -150,5 +150,5 @@ boot.supportedFilesystems = lib.mkForce ["bcachefs" "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "24.11"; } diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 8c6a6a4..d84a4e7 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -46,6 +46,7 @@ ]; # Configure your nixpkgs instance config = { + allowBroken = true; # Disable if you don't want unfree packages allowUnfree = true; }; @@ -187,5 +188,5 @@ boot.loader.efi.canTouchEfiVariables = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; } diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 207ca0a..34818db 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -221,5 +221,5 @@ boot.plymouth.enable = true; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; } diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index db316af..1e8e631 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -36,7 +36,7 @@ in { # This causes NixOS to use the flake defined in this repository instead of # the build of Conduit built into nixpkgs. - package = inputs.conduit.packages.${pkgs.system}.default; + package = inputs.conduwuit.packages.${pkgs.system}.default; settings.global = { inherit server_name; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index ba083a3..0979d5b 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -38,7 +38,7 @@ }; }; - catppuccin.flavour = "macchiato"; + catppuccin.flavor = "macchiato"; catppuccin.enable = true; console.catppuccin.enable = true; From d7237a1427be7bb1593ebd5c27b00907b23d415a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 29 May 2024 22:21:09 +0200 Subject: [PATCH 1892/2308] Update flake lock --- flake.lock | 140 ++++++++++++++++++++++++++--------------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index 4489a9e..725765c 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1716337435, - "narHash": "sha256-eZqH1vLI9eKL/N5toXxOrQO80G0y4pWZrYCp472YBVQ=", + "lastModified": 1716934277, + "narHash": "sha256-BTRLOEcZnj2jLttdOq3AfKSvsFZNVKkrTpdpINDGW4k=", "owner": "catppuccin", "repo": "nix", - "rev": "fea5242c0eacc5efa81be0e36206a62e889dbd82", + "rev": "96681f62faa285ad0c8dce2cdae6b0a1d0a8f094", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1716588782, - "narHash": "sha256-DXJrpcNUkgbsd07fmhq3XmTfybrN6LwSh24lZnvKUSo=", + "lastModified": 1716883613, + "narHash": "sha256-1fJyH76Pfx863Uk5jpPtpmyAIZcCk1luPD0cmPnhUNU=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "f3427afc7fc7a0e67a8c78be24cba898a6bdba2e", + "rev": "f4cfc77a577e0dfd152878830294c8eb3fe47861", "type": "github" }, "original": { @@ -258,11 +258,11 @@ ] }, "locked": { - "lastModified": 1715274763, - "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", + "lastModified": 1716569590, + "narHash": "sha256-5eDbq8TuXFGGO3mqJFzhUbt5zHVTf5zilQoyW5jnJwo=", "owner": "ipetkov", "repo": "crane", - "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", + "rev": "109987da061a1bf452f435f1653c47511587d919", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1716080827, - "narHash": "sha256-2R9LBCR8TlMuK4Md9ELwPVuwRQWI3pAh7Nj9e318Hk4=", + "lastModified": 1716680724, + "narHash": "sha256-THm0mm4aKHQhh3pXCj5ms5t0sVPP9xzVsIU9byMjbtI=", "owner": "ipetkov", "repo": "crane", - "rev": "a7146b04405d93b24a1bac76d93270787872c8be", + "rev": "701dbc191ca003a118ce885db38fae9598908294", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1716431128, - "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", + "lastModified": 1716983378, + "narHash": "sha256-nfbgkhyXdClO6/Cog7GK+r8kd4gmbg2vWA5gSkYnhG4=", "owner": "nix-community", "repo": "disko", - "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", + "rev": "5f7bdc72053380270f2a88690a14292c63cd5643", "type": "github" }, "original": { @@ -366,11 +366,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1715322226, - "narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=", + "lastModified": 1716359173, + "narHash": "sha256-pYcjP6Gy7i6jPWrjiWAVV0BCQp+DdmGaI/k65lBb/kM=", "owner": "nix-community", "repo": "fenix", - "rev": "297c756ba6249d483c1dafe42378560458842173", + "rev": "b6fc5035b28e36a98370d0eac44f4ef3fd323df6", "type": "github" }, "original": { @@ -666,11 +666,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1716930911, + "narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086", "type": "github" }, "original": { @@ -686,11 +686,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1716618639, - "narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=", + "lastModified": 1717012808, + "narHash": "sha256-Wn0fbjqmpIiuPUWnvxu85a9sPYtSd/2tcPDhAYW54RM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38", + "rev": "a8e6557f29fa0cbcc2c54d15f9664c14ae2a3e98", "type": "github" }, "original": { @@ -710,11 +710,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1713369831, - "narHash": "sha256-G4OGxvlIIjphpkxcRAkf1QInYsAeqbfNh6Yl1JLy2uM=", + "lastModified": 1716805126, + "narHash": "sha256-yqJWx74e16Gk4pwW5DWfI4orTKeWezKFNbW7eaojpLw=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "850f27322239f8cfa56b122cc9a278ab99a49015", + "rev": "2eb19b872bc0a5f336b9b934ba96ea029e4da8c2", "type": "github" }, "original": { @@ -726,11 +726,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1716398759, - "narHash": "sha256-fDlOR13WmwVgMxGUMQXWSZAoy2VhZ5AfZRPF9qmQjSc=", + "lastModified": 1716565485, + "narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=", "owner": "axboe", "repo": "liburing", - "rev": "49be3cad491ae8b3c40348b8d78ae2b0d3726b78", + "rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e", "type": "github" }, "original": { @@ -801,11 +801,11 @@ ] }, "locked": { - "lastModified": 1716170277, - "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=", + "lastModified": 1716772633, + "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e0638db3db43b582512a7de8c0f8363a162842b9", + "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", "type": "github" }, "original": { @@ -852,11 +852,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1716987116, + "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", "type": "github" }, "original": { @@ -932,11 +932,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1716061101, - "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "lastModified": 1716655032, + "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", "type": "github" }, "original": { @@ -948,11 +948,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1716769173, + "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", "type": "github" }, "original": { @@ -964,11 +964,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1716097317, - "narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=", + "lastModified": 1716715802, + "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8535fb92661f37ff9f0da3007fbc942f7d134b41", + "rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f", "type": "github" }, "original": { @@ -1060,11 +1060,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1716769173, + "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", "type": "github" }, "original": { @@ -1091,11 +1091,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1716062047, - "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", + "lastModified": 1716651315, + "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", + "rev": "c5187508b11177ef4278edf19616f44f21cc8c69", "type": "github" }, "original": { @@ -1115,11 +1115,11 @@ ] }, "locked": { - "lastModified": 1716497069, - "narHash": "sha256-R8tGjY7wUKWY5O3iZiy1gyg0+8pdXcOeP3RppdKgLLM=", + "lastModified": 1716902607, + "narHash": "sha256-jShqpVupP/7ksp6gCBVG9/05zYSX8Q+z6eGe9HLYtUs=", "owner": "pjones", "repo": "plasma-manager", - "rev": "6d697a8dd6d0699bce69424dbed55184212ff21a", + "rev": "4a255e5ea6bf2c7815d893a693c5c801d835ba6b", "type": "github" }, "original": { @@ -1179,16 +1179,16 @@ "rocksdb_2": { "flake": false, "locked": { - "lastModified": 1714770052, - "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=", + "lastModified": 1716773462, + "narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "db6df0b185774778457dabfcbd822cb81760cade", + "rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.1.1", + "ref": "v9.2.1", "repo": "rocksdb", "type": "github" } @@ -1235,11 +1235,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1715255944, - "narHash": "sha256-vLLgYpdtKBaGYTamNLg1rbRo1bPXp4Jgded/gnprPVw=", + "lastModified": 1716107283, + "narHash": "sha256-NJgrwLiLGHDrCia5AeIvZUHUY7xYGVryee0/9D3Ir1I=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5bf2f85c8054d80424899fa581db1b192230efb5", + "rev": "21ec8f523812b88418b2bfc64240c62b3dd967bd", "type": "github" }, "original": { @@ -1286,11 +1286,11 @@ ] }, "locked": { - "lastModified": 1716085073, - "narHash": "sha256-3+9gI93XxszWA2+9S2xZfws1QArPX/MC6nahOGpcMB4=", + "lastModified": 1716689906, + "narHash": "sha256-tQYQM9zT4P1fFf739/AIZuTIGPxtEIpV7K7VieU60Io=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cfc8776011bd83508324115d353222475e1601c0", + "rev": "3b6e1e221b04965427f3eee11fd6b6ea7b5f579b", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1716400300, - "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", + "lastModified": 1716692524, + "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b549832718b8946e875c016a4785d204fcfc2e53", + "rev": "962797a8d7f15ed7033031731d0bb77244839960", "type": "github" }, "original": { @@ -1489,11 +1489,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1716629375, - "narHash": "sha256-ezO9HPZLhsvRXY5BeGho6WvqsYQ0+bLFJhGfFHuSc2U=", + "lastModified": 1716790530, + "narHash": "sha256-DfVi60QPmspU1g7BwSs80AObTL57W5uiKvDrTB7Yv1E=", "owner": "dj95", "repo": "zjstatus", - "rev": "c186c82cad5dac26c0a2214a9fc89c5ff2c4f112", + "rev": "d4ed9932b0473dbcdfb87408eed94bd99d32fc6d", "type": "github" }, "original": { From 0b10841245853a2caf6224c1fa29eb6e07c72bb2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 31 May 2024 16:05:49 +0200 Subject: [PATCH 1893/2308] Upgrade nextcloud to 29 --- nixos/server/package-configs/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 7ad320e..483401b 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -49,7 +49,7 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; - package = pkgs.nextcloud28; + package = pkgs.nextcloud29; # Use HTTPS for links https = true; From abb9408b12be76cbcc723be7ca5a84670361e067 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 5 Jun 2024 17:24:00 +0200 Subject: [PATCH 1894/2308] Update flake lock --- flake.lock | 114 ++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 725765c..923420f 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1716934277, - "narHash": "sha256-BTRLOEcZnj2jLttdOq3AfKSvsFZNVKkrTpdpINDGW4k=", + "lastModified": 1717565621, + "narHash": "sha256-uU6GeSbzopVcPga+Fy5n3tKfzUhuw4FVMv7h61/13XY=", "owner": "catppuccin", "repo": "nix", - "rev": "96681f62faa285ad0c8dce2cdae6b0a1d0a8f094", + "rev": "0cdfa29b902976fc2941468d326325d24e148437", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1716883613, - "narHash": "sha256-1fJyH76Pfx863Uk5jpPtpmyAIZcCk1luPD0cmPnhUNU=", + "lastModified": 1717556423, + "narHash": "sha256-n1neYvj1Yov77dKe5+1w0xJxxNW/uwg+YMO/wE+pJqI=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "f4cfc77a577e0dfd152878830294c8eb3fe47861", + "rev": "732e8b82aa74fcfacbe78afbd62946e5d6bdd791", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1716680724, - "narHash": "sha256-THm0mm4aKHQhh3pXCj5ms5t0sVPP9xzVsIU9byMjbtI=", + "lastModified": 1717290123, + "narHash": "sha256-K8O2KQEbA+NIAc8BDsWV6QKqU3i9M+YTUi4zzmLRy1s=", "owner": "ipetkov", "repo": "crane", - "rev": "701dbc191ca003a118ce885db38fae9598908294", + "rev": "ae1453ffd0f8f684e863685c317a953317db2b79", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1716983378, - "narHash": "sha256-nfbgkhyXdClO6/Cog7GK+r8kd4gmbg2vWA5gSkYnhG4=", + "lastModified": 1717574802, + "narHash": "sha256-TprJdvfwdjj3co7CGZ4jPIlAdZPFwYrQjamvt2B2L4g=", "owner": "nix-community", "repo": "disko", - "rev": "5f7bdc72053380270f2a88690a14292c63cd5643", + "rev": "7fc7009c892509b9bf81cb73c6575f3f9e6321f5", "type": "github" }, "original": { @@ -666,11 +666,11 @@ ] }, "locked": { - "lastModified": 1716930911, - "narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -686,11 +686,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1717012808, - "narHash": "sha256-Wn0fbjqmpIiuPUWnvxu85a9sPYtSd/2tcPDhAYW54RM=", + "lastModified": 1717520847, + "narHash": "sha256-5dUXMWe+K/PukrgFt8Yp+HHJG6VmTOlw+04+L+V2RfU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a8e6557f29fa0cbcc2c54d15f9664c14ae2a3e98", + "rev": "ab21c7d33b116f2f4def094a0f0c339b61f4335d", "type": "github" }, "original": { @@ -801,11 +801,11 @@ ] }, "locked": { - "lastModified": 1716772633, - "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", + "lastModified": 1717297675, + "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", + "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9", "type": "github" }, "original": { @@ -852,11 +852,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716987116, - "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", + "lastModified": 1717574423, + "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", + "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", "type": "github" }, "original": { @@ -868,11 +868,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -932,11 +932,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1716655032, - "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", + "lastModified": 1717265169, + "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", + "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", "type": "github" }, "original": { @@ -948,11 +948,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716769173, - "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -964,11 +964,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1716715802, - "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=", + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", "type": "github" }, "original": { @@ -1060,11 +1060,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1716769173, - "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -1091,11 +1091,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1716651315, - "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5187508b11177ef4278edf19616f44f21cc8c69", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", "type": "github" }, "original": { @@ -1115,11 +1115,11 @@ ] }, "locked": { - "lastModified": 1716902607, - "narHash": "sha256-jShqpVupP/7ksp6gCBVG9/05zYSX8Q+z6eGe9HLYtUs=", + "lastModified": 1717575866, + "narHash": "sha256-KJg3C46ETdJA2Wwpcpu3MTq0FtP/NQJY76vPKlbutMw=", "owner": "pjones", "repo": "plasma-manager", - "rev": "4a255e5ea6bf2c7815d893a693c5c801d835ba6b", + "rev": "123af3261569b3cbde40091b96f06e76661ff282", "type": "github" }, "original": { @@ -1286,11 +1286,11 @@ ] }, "locked": { - "lastModified": 1716689906, - "narHash": "sha256-tQYQM9zT4P1fFf739/AIZuTIGPxtEIpV7K7VieU60Io=", + "lastModified": 1717294752, + "narHash": "sha256-QhlS52cEQyx+iVcgrEoCnEEpWUA6uLdmeLRxk935inI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3b6e1e221b04965427f3eee11fd6b6ea7b5f579b", + "rev": "b46857a406d207a1de74e792ef3b83e800c30e08", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1714720456, - "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", + "lastModified": 1717515088, + "narHash": "sha256-nWOLpPA7+k7V1OjXTuxdsVd5jeeI0b13Di57wvnqkic=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", + "rev": "0d51a32e4799d081f260eb4db37145f5f4ee7456", "type": "gitlab" }, "original": { @@ -1327,11 +1327,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", + "lastModified": 1717455931, + "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", + "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", "type": "github" }, "original": { @@ -1489,11 +1489,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1716790530, - "narHash": "sha256-DfVi60QPmspU1g7BwSs80AObTL57W5uiKvDrTB7Yv1E=", + "lastModified": 1717324343, + "narHash": "sha256-0X7htQ46i4DbJxz4lSpx8RL7/B+7bUQNtkSr4ZOX9xc=", "owner": "dj95", "repo": "zjstatus", - "rev": "d4ed9932b0473dbcdfb87408eed94bd99d32fc6d", + "rev": "d669610cae0051b60dfb9564a52582611968dfad", "type": "github" }, "original": { From fd0ef515d14cd3b034c734ce9ad709b4156a2667 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 13 Jun 2024 10:28:31 +0200 Subject: [PATCH 1895/2308] Update flake lock --- flake.lock | 182 ++++++++++++++++++++++++++++------------------------- 1 file changed, 97 insertions(+), 85 deletions(-) diff --git a/flake.lock b/flake.lock index 923420f..a18c72e 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1717565621, - "narHash": "sha256-uU6GeSbzopVcPga+Fy5n3tKfzUhuw4FVMv7h61/13XY=", + "lastModified": 1718178283, + "narHash": "sha256-Syt2bvPvzcdx+VQEXckhfLw96Q2yY++vw0wHQK1NkhQ=", "owner": "catppuccin", "repo": "nix", - "rev": "0cdfa29b902976fc2941468d326325d24e148437", + "rev": "d34a94a17c6ec4a0c4e24b3e4336ea504d021f6d", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1717556423, - "narHash": "sha256-n1neYvj1Yov77dKe5+1w0xJxxNW/uwg+YMO/wE+pJqI=", + "lastModified": 1718226369, + "narHash": "sha256-FDEH9NYVXEhbYbmnSEvvl/bQ9FFR+1IP6ub6qsf72Mk=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "732e8b82aa74fcfacbe78afbd62946e5d6bdd791", + "rev": "1f9225e4d128ca43e6992931e369214bdfa220f7", "type": "github" }, "original": { @@ -280,11 +280,11 @@ ] }, "locked": { - "lastModified": 1711299236, - "narHash": "sha256-6/JsyozOMKN8LUGqWMopKTSiK8N79T8Q+hcxu2KkTXg=", + "lastModified": 1718078026, + "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=", "owner": "ipetkov", "repo": "crane", - "rev": "880573f80d09e18a11713f402b9e6172a085449f", + "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1717290123, - "narHash": "sha256-K8O2KQEbA+NIAc8BDsWV6QKqU3i9M+YTUi4zzmLRy1s=", + "lastModified": 1718078026, + "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=", "owner": "ipetkov", "repo": "crane", - "rev": "ae1453ffd0f8f684e863685c317a953317db2b79", + "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1717574802, - "narHash": "sha256-TprJdvfwdjj3co7CGZ4jPIlAdZPFwYrQjamvt2B2L4g=", + "lastModified": 1718242063, + "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=", "owner": "nix-community", "repo": "disko", - "rev": "7fc7009c892509b9bf81cb73c6575f3f9e6321f5", + "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -666,11 +666,11 @@ ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1718243258, + "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "type": "github" }, "original": { @@ -686,11 +686,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1717520847, - "narHash": "sha256-5dUXMWe+K/PukrgFt8Yp+HHJG6VmTOlw+04+L+V2RfU=", + "lastModified": 1718173451, + "narHash": "sha256-ySzjpSDAmecKsoSqgqjKfEsgzRMiI87pLLJgY8haP+s=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ab21c7d33b116f2f4def094a0f0c339b61f4335d", + "rev": "326c1ab2b816f520d298b7a4319a0b50cde01c48", "type": "github" }, "original": { @@ -710,11 +710,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1716805126, - "narHash": "sha256-yqJWx74e16Gk4pwW5DWfI4orTKeWezKFNbW7eaojpLw=", + "lastModified": 1718218065, + "narHash": "sha256-fKC7Ryg3AYykDrS2ilS1VqA8/9B2m3yFZcshK+7tIEc=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2eb19b872bc0a5f336b9b934ba96ea029e4da8c2", + "rev": "7cb05fab896bd542c0ca4260d74d9d664cd7b56e", "type": "github" }, "original": { @@ -801,11 +801,11 @@ ] }, "locked": { - "lastModified": 1717297675, - "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=", + "lastModified": 1718011381, + "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9", + "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", "type": "github" }, "original": { @@ -837,11 +837,11 @@ ] }, "locked": { - "lastModified": 1716210724, - "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", + "lastModified": 1718025593, + "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", + "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", "type": "github" }, "original": { @@ -852,11 +852,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717574423, - "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", + "lastModified": 1718265846, + "narHash": "sha256-h4MnTID6ciFxtTvtl+ibXMKaG6iLMezCtUvKIfFG7r0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", + "rev": "d75003136c0fc94ee60e51806c2801ff572d06a6", "type": "github" }, "original": { @@ -868,11 +868,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { @@ -882,6 +882,21 @@ "type": "github" } }, + "nixpkgs-24_05": { + "locked": { + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1711460390, @@ -932,11 +947,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1717265169, - "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", + "lastModified": 1717880976, + "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", + "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", "type": "github" }, "original": { @@ -948,11 +963,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -964,11 +979,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", + "lastModified": 1717893485, + "narHash": "sha256-WMU6ZRZrBgEUDIF0siu2aIyVAXcxfElSwzZtS/mSpN4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", + "rev": "3bcedce9f4de37570242faf16e1e143583407eab", "type": "github" }, "original": { @@ -1044,11 +1059,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1711297276, - "narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=", + "lastModified": 1717794163, + "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d41d1087707826b3a90685ab69147f8dc8145d5", + "rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755", "type": "github" }, "original": { @@ -1060,11 +1075,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -1076,11 +1091,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -1091,11 +1106,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", + "lastModified": 1717774105, + "narHash": "sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", + "rev": "d226935fd75012939397c83f6c385e4d6d832288", "type": "github" }, "original": { @@ -1115,11 +1130,11 @@ ] }, "locked": { - "lastModified": 1717575866, - "narHash": "sha256-KJg3C46ETdJA2Wwpcpu3MTq0FtP/NQJY76vPKlbutMw=", + "lastModified": 1717666468, + "narHash": "sha256-SKPMh/Apjk3DhY0B/SqTvmt1/UFf2AHwoVPTGA6Md9c=", "owner": "pjones", "repo": "plasma-manager", - "rev": "123af3261569b3cbde40091b96f06e76661ff282", + "rev": "d982fe0063be13bbe57a0c4ace8b406236812b94", "type": "github" }, "original": { @@ -1134,10 +1149,6 @@ "lanzaboote", "flake-compat" ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -1146,11 +1157,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1710923068, - "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -1261,11 +1272,11 @@ ] }, "locked": { - "lastModified": 1711246447, - "narHash": "sha256-g9TOluObcOEKewFo2fR4cn51Y/jSKhRRo4QZckHLop0=", + "lastModified": 1717813066, + "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dcc802a6ec4e9cc6a1c8c393327f0c42666f22e4", + "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", "type": "github" }, "original": { @@ -1286,11 +1297,11 @@ ] }, "locked": { - "lastModified": 1717294752, - "narHash": "sha256-QhlS52cEQyx+iVcgrEoCnEEpWUA6uLdmeLRxk935inI=", + "lastModified": 1718072316, + "narHash": "sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b46857a406d207a1de74e792ef3b83e800c30e08", + "rev": "bedc47af18fc41bb7d2edc2b212d59ca36253f59", "type": "github" }, "original": { @@ -1304,14 +1315,15 @@ "blobs": "blobs", "flake-compat": "flake-compat_7", "nixpkgs": "nixpkgs_8", + "nixpkgs-24_05": "nixpkgs-24_05", "utils": "utils_2" }, "locked": { - "lastModified": 1717515088, - "narHash": "sha256-nWOLpPA7+k7V1OjXTuxdsVd5jeeI0b13Di57wvnqkic=", + "lastModified": 1718084203, + "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "0d51a32e4799d081f260eb4db37145f5f4ee7456", + "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", "type": "gitlab" }, "original": { @@ -1327,11 +1339,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1717455931, - "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", + "lastModified": 1718137936, + "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", + "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", "type": "github" }, "original": { @@ -1489,11 +1501,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1717324343, - "narHash": "sha256-0X7htQ46i4DbJxz4lSpx8RL7/B+7bUQNtkSr4ZOX9xc=", + "lastModified": 1718092736, + "narHash": "sha256-UO2+Lfgv0qBlOW1oddarZV5OEufm+Im5RMqbGdJHvGI=", "owner": "dj95", "repo": "zjstatus", - "rev": "d669610cae0051b60dfb9564a52582611968dfad", + "rev": "eed126b31e7a94d16bc4aa7ef5c2d81e45a28569", "type": "github" }, "original": { From f0416bf15bb2bb8aa248a4e9764271a7da7509b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 18 Jun 2024 13:31:14 +0200 Subject: [PATCH 1896/2308] Fixed the ugly zellij theming fuckup --- home-manager/shared/shell/zellij/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 2affadd..33a552a 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -57,22 +57,22 @@ default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { - format_left "#[fg=#yellow,bold] {session} {mode} {tabs}" - format_right "#[bg=bg,fg=fg] #[bg=bg,fg=fg,bold]{datetime} #[bg=bg,fg=fg]" + format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=bg,fg=fg] #[bg=bg,fg=fg,bold]{name} {sync_indicator}{fullscreen_indicator}{floating_indicator} #[bg=white,fg=cyan]" - tab_active "#[bg=bg,fg=fg] #[bg=black,fg=yellow,bold]{name} {sync_indicator}{fullscreen_indicator}{floating_indicator} #[bg=white,fg=cyan]" + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#1D1D2E,fg=#C9D2F5]" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#1D1D2E,fg=#A6DA95]" tab_sync_indicator " " tab_fullscreen_indicator "□ " tab_floating_indicator "󰉈 " - datetime "#[fg=#yellow,bold] {format} " + datetime "#[bg=#C9D2F5,fg=#1D1D2E,bold]{format} " datetime_format "%Y-%m-%d %H:%M" datetime_timezone "Europe/Amsterdam" } From 26cd8835f55d9afa7c36eef32249d3d33b1f12b1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 19 Jun 2024 10:10:52 +0200 Subject: [PATCH 1897/2308] Give the tab a little padding in zellij like vanilla does --- home-manager/shared/shell/zellij/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 33a552a..540cfec 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -65,8 +65,8 @@ mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#1D1D2E,fg=#C9D2F5]" - tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#1D1D2E,fg=#A6DA95]" + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" tab_sync_indicator " " tab_fullscreen_indicator "□ " From 6e4e7a1b88894794a3bc794abf72229699d5860e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 19 Jun 2024 11:26:11 +0200 Subject: [PATCH 1898/2308] Let's see if I can build cinny from source --- .../server/package-configs/cinny/default.nix | 28 ++--------- pkgs/cinny/default.nix | 50 +++++++++++++++++++ 2 files changed, 53 insertions(+), 25 deletions(-) create mode 100644 pkgs/cinny/default.nix diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index 6c06e4a..6079856 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -4,40 +4,18 @@ inputs, lib, ... -}: let - port = 2143; - configFile = - pkgs.writeText "config.json" - '' - { - "defaultHomeserver": 0, - "homeserverList": [ - "matrix.gladtherescake.eu" - ], - "allowCustomHomeservers": false - } - ''; -in { - virtualisation.oci-containers.containers."cinny" = { - autoStart = true; - ports = ["${toString port}:80"]; - volumes = [ - "${configFile}:/app/config.json" - ]; - image = "ajbura/cinny:latest"; - }; - +}: { services.nginx = { enable = true; virtualHosts = { "cinny.gladtherescake.eu" = { + root = "${pkgs.cinny}"; ## Force HTTP redirect to HTTPS forceSSL = true; ## LetsEncrypt enableACME = true; locations."/" = { - proxyPass = "http://localhost:${toString port}"; - proxyWebsockets = true; + index = "index.html"; }; }; }; diff --git a/pkgs/cinny/default.nix b/pkgs/cinny/default.nix new file mode 100644 index 0000000..ed59af3 --- /dev/null +++ b/pkgs/cinny/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + pkgs, +}: let + port = 2143; + configFile = + pkgs.writeText "config.json" + '' + { + "defaultHomeserver": 0, + "homeserverList": [ + "matrix.gladtherescake.eu" + ], + "allowCustomHomeservers": false + } + ''; +in + buildNpmPackage rec { + pname = "cinny"; + version = "09a0a2d"; + + src = fetchFromGitHub { + owner = "cinnyapp"; + repo = pname; + rev = "${version}"; + hash = "sha256-ee8YOJ0fGy26OWXb2Uumzy68M4UpERHH3ni0q+tDY14="; + }; + + npmDepsHash = "sha256-zelk15/rXXjhWuHj1GsSevnyXVBeDkMJ0qZfPyejq4A="; + + # The prepack script runs the build script, which we'd rather do in the build phase. + npmPackFlags = ["--ignore-scripts" "--max_old_space_size=4096"]; + + installPhase = '' + mkdir $out + npm run build + cp -r dist/* $out + mkdir $out/app + cp ${configFile} $out/app/config.json + ''; + + meta = with lib; { + description = "Yet another matrix client"; + homepage = "https://cinny.in/"; + license = licenses.agpl3O; + maintainers = with maintainers; [Lillian-Violet]; + }; + } From bb062aa80258064c0a043a992f1824e84509663d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 19 Jun 2024 15:36:00 +0200 Subject: [PATCH 1899/2308] Add binary cache for jovian (thank you FSB backdoored friend K900) --- flake.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/flake.nix b/flake.nix index 669d5ff..065d3cf 100644 --- a/flake.nix +++ b/flake.nix @@ -63,6 +63,21 @@ zjstatus.url = "github:dj95/zjstatus"; + nixConfig = { + extra-substituters = [ + "https://nix-community.cachix.org" + "https://nixpkgs-unfree.cachix.org" + "https://0uptime.cachix.org" + "https://cache.lix.systems" + ]; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + ]; + }; + # Fix for steam cursor not being visible under wayland # Add any other flake you might need From d8965c551c925a3822bec8f19312322e6f66b875 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 19 Jun 2024 15:39:03 +0200 Subject: [PATCH 1900/2308] Should probably put that in the right place to not crap it out huh --- flake.nix | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 065d3cf..87a7f4a 100644 --- a/flake.nix +++ b/flake.nix @@ -63,26 +63,25 @@ zjstatus.url = "github:dj95/zjstatus"; - nixConfig = { - extra-substituters = [ - "https://nix-community.cachix.org" - "https://nixpkgs-unfree.cachix.org" - "https://0uptime.cachix.org" - "https://cache.lix.systems" - ]; - extra-trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" - "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" - "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" - ]; - }; - # Fix for steam cursor not being visible under wayland # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; }; + nixConfig = { + extra-substituters = [ + "https://nix-community.cachix.org" + "https://nixpkgs-unfree.cachix.org" + "https://0uptime.cachix.org" + "https://cache.lix.systems" + ]; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + ]; + }; outputs = { self, From 6776dd3740e978c20e87a9e476c42d74415fd84a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 21 Jun 2024 23:59:28 +0200 Subject: [PATCH 1901/2308] Queen is broken but this might update bcachefs and fix those headaches --- flake.lock | 782 ++++++++++++++++++++------- flake.nix | 29 +- nixos/desktop/default.nix | 116 ++-- nixos/hosts/GLaDOS/configuration.nix | 4 +- nixos/hosts/queen/configuration.nix | 4 +- nixos/shared/default.nix | 1 + nixos/shared/packages/default.nix | 59 +- 7 files changed, 710 insertions(+), 285 deletions(-) diff --git a/flake.lock b/flake.lock index a18c72e..4c5c137 100644 --- a/flake.lock +++ b/flake.lock @@ -2,10 +2,10 @@ "nodes": { "attic": { "inputs": { - "crane": "crane", + "crane": "crane_2", "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -25,10 +25,10 @@ }, "attic_2": { "inputs": { - "crane": "crane_3", + "crane": "crane_4", "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -48,16 +48,23 @@ }, "bcachefs-tools": { "inputs": { + "crane": "crane", + "fenix": "fenix", "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "utils": "utils" + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1715290148, - "narHash": "sha256-ZmkeYPiCy7vkXnMFbtUF4761K+I+Ef7UbmSY7dJG09U=", + "lastModified": 1718420836, + "narHash": "sha256-yQA+E+KpX2TwkF2t+XHuhm0TH6auIznJsaiZUiRGTyk=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "3ac510f6a41feb1b695381fa30869d557c00b822", + "rev": "2af260ab2b0f0ad4271fa5c987906fa324655425", "type": "github" }, "original": { @@ -82,13 +89,35 @@ "type": "gitlab" } }, + "cachix": { + "inputs": { + "devenv": "devenv", + "flake-compat": "flake-compat_6", + "nixpkgs": "nixpkgs_5", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1717420532, + "narHash": "sha256-OCCmI69EMaA4BcxRKrXJsx5Ozua2f/PKEy4aJbE7ziM=", + "owner": "cachix", + "repo": "cachix", + "rev": "5727f0676f08a4b41ed13d403ec64dcce989f6e5", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "master", + "repo": "cachix", + "type": "github" + } + }, "catppuccin": { "locked": { - "lastModified": 1718178283, - "narHash": "sha256-Syt2bvPvzcdx+VQEXckhfLw96Q2yY++vw0wHQK1NkhQ=", + "lastModified": 1718339789, + "narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=", "owner": "catppuccin", "repo": "nix", - "rev": "d34a94a17c6ec4a0c4e24b3e4336ea504d021f6d", + "rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a", "type": "github" }, "original": { @@ -135,12 +164,12 @@ "inputs": { "attic": "attic", "complement": "complement", - "crane": "crane_2", - "fenix": "fenix", + "crane": "crane_3", + "fenix": "fenix_2", "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rocksdb": "rocksdb" }, "locked": { @@ -158,11 +187,12 @@ "conduwuit": { "inputs": { "attic": "attic_2", + "cachix": "cachix", "complement": "complement_2", - "crane": "crane_4", - "fenix": "fenix_2", - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_4", + "crane": "crane_5", + "fenix": "fenix_3", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_6", "liburing": "liburing", "nix-filter": "nix-filter_2", "nixpkgs": [ @@ -171,11 +201,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1718226369, - "narHash": "sha256-FDEH9NYVXEhbYbmnSEvvl/bQ9FFR+1IP6ub6qsf72Mk=", + "lastModified": 1718590227, + "narHash": "sha256-IFtAtsGx0kPg8ONpV742SToDZ1IkuAHS1TOO0Sny1vw=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "1f9225e4d128ca43e6992931e369214bdfa220f7", + "rev": "8affdc43a677cf51f04dc16a36978e5adde12fb3", "type": "github" }, "original": { @@ -185,6 +215,27 @@ } }, "crane": { + "inputs": { + "nixpkgs": [ + "bcachefs-tools", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718474113, + "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", + "owner": "ipetkov", + "repo": "crane", + "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { "inputs": { "nixpkgs": [ "conduit", @@ -206,7 +257,7 @@ "type": "github" } }, - "crane_2": { + "crane_3": { "inputs": { "nixpkgs": [ "conduit", @@ -228,7 +279,7 @@ "type": "github" } }, - "crane_3": { + "crane_4": { "inputs": { "nixpkgs": [ "conduwuit", @@ -250,7 +301,7 @@ "type": "github" } }, - "crane_4": { + "crane_5": { "inputs": { "nixpkgs": [ "conduwuit", @@ -272,7 +323,7 @@ "type": "github" } }, - "crane_5": { + "crane_6": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -280,11 +331,11 @@ ] }, "locked": { - "lastModified": 1718078026, - "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=", + "lastModified": 1718474113, + "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", "owner": "ipetkov", "repo": "crane", - "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892", + "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", "type": "github" }, "original": { @@ -293,7 +344,7 @@ "type": "github" } }, - "crane_6": { + "crane_7": { "inputs": { "nixpkgs": [ "zjstatus", @@ -301,11 +352,11 @@ ] }, "locked": { - "lastModified": 1718078026, - "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=", + "lastModified": 1718730147, + "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", "owner": "ipetkov", "repo": "crane", - "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892", + "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", "type": "github" }, "original": { @@ -314,6 +365,37 @@ "type": "github" } }, + "devenv": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "nix": "nix", + "nixpkgs": "nixpkgs_4", + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "owner": "cachix", + "repo": "devenv", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "python-rewrite", + "repo": "devenv", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -321,11 +403,11 @@ ] }, "locked": { - "lastModified": 1718242063, - "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=", + "lastModified": 1718846788, + "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", "owner": "nix-community", "repo": "disko", - "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2", + "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", "type": "github" }, "original": { @@ -337,11 +419,33 @@ "fenix": { "inputs": { "nixpkgs": [ - "conduit", + "bcachefs-tools", "nixpkgs" ], "rust-analyzer-src": "rust-analyzer-src" }, + "locked": { + "lastModified": 1717827974, + "narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=", + "owner": "nix-community", + "repo": "fenix", + "rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "conduit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, "locked": { "lastModified": 1715322226, "narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=", @@ -357,13 +461,13 @@ "type": "github" } }, - "fenix_2": { + "fenix_3": { "inputs": { "nixpkgs": [ "conduwuit", "nixpkgs" ], - "rust-analyzer-src": "rust-analyzer-src_2" + "rust-analyzer-src": "rust-analyzer-src_3" }, "locked": { "lastModified": 1716359173, @@ -396,6 +500,22 @@ "type": "github" } }, + "flake-compat_10": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_2": { "flake": false, "locked": { @@ -448,16 +568,15 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { "owner": "edolstra", - "ref": "master", "repo": "flake-compat", "type": "github" } @@ -494,7 +613,60 @@ "type": "github" } }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_9": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -532,7 +704,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1710146030, @@ -566,26 +738,25 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { "owner": "numtide", - "ref": "main", "repo": "flake-utils", "type": "github" } }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -602,6 +773,25 @@ } }, "flake-utils_6": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { "inputs": { "systems": "systems_5" }, @@ -619,7 +809,25 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_8": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { "inputs": { "systems": "systems_7" }, @@ -638,6 +846,29 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -666,11 +897,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718983978, + "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902", "type": "github" }, "original": { @@ -682,15 +913,15 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_5" + "nix-github-actions": "nix-github-actions_2", + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1718173451, - "narHash": "sha256-ySzjpSDAmecKsoSqgqjKfEsgzRMiI87pLLJgY8haP+s=", + "lastModified": 1718977552, + "narHash": "sha256-kyilmbeCDdHFxup6L0UKvxyZ9T2lhy2vRNv0yeqh5j4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "326c1ab2b816f520d298b7a4319a0b50cde01c48", + "rev": "a7a9774538612c75324f785ab1300e67abc039d3", "type": "github" }, "original": { @@ -701,20 +932,20 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_5", - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6", + "crane": "crane_6", + "flake-compat": "flake-compat_9", + "flake-parts": "flake-parts_2", + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1718218065, - "narHash": "sha256-fKC7Ryg3AYykDrS2ilS1VqA8/9B2m3yFZcshK+7tIEc=", + "lastModified": 1718782018, + "narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "7cb05fab896bd542c0ca4260d74d9d664cd7b56e", + "rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523", "type": "github" }, "original": { @@ -740,6 +971,32 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1708577783, + "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", + "owner": "domenkozar", + "repo": "nix", + "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1710156097, @@ -773,6 +1030,30 @@ } }, "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -801,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1718011381, - "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", + "lastModified": 1718507237, + "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", + "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", "type": "github" }, "original": { @@ -852,11 +1133,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718265846, - "narHash": "sha256-h4MnTID6ciFxtTvtl+ibXMKaG6iLMezCtUvKIfFG7r0=", + "lastModified": 1718987887, + "narHash": "sha256-zVoDb0GkhdfrRtJbJm3QIwFAyZEv9ZBo23vfPa5cfjk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d75003136c0fc94ee60e51806c2801ff572d06a6", + "rev": "cc634b69c8312c4e88469d3c7e8fb5ecc72e7dc6", "type": "github" }, "original": { @@ -868,16 +1149,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", - "owner": "nixos", + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -897,6 +1178,37 @@ "type": "indirect" } }, + "nixpkgs-edge": { + "locked": { + "lastModified": 1719005338, + "narHash": "sha256-aIf2t5Y3/jeoZrpPYt+Zd/4b0l1k1MY9/fTstoduiw8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "69802c3649709bf4c464daa89471ea32036f55d8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "master", + "type": "indirect" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1711460390, @@ -947,11 +1259,27 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1717880976, - "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_5": { + "locked": { + "lastModified": 1718478900, + "narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c884223af91820615a6146af1ae1fea25c107005", "type": "github" }, "original": { @@ -963,11 +1291,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { @@ -979,11 +1307,27 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1717893485, - "narHash": "sha256-WMU6ZRZrBgEUDIF0siu2aIyVAXcxfElSwzZtS/mSpN4=", + "lastModified": 1718276985, + "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bcedce9f4de37570242faf16e1e143583407eab", + "rev": "3f84a279f1a6290ce154c5531378acc827836fbb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1718742829, + "narHash": "sha256-+H7PnuwEDDDxUMa3ItAcSRDK5+jfMJap/zHiuACyIfc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "37a45fb6993f14555f50b18fbcf4945b82a35707", "type": "github" }, "original": { @@ -994,22 +1338,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1715266358, "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", @@ -1025,7 +1353,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1711401922, "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", @@ -1041,13 +1369,29 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -1059,11 +1403,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1717794163, - "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1718541509, + "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ba06293cdba1c94af9710024abf3b94cf8d76349", "type": "github" }, "original": { @@ -1073,13 +1433,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { @@ -1089,7 +1449,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1104,22 +1464,6 @@ "type": "indirect" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1717774105, - "narHash": "sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d226935fd75012939397c83f6c385e4d6d832288", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1130,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1717666468, - "narHash": "sha256-SKPMh/Apjk3DhY0B/SqTvmt1/UFf2AHwoVPTGA6Md9c=", + "lastModified": 1718956312, + "narHash": "sha256-iH+ilQbskYuwoOgN1w3sTgkEcVuuFPIJZ1HCGdgeh70=", "owner": "pjones", "repo": "plasma-manager", - "rev": "d982fe0063be13bbe57a0c4ace8b406236812b94", + "rev": "6f182700ad78f13f367fdfff2b0a4062e70eeea8", "type": "github" }, "original": { @@ -1143,18 +1487,69 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_4", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_5", + "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_3" + }, + "locked": { + "lastModified": 1715609711, + "narHash": "sha256-/5u29K0c+4jyQ8x7dUIEUWlz2BoTSZWUP2quPwFCE7M=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "c182c876690380f8d3b9557c4609472ebfa1b141", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1717664902, @@ -1211,14 +1606,16 @@ "conduit": "conduit", "conduwuit": "conduwuit", "disko": "disko", - "flake-utils": "flake-utils_5", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils_7", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", + "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -1227,6 +1624,23 @@ } }, "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1717583671, + "narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "48bbdd6a74f3176987d5c809894ac33957000d19", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1715255944, @@ -1243,7 +1657,7 @@ "type": "github" } }, - "rust-analyzer-src_2": { + "rust-analyzer-src_3": { "flake": false, "locked": { "lastModified": 1716107283, @@ -1272,11 +1686,11 @@ ] }, "locked": { - "lastModified": 1717813066, - "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", + "lastModified": 1718504420, + "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", + "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9", "type": "github" }, "original": { @@ -1287,21 +1701,17 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": [ - "zjstatus", - "flake-utils" - ], "nixpkgs": [ "zjstatus", "nixpkgs" ] }, "locked": { - "lastModified": 1718072316, - "narHash": "sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps=", + "lastModified": 1718849885, + "narHash": "sha256-Qfc5HKpQvGhWXox0WJVzLqrAcFm3uy6xtWRvVmrkLYc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bedc47af18fc41bb7d2edc2b212d59ca36253f59", + "rev": "bc1a236757cd5f6622f73838e551fb2035afa44a", "type": "github" }, "original": { @@ -1313,17 +1723,16 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_8", - "nixpkgs-24_05": "nixpkgs-24_05", - "utils": "utils_2" + "flake-compat": "flake-compat_10", + "nixpkgs": "nixpkgs_9", + "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1718084203, - "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=", + "lastModified": 1718697807, + "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", + "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b", "type": "gitlab" }, "original": { @@ -1335,15 +1744,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9", - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs": "nixpkgs_10", + "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1718137936, - "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", + "lastModified": 1718506969, + "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", + "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", "type": "github" }, "original": { @@ -1457,55 +1866,40 @@ "type": "github" } }, - "utils": { + "treefmt-nix": { "inputs": { - "systems": "systems" + "nixpkgs": [ + "bcachefs-tools", + "nixpkgs" + ] }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "repo": "treefmt-nix", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", + "repo": "treefmt-nix", "type": "github" } }, "zjstatus": { "inputs": { - "crane": "crane_6", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_10", + "crane": "crane_7", + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1718092736, - "narHash": "sha256-UO2+Lfgv0qBlOW1oddarZV5OEufm+Im5RMqbGdJHvGI=", + "lastModified": 1718908642, + "narHash": "sha256-BmPjWXBc5lZKOlyo5unG5BgS2f97O6+nVnu/yZESPIs=", "owner": "dj95", "repo": "zjstatus", - "rev": "eed126b31e7a94d16bc4aa7ef5c2d81e45a28569", + "rev": "5dea90349c6366383ecda9a1b9bf3e321824a5c6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 87a7f4a..065ea9a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,13 +5,24 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-edge.url = "nixpkgs/master"; # Only used for bleeding edge packages + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # Disko for declaratively setting disk formatting disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; - bcachefs-tools.url = "github:koverstreet/bcachefs-tools"; + bcachefs-tools = { + url = "github:koverstreet/bcachefs-tools"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; + }; + + flake-parts = { + url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management + inputs.nixpkgs-lib.follows = "nixpkgs"; + }; # Nixos generators for creating ISOs nixos-generators = { @@ -86,6 +97,7 @@ outputs = { self, nixpkgs, + nixpkgs-edge, nixos-generators, catppuccin, disko, @@ -102,14 +114,21 @@ ... } @ inputs: let inherit (self) outputs; + inherit (inputs) nixpkgs-edge; # Supported systems for your flake packages, shell, etc. systems = [ - "armv7l-linux" "x86_64-linux" ]; # This is a function that generates an attribute by calling a function you # pass to it, with each system as an argument forAllSystems = nixpkgs.lib.genAttrs systems; + pkgs-edge = import nixpkgs-edge { + system = "x86_64-linux"; + config = { + allowUnfree = true; + allowUnfreePredicate = _: true; + }; + }; in { # Your custom packages # Accessible through 'nix build', 'nix shell', etc @@ -139,6 +158,7 @@ system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + {_module.args = {inherit pkgs-edge;};} nixos-hardware.nixosModules.dell-xps-13-7390 # > Our main nixos configuration file < ./nixos/hosts/EDI/configuration.nix @@ -161,6 +181,7 @@ system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + {_module.args = {inherit pkgs-edge;};} # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix sops-nix.nixosModules.sops @@ -182,6 +203,7 @@ system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + {_module.args = {inherit pkgs-edge;};} # > Our main nixos configuration file < ./nixos/hosts/queen/configuration.nix sops-nix.nixosModules.sops @@ -200,6 +222,7 @@ system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + {_module.args = {inherit pkgs-edge;};} # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops @@ -221,6 +244,7 @@ system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + {_module.args = {inherit pkgs-edge;};} "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" ./nixos/hosts/iso/configuration.nix @@ -241,6 +265,7 @@ system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ + {_module.args = {inherit pkgs-edge;};} "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" ./nixos/hosts/iso_server/configuration.nix diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index e3a2f56..791cdaf 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -6,6 +6,7 @@ lib, config, pkgs, + pkgs-edge, ... }: { imports = [ @@ -17,15 +18,7 @@ # You can add overlays here overlays = [ (final: prev: { - bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs.overrideAttrs (oldAttrs: { - patches = [ - (pkgs.fetchpatch { - # FIXME: remove when https://github.com/koverstreet/bcachefs-tools/pull/263 is merged - url = "https://github.com/koverstreet/bcachefs-tools/pull/263.patch"; - hash = "sha256-M5FhW5ZWQdfXbLzb/Rr+rNtLLPRIdlOBnxQzDpnoyyw="; - }) - ]; - }); + bcachefs-tools = pkgs-edge.bcachefs-tools; }) # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions @@ -42,58 +35,63 @@ programs.nix-index.enable = true; programs.nix-index-database.comma.enable = true; - environment.systemPackages = with pkgs; [ - # Custom tools - dvd - dvt - servo - restart + environment.systemPackages = + (with pkgs; [ + # Custom tools + dvd + dvt + servo + restart - # System tools - aha - bcachefs-tools - clinfo - comma - direnv - git-filter-repo - gnupg - pciutils - podman - podman-compose - sbctl - tpm2-tools - tpm2-tss - virtualgl - vulkan-tools - waydroid - waypipe - wayland-utils - xwaylandvideobridge - yubikey-personalization - zsh + # System tools + aha + bcachefs-tools + clinfo + comma + direnv + git-filter-repo + gnupg + pciutils + podman + podman-compose + sbctl + tpm2-tools + tpm2-tss + virtualgl + vulkan-tools + waydroid + waypipe + wayland-utils + xwaylandvideobridge + yubikey-personalization + zsh - # KDE/QT - krunner-translator - kdePackages.discover - kdePackages.kcalc - kdePackages.kdepim-addons - kdePackages.kirigami - kdePackages.kdeconnect-kde - # kdePackages.krunner-ssh - # kdePackages.krunner-symbols - kdePackages.packagekit-qt - kdePackages.plasma-pa - kdePackages.sddm-kcm - kdePackages.dolphin-plugins - libportal-qt5 - libportal + # KDE/QT + krunner-translator + kdePackages.discover + kdePackages.kcalc + kdePackages.kdepim-addons + kdePackages.kirigami + kdePackages.kdeconnect-kde + # kdePackages.krunner-ssh + # kdePackages.krunner-symbols + kdePackages.packagekit-qt + kdePackages.plasma-pa + kdePackages.sddm-kcm + kdePackages.dolphin-plugins + libportal-qt5 + libportal - # User tools - noisetorch - qjackctl - wireplumber - rustdesk - ]; + # User tools + noisetorch + qjackctl + wireplumber + rustdesk + ]) + ++ (with pkgs-edge; [ + # list of latest packages from nixpkgs master + # Can be used to install latest version of some packages + ]); programs.direnv = { enable = true; @@ -108,7 +106,7 @@ dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server extest.enable = true; }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + hardware.graphics.enable32Bit = true; # Enables support for 32bit libs that steam uses # Set your time zone. time.timeZone = "Europe/Amsterdam"; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index f6e14d1..9b79122 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -38,11 +38,11 @@ services.xserver.videoDrivers = ["amdgpu"]; # Add vulkan support to GPU - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.extraPackages = with pkgs; [ amdvlk ]; # For 32 bit applications - hardware.opengl.extraPackages32 = with pkgs; [ + hardware.graphics.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index d84a4e7..3495abc 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -75,8 +75,8 @@ onlyoffice-documentserver phanpy postgresql_16 - python3 - python311Packages.nbconvert + python310 + python310Packages.nbconvert jupyter rabbitmq-server roundcube diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 0979d5b..702add4 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -4,6 +4,7 @@ lib, config, pkgs, + pkgs-edge, ... }: { imports = [ diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index c313bc0..c6817e3 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -4,6 +4,7 @@ lib, config, pkgs, + pkgs-edge, ... }: { nixpkgs = { @@ -15,34 +16,40 @@ ]; }; - environment.systemPackages = with pkgs; [ - # Custom tools - rebuild - rebuild-no-inhibit - install-nix - update - upgrade - simple-completion-language-server + environment.systemPackages = + (with pkgs; [ + # Custom tools + rebuild + rebuild-no-inhibit + install-nix + update + upgrade + simple-completion-language-server - # System tools - age - alejandra - e2fsprogs - git - git-filter-repo - helix - home-manager - htop - killall - oh-my-zsh - rsync - tre-command - wget - zsh - tldr + # System tools + age + alejandra + e2fsprogs + git + git-filter-repo + helix + home-manager + htop + killall + oh-my-zsh + rsync + tre-command + wget + zsh + tldr + + # System libraries + ]) + ++ (with pkgs-edge; [ + # list of latest packages from nixpkgs master + # Can be used to install latest version of some packages + ]); - # System libraries - ]; fonts = { packages = with pkgs; [ cantarell-fonts From f35891bd676e3e114f48578cf099b6895c36ee97 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 25 Jun 2024 17:10:27 +0200 Subject: [PATCH 1902/2308] Update flake lock and setting the 32 bit libraries in shodan --- flake.lock | 108 +++++++++++++-------------- nixos/hosts/shodan/configuration.nix | 2 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index 4c5c137..fa609b8 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718420836, - "narHash": "sha256-yQA+E+KpX2TwkF2t+XHuhm0TH6auIznJsaiZUiRGTyk=", + "lastModified": 1718887932, + "narHash": "sha256-eo1B6mUPNlRMCe9dgt1bzXinUlD+cD1DdVFj1fxwZnU=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "2af260ab2b0f0ad4271fa5c987906fa324655425", + "rev": "411df4e53fdc58cfca2e473e54c1bed9cf17740d", "type": "github" }, "original": { @@ -113,11 +113,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1718339789, - "narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=", + "lastModified": 1719311390, + "narHash": "sha256-eP+SydN7alV3ln7a1BrGhDoLVTBa6RaHxYZ9bTHAQIA=", "owner": "catppuccin", "repo": "nix", - "rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a", + "rev": "1adbfeb44a54be0ae79eca751ba948a6faa3bb0f", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1718590227, - "narHash": "sha256-IFtAtsGx0kPg8ONpV742SToDZ1IkuAHS1TOO0Sny1vw=", + "lastModified": 1719159653, + "narHash": "sha256-nLl9hKldeNuViMK/fvf2YEirlbcWeQrZXhUQORWt16w=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "8affdc43a677cf51f04dc16a36978e5adde12fb3", + "rev": "6f9d7b5667c9d4ae62712d4c8e6622c97bcf93c8", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1718846788, - "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", + "lastModified": 1719236180, + "narHash": "sha256-VZAfBk2Lo8hQy/NQ4XVSpTICT0ownXBUi1QvGfdlxaM=", "owner": "nix-community", "repo": "disko", - "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", + "rev": "dd4d1663ccf7fbdb32361b9afe9e71206584cd4c", "type": "github" }, "original": { @@ -897,11 +897,11 @@ ] }, "locked": { - "lastModified": 1718983978, - "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=", + "lastModified": 1719180626, + "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902", + "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "type": "github" }, "original": { @@ -917,11 +917,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1718977552, - "narHash": "sha256-kyilmbeCDdHFxup6L0UKvxyZ9T2lhy2vRNv0yeqh5j4=", + "lastModified": 1719292813, + "narHash": "sha256-6w/buoRKo4ijH9O4D/0KjNtiWjtrJebuV7djTEEa0+k=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a7a9774538612c75324f785ab1300e67abc039d3", + "rev": "d6222e7818aa5528f8369afe84bc53556a57c329", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1718507237, - "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", + "lastModified": 1719111455, + "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", + "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "type": "github" }, "original": { @@ -1133,11 +1133,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718987887, - "narHash": "sha256-zVoDb0GkhdfrRtJbJm3QIwFAyZEv9ZBo23vfPa5cfjk=", + "lastModified": 1719145664, + "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc634b69c8312c4e88469d3c7e8fb5ecc72e7dc6", + "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1719005338, - "narHash": "sha256-aIf2t5Y3/jeoZrpPYt+Zd/4b0l1k1MY9/fTstoduiw8=", + "lastModified": 1719313272, + "narHash": "sha256-0YOLZ8BslZZVfpWw/fOE/zn/QKeKOdS87UjuGzI4ciQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "69802c3649709bf4c464daa89471ea32036f55d8", + "rev": "736555406c2a59499046a31827a1470b6c29402d", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1718478900, - "narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=", + "lastModified": 1719099622, + "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c884223af91820615a6146af1ae1fea25c107005", + "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1718276985, - "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=", + "lastModified": 1718983919, + "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f84a279f1a6290ce154c5531378acc827836fbb", + "rev": "90338afd6177fc683a04d934199d693708c85a3b", "type": "github" }, "original": { @@ -1323,11 +1323,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1718742829, - "narHash": "sha256-+H7PnuwEDDDxUMa3ItAcSRDK5+jfMJap/zHiuACyIfc=", + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "37a45fb6993f14555f50b18fbcf4945b82a35707", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -1474,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1718956312, - "narHash": "sha256-iH+ilQbskYuwoOgN1w3sTgkEcVuuFPIJZ1HCGdgeh70=", + "lastModified": 1719302143, + "narHash": "sha256-PMtSsKvbgfoI5+rb7UBIBfIwQ4Zvjt1iChWwQL+BkGo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "6f182700ad78f13f367fdfff2b0a4062e70eeea8", + "rev": "a3b881f62eb3aabb97e4fc68041ef34e8029e186", "type": "github" }, "original": { @@ -1707,11 +1707,11 @@ ] }, "locked": { - "lastModified": 1718849885, - "narHash": "sha256-Qfc5HKpQvGhWXox0WJVzLqrAcFm3uy6xtWRvVmrkLYc=", + "lastModified": 1719109180, + "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bc1a236757cd5f6622f73838e551fb2035afa44a", + "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", "type": "github" }, "original": { @@ -1748,11 +1748,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1718506969, - "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", + "lastModified": 1719268571, + "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", + "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "type": "github" }, "original": { @@ -1895,11 +1895,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1718908642, - "narHash": "sha256-BmPjWXBc5lZKOlyo5unG5BgS2f97O6+nVnu/yZESPIs=", + "lastModified": 1719140798, + "narHash": "sha256-3Zo8kD/NQhHTkeVSRCSXYX86fnZyk/EJ15pH365tZY0=", "owner": "dj95", "repo": "zjstatus", - "rev": "5dea90349c6366383ecda9a1b9bf3e321824a5c6", + "rev": "2f0a24cb31ce94be568e4f57051d98a9318049b9", "type": "github" }, "original": { diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 34818db..2ebcef8 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -110,7 +110,7 @@ dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server extest.enable = true; }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + hardware.graphics.enable32Bit = true; # Enables support for 32bit libs that steam uses # Enable the X11 windowing system. services.xserver.enable = true; From bc7c3f803a2b8928ff63f2f1d80b89a5f6353492 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 26 Jun 2024 15:26:00 +0200 Subject: [PATCH 1903/2308] Queen has been fixed! (also flake lock update, and some small tweaks to reduce errors) --- flake.lock | 48 ++++++++++++++++++++-------------------- flake.nix | 15 +------------ nixos/shared/default.nix | 14 ++++++++++-- 3 files changed, 37 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index fa609b8..b280618 100644 --- a/flake.lock +++ b/flake.lock @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1719236180, - "narHash": "sha256-VZAfBk2Lo8hQy/NQ4XVSpTICT0ownXBUi1QvGfdlxaM=", + "lastModified": 1719401812, + "narHash": "sha256-QONBQ/arBsKZNJuSd3sMIkSYFlBoRJpvf1jGlMfcOuI=", "owner": "nix-community", "repo": "disko", - "rev": "dd4d1663ccf7fbdb32361b9afe9e71206584cd4c", + "rev": "b6a1262796b2990ec3cc60bb2ec23583f35b2f43", "type": "github" }, "original": { @@ -897,11 +897,11 @@ ] }, "locked": { - "lastModified": 1719180626, - "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", + "lastModified": 1719385710, + "narHash": "sha256-0yb5D0wCEtXoTi4ssNZxwvLTrahTwlHYPtx252FZ1MU=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", + "rev": "92a26bf6df1f00cbbed16a99d2547531ff4b3a83", "type": "github" }, "original": { @@ -917,11 +917,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1719292813, - "narHash": "sha256-6w/buoRKo4ijH9O4D/0KjNtiWjtrJebuV7djTEEa0+k=", + "lastModified": 1719380852, + "narHash": "sha256-Li7zNOomyu0FVtm3TyyeUUCZex6L8QpGAJtiFQKGZGw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d6222e7818aa5528f8369afe84bc53556a57c329", + "rev": "fd232b7d5d328619b21b867199b31ce799ae29f3", "type": "github" }, "original": { @@ -1133,11 +1133,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719145664, - "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", + "lastModified": 1719391814, + "narHash": "sha256-zlRvpIUQrxMSOi+1lVFuJNvIJt9LB93c05tYQ1KSdRg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", + "rev": "aab67495e34365045f9dfbe58725cc6fa03607b7", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1719313272, - "narHash": "sha256-0YOLZ8BslZZVfpWw/fOE/zn/QKeKOdS87UjuGzI4ciQ=", + "lastModified": 1719407708, + "narHash": "sha256-EipdX6SC6uVY/5kdNnDbYQiKoJoeFZHKEet8c34IWsc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "736555406c2a59499046a31827a1470b6c29402d", + "rev": "aaa950d4f20622b00dbab53bf7b26c3d9a34939a", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -1474,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1719302143, - "narHash": "sha256-PMtSsKvbgfoI5+rb7UBIBfIwQ4Zvjt1iChWwQL+BkGo=", + "lastModified": 1719340029, + "narHash": "sha256-j++6RRMNvw+aYwI9qC2svfRwNj/2EEnaty552VIAFX0=", "owner": "pjones", "repo": "plasma-manager", - "rev": "a3b881f62eb3aabb97e4fc68041ef34e8029e186", + "rev": "004923027388062be53d5b489be51c59c114d857", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 065ea9a..40ddf08 100644 --- a/flake.nix +++ b/flake.nix @@ -79,24 +79,11 @@ # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; }; - nixConfig = { - extra-substituters = [ - "https://nix-community.cachix.org" - "https://nixpkgs-unfree.cachix.org" - "https://0uptime.cachix.org" - "https://cache.lix.systems" - ]; - extra-trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" - "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" - "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" - ]; - }; outputs = { self, nixpkgs, + flake-utils, nixpkgs-edge, nixos-generators, catppuccin, diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 702add4..1ad4cf2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -34,8 +34,18 @@ experimental-features = "nix-command flakes"; # Deduplicate and optimize nix store auto-optimise-store = true; - extra-substituters = ["https://cache.lix.systems"]; - trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="]; + extra-substituters = [ + "https://cache.lix.systems" + "https://nix-community.cachix.org" + "https://nixpkgs-unfree.cachix.org" + "https://0uptime.cachix.org" + ]; + trusted-public-keys = [ + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" + ]; }; }; From 67cdc3600ea98cb81e392e625d5b83f812a50e63 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 28 Jun 2024 23:18:11 +0200 Subject: [PATCH 1904/2308] Let's see if this makes auto-mount work now --- nixos/hosts/shodan/auto-mount.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- pkgs/auto-mount/default.nix | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 664322d..f1e7387 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -16,7 +16,7 @@ ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount steam]; + path = with pkgs; [udisks bash auto-mount steam]; enable = true; serviceConfig = { ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 2ebcef8..b35973b 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -25,7 +25,7 @@ ../../../disko/shodan - # ./auto-mount.nix + ./auto-mount.nix ]; boot.tmp.cleanOnBoot = true; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 37a8ef2..7872cb4 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -3,11 +3,6 @@ stdenv, system, pkgs, - jq, - coreutils, - udisks, - toybox, - util-linux, writeShellApplication, }: writeShellApplication @@ -16,7 +11,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest]; + runtimeInputs = [pkgs.steam]; text = '' set -euo pipefail @@ -76,7 +71,7 @@ writeShellApplication # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt - systemd-run -M 1000@ --user --collect --wait sh -c "export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD ${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" fi From 62c771d94796b73623353d4127da7a90fcd46896 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 28 Jun 2024 23:20:37 +0200 Subject: [PATCH 1905/2308] Need to add that package --- nixos/hosts/shodan/configuration.nix | 2 +- pkgs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b35973b..8acd75b 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -49,7 +49,7 @@ environment.systemPackages = with pkgs; [ # Custom tools - # auto-mount + auto-mount #System: btrfs-progs diff --git a/pkgs/default.nix b/pkgs/default.nix index 51823f9..464322b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -12,6 +12,6 @@ pkgs: { upgrade = pkgs.callPackage ./upgrade {}; restart = pkgs.callPackage ./restart {}; phanpy = pkgs.callPackage ./phanpy {}; - # auto-mount = pkgs.callPackage ./auto-mount {}; + auto-mount = pkgs.callPackage ./auto-mount {}; simple-completion-language-server = pkgs.callPackage ./simple-completion-language-server {}; } From 569a253534ded5987f6ffc19604625e0ed04e7f5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 28 Jun 2024 23:26:41 +0200 Subject: [PATCH 1906/2308] Need util-linux for flock --- nixos/hosts/shodan/auto-mount.nix | 2 +- pkgs/auto-mount/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index f1e7387..1465c4e 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -16,7 +16,7 @@ ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [udisks bash auto-mount steam]; + path = with pkgs; [util-linux udisks bash auto-mount steam]; enable = true; serviceConfig = { ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 7872cb4..ac7a6a2 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -3,6 +3,7 @@ stdenv, system, pkgs, + util-linux, writeShellApplication, }: writeShellApplication From 2a95e688c090c5adf4fcf23209fca335e429c1a5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 28 Jun 2024 23:29:19 +0200 Subject: [PATCH 1907/2308] Need jq as well --- nixos/hosts/shodan/auto-mount.nix | 2 +- pkgs/auto-mount/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 1465c4e..1c4a376 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -16,7 +16,7 @@ ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [util-linux udisks bash auto-mount steam]; + path = with pkgs; [util-linux udisks bash auto-mount steam jq]; enable = true; serviceConfig = { ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index ac7a6a2..3a27c32 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -4,6 +4,7 @@ system, pkgs, util-linux, + jq, writeShellApplication, }: writeShellApplication From 7bc03653c39acbd9d4c94f0961c8e7187b17233d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 30 Jun 2024 23:13:59 +0200 Subject: [PATCH 1908/2308] Add ffz plugin --- nixos/desktop/package-configs/firefox/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 9324703..394788b 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -118,6 +118,10 @@ install_url = "https://addons.mozilla.org/firefox/downloads/file/4047136/wayback_machine_new-3.2.xpi"; installation_mode = "force_installed"; }; + "frankerfacez@frankerfacez.com" = { + install_url = "https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"; + installation_mode = "force_installed"; + }; }; FirefoxHome = { Search = true; From 3f149efae6c9e2863735a9a2ea24926c7a976c7d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jul 2024 11:26:00 +0200 Subject: [PATCH 1909/2308] update flake lock --- flake.lock | 120 ++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index b280618..0401a74 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718887932, - "narHash": "sha256-eo1B6mUPNlRMCe9dgt1bzXinUlD+cD1DdVFj1fxwZnU=", + "lastModified": 1719676503, + "narHash": "sha256-5ER4843mn9Am8FKsUovaPFzwBIc2LOFvmcd+iUr8P9g=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "411df4e53fdc58cfca2e473e54c1bed9cf17740d", + "rev": "755788e2d6065ac35e680a23c48125a5cd63f7b7", "type": "github" }, "original": { @@ -113,11 +113,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1719311390, - "narHash": "sha256-eP+SydN7alV3ln7a1BrGhDoLVTBa6RaHxYZ9bTHAQIA=", + "lastModified": 1719758387, + "narHash": "sha256-bMaI1jJNzIZar4TP/hhoPQROqqcbD6zT6O+sqIJdp8c=", "owner": "catppuccin", "repo": "nix", - "rev": "1adbfeb44a54be0ae79eca751ba948a6faa3bb0f", + "rev": "9eb0610d48dd0e1fecf772bbdacf9050d7b82d7c", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1719159653, - "narHash": "sha256-nLl9hKldeNuViMK/fvf2YEirlbcWeQrZXhUQORWt16w=", + "lastModified": 1719876904, + "narHash": "sha256-rPzc2Wpkvaq/N1U0FNvUmQdzLHOJ/dLb3sQ6+04+0GI=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "6f9d7b5667c9d4ae62712d4c8e6622c97bcf93c8", + "rev": "20aab1792be1b637bee4e268a7bd8d163321fb63", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1719401812, - "narHash": "sha256-QONBQ/arBsKZNJuSd3sMIkSYFlBoRJpvf1jGlMfcOuI=", + "lastModified": 1719864345, + "narHash": "sha256-e4Pw+30vFAxuvkSTaTypd9zYemB/QlWcH186dsGT+Ms=", "owner": "nix-community", "repo": "disko", - "rev": "b6a1262796b2990ec3cc60bb2ec23583f35b2f43", + "rev": "544a80a69d6e2da04e4df7ec8210a858de8c7533", "type": "github" }, "original": { @@ -653,11 +653,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -897,11 +897,11 @@ ] }, "locked": { - "lastModified": 1719385710, - "narHash": "sha256-0yb5D0wCEtXoTi4ssNZxwvLTrahTwlHYPtx252FZ1MU=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "92a26bf6df1f00cbbed16a99d2547531ff4b3a83", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -917,11 +917,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1719380852, - "narHash": "sha256-Li7zNOomyu0FVtm3TyyeUUCZex6L8QpGAJtiFQKGZGw=", + "lastModified": 1719631702, + "narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fd232b7d5d328619b21b867199b31ce799ae29f3", + "rev": "2f9668e19aff06550cd154c87c0af120735a56a4", "type": "github" }, "original": { @@ -941,11 +941,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1718782018, - "narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=", + "lastModified": 1719818887, + "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523", + "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1719111455, - "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", + "lastModified": 1719832725, + "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", + "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", "type": "github" }, "original": { @@ -1097,11 +1097,11 @@ }, "nixlib": { "locked": { - "lastModified": 1712450863, - "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", + "lastModified": 1719708727, + "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", + "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", "type": "github" }, "original": { @@ -1118,11 +1118,11 @@ ] }, "locked": { - "lastModified": 1718025593, - "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", + "lastModified": 1719841141, + "narHash": "sha256-WOyohxFJJdfDvEB7N3eTcX44lNU2rZes1inHsyHL7mM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", + "rev": "140dcc2b9a0eb87ba5e9011076a1a7af19179ab1", "type": "github" }, "original": { @@ -1133,11 +1133,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719391814, - "narHash": "sha256-zlRvpIUQrxMSOi+1lVFuJNvIJt9LB93c05tYQ1KSdRg=", + "lastModified": 1719895800, + "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "aab67495e34365045f9dfbe58725cc6fa03607b7", + "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1719407708, - "narHash": "sha256-EipdX6SC6uVY/5kdNnDbYQiKoJoeFZHKEet8c34IWsc=", + "lastModified": 1719909084, + "narHash": "sha256-GxoaFEsoQZhP7YDzLhilmlUlX2vLnzsizM6ACQlbd8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aaa950d4f20622b00dbab53bf7b26c3d9a34939a", + "rev": "e689d1116660575bac669cbbe1cc05999bbd2f0f", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1719099622, - "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", + "lastModified": 1719663039, + "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", + "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1718983919, - "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", + "lastModified": 1719468428, + "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90338afd6177fc683a04d934199d693708c85a3b", + "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -1474,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1719340029, - "narHash": "sha256-j++6RRMNvw+aYwI9qC2svfRwNj/2EEnaty552VIAFX0=", + "lastModified": 1719875930, + "narHash": "sha256-jQmdWLxRP6BzOxRF8hQEhDD7UKw7UrnYbmaAPOSaXWY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "004923027388062be53d5b489be51c59c114d857", + "rev": "7e062fcd669e261fb06cf54fe0ef2e46c3db8e83", "type": "github" }, "original": { @@ -1748,11 +1748,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1719268571, - "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", + "lastModified": 1719873517, + "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", + "rev": "a11224af8d824935f363928074b4717ca2e280db", "type": "github" }, "original": { @@ -1895,11 +1895,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1719140798, - "narHash": "sha256-3Zo8kD/NQhHTkeVSRCSXYX86fnZyk/EJ15pH365tZY0=", + "lastModified": 1719650330, + "narHash": "sha256-spoLPg8Ty7LvypwM4JpuWA06B/TUcIzyjs+N1nzGha4=", "owner": "dj95", "repo": "zjstatus", - "rev": "2f0a24cb31ce94be568e4f57051d98a9318049b9", + "rev": "f5fd92d8ebd3152b0db4c85c6ff7b638c6f52d14", "type": "github" }, "original": { From 237f66d10e1280636136039135f645fa578a59b8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jul 2024 16:44:54 +0200 Subject: [PATCH 1910/2308] update flake lock --- flake.lock | 293 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 193 insertions(+), 100 deletions(-) diff --git a/flake.lock b/flake.lock index 0401a74..2cf787d 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "lastModified": 1717279440, + "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=", "owner": "zhaofengli", "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", + "rev": "717cc95983cdc357bc347d70be20ced21f935843", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1717420532, - "narHash": "sha256-OCCmI69EMaA4BcxRKrXJsx5Ozua2f/PKEy4aJbE7ziM=", + "lastModified": 1719923519, + "narHash": "sha256-7Rhljj2fsklFRsu+eq7N683Z9qukmreMEj5C1GqCrSA=", "owner": "cachix", "repo": "cachix", - "rev": "5727f0676f08a4b41ed13d403ec64dcce989f6e5", + "rev": "4e9e71f78b9500fa6210cf1eaa4d75bdbab777c3", "type": "github" }, "original": { @@ -111,13 +111,49 @@ "type": "github" } }, + "cachix_2": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "catppuccin": { "locked": { - "lastModified": 1719758387, - "narHash": "sha256-bMaI1jJNzIZar4TP/hhoPQROqqcbD6zT6O+sqIJdp8c=", + "lastModified": 1719915848, + "narHash": "sha256-zq+CMkdT8A9z74HonwspXp8HsX4OvP4uaVdD98AO6as=", "owner": "catppuccin", "repo": "nix", - "rev": "9eb0610d48dd0e1fecf772bbdacf9050d7b82d7c", + "rev": "9345073d27d91ab66c1b6ab65df322906992aa59", "type": "github" }, "original": { @@ -146,11 +182,11 @@ "complement_2": { "flake": false, "locked": { - "lastModified": 1715700731, - "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", + "lastModified": 1719903368, + "narHash": "sha256-PPzgxM4Bir+Zh9FUV/v+RBxEYeJxYVmi/BYo3uqt268=", "owner": "matrix-org", "repo": "complement", - "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", + "rev": "bc97f1ddc1cd7485faf80c8935ee2641f3e1b57c", "type": "github" }, "original": { @@ -192,7 +228,7 @@ "crane": "crane_5", "fenix": "fenix_3", "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "liburing": "liburing", "nix-filter": "nix-filter_2", "nixpkgs": [ @@ -201,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1719876904, - "narHash": "sha256-rPzc2Wpkvaq/N1U0FNvUmQdzLHOJ/dLb3sQ6+04+0GI=", + "lastModified": 1720072522, + "narHash": "sha256-ZHYStZaFXB28CjKmk3bHtLTMXFj0OVs84GpFJJIzggs=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "20aab1792be1b637bee4e268a7bd8d163321fb63", + "rev": "9a0ffd55da7ebc530040be6f0cc2b64c70447bfa", "type": "github" }, "original": { @@ -288,11 +324,11 @@ ] }, "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "lastModified": 1717025063, + "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", "owner": "ipetkov", "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", "type": "github" }, "original": { @@ -367,17 +403,55 @@ }, "devenv": { "inputs": { + "cachix": "cachix_2", "flake-compat": [ "conduwuit", "cachix", "flake-compat" ], + "nix": "nix_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1719759336, + "narHash": "sha256-3a34VL/QnHprl5gMy9xlx6d8J+iNp+W88Ex8smkgH9M=", + "owner": "cachix", + "repo": "devenv", + "rev": "bb32aa986f2f695385e54428d0eaf7d05b31466e", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], "nix": "nix", "nixpkgs": "nixpkgs_4", "poetry2nix": "poetry2nix", "pre-commit-hooks": [ "conduwuit", "cachix", + "devenv", + "cachix", "pre-commit-hooks" ] }, @@ -403,11 +477,11 @@ ] }, "locked": { - "lastModified": 1719864345, - "narHash": "sha256-e4Pw+30vFAxuvkSTaTypd9zYemB/QlWcH186dsGT+Ms=", + "lastModified": 1720056646, + "narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=", "owner": "nix-community", "repo": "disko", - "rev": "544a80a69d6e2da04e4df7ec8210a858de8c7533", + "rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e", "type": "github" }, "original": { @@ -653,11 +727,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -768,6 +842,7 @@ }, "original": { "owner": "numtide", + "ref": "main", "repo": "flake-utils", "type": "github" } @@ -786,7 +861,6 @@ }, "original": { "owner": "numtide", - "ref": "main", "repo": "flake-utils", "type": "github" } @@ -827,24 +901,6 @@ "type": "github" } }, - "flake-utils_9": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -897,11 +953,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1720045378, + "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", "type": "github" }, "original": { @@ -917,11 +973,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1719631702, - "narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", + "lastModified": 1720025282, + "narHash": "sha256-I70ARXPm1YjGJ0efykd5zsapUZtmVZ/sIgwJ0F0j17w=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2f9668e19aff06550cd154c87c0af120735a56a4", + "rev": "8dd0f8383bd60b8ed66cd27c1b49cdbf7be4ad9d", "type": "github" }, "original": { @@ -935,7 +991,7 @@ "crane": "crane_6", "flake-compat": "flake-compat_9", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" @@ -957,11 +1013,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1716565485, - "narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=", + "lastModified": 1719025212, + "narHash": "sha256-kD0yhjNStqC6uFqC1AxBwUpc/HlSFtiKrV+gwDyroDc=", "owner": "axboe", "repo": "liburing", - "rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e", + "rev": "7b3245583069bd481190c9da18f22e9fc8c3a805", "type": "github" }, "original": { @@ -978,16 +1034,18 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1708577783, - "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", "owner": "domenkozar", "repo": "nix", - "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { @@ -1035,6 +1093,8 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "poetry2nix", "nixpkgs" ] @@ -1095,6 +1155,37 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1719708727, @@ -1118,11 +1209,11 @@ ] }, "locked": { - "lastModified": 1719841141, - "narHash": "sha256-WOyohxFJJdfDvEB7N3eTcX44lNU2rZes1inHsyHL7mM=", + "lastModified": 1720055043, + "narHash": "sha256-SKizewU4UeYrkZWPUjur8EoxscGoNb0pGcrNL4YzAIg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "140dcc2b9a0eb87ba5e9011076a1a7af19179ab1", + "rev": "168b220231a70e47cc1f0919048fa5914415fb18", "type": "github" }, "original": { @@ -1180,11 +1271,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1719909084, - "narHash": "sha256-GxoaFEsoQZhP7YDzLhilmlUlX2vLnzsizM6ACQlbd8A=", + "lastModified": 1720104015, + "narHash": "sha256-jOP2BID6nd4prNl5AXwEX97WIB9TqvcE/+scdKVfNug=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e689d1116660575bac669cbbe1cc05999bbd2f0f", + "rev": "30a4d0f448db4f73897abdb32fcdc6092a050bd0", "type": "github" }, "original": { @@ -1209,6 +1300,22 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1711460390, @@ -1243,11 +1350,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1718811006, + "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "type": "github" }, "original": { @@ -1291,11 +1398,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -1387,11 +1494,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -1435,11 +1542,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -1495,6 +1602,8 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ] }, @@ -1515,7 +1624,6 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_5", "gitignore": "gitignore", "nixpkgs": [ "conduwuit", @@ -1525,11 +1633,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1715609711, - "narHash": "sha256-/5u29K0c+4jyQ8x7dUIEUWlz2BoTSZWUP2quPwFCE7M=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c182c876690380f8d3b9557c4609472ebfa1b141", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -1585,16 +1693,16 @@ "rocksdb_2": { "flake": false, "locked": { - "lastModified": 1716773462, - "narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=", + "lastModified": 1719949653, + "narHash": "sha256-DYx7XHH2GEh17GukKhXs6laM6l+eugCmRkF0adpi9wk=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc", + "rev": "a935c0273e1ba44eacf88ce3685a9b9831486155", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.2.1", + "ref": "v9.3.1", "repo": "rocksdb", "type": "github" } @@ -1607,7 +1715,7 @@ "conduwuit": "conduwuit", "disko": "disko", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", @@ -1851,21 +1959,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1890,7 +1983,7 @@ "zjstatus": { "inputs": { "crane": "crane_7", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_2" }, From 8dd1285c8fb771fe40e4cb507bcee924fe294f2c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jul 2024 16:02:20 +0200 Subject: [PATCH 1911/2308] Flake update & temporarily allow youtube-dl insecurely --- flake.lock | 140 +++++++++++++++++++-------------------- nixos/shared/default.nix | 4 ++ 2 files changed, 74 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index 2cf787d..8f626dc 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719676503, - "narHash": "sha256-5ER4843mn9Am8FKsUovaPFzwBIc2LOFvmcd+iUr8P9g=", + "lastModified": 1720185405, + "narHash": "sha256-Ze9X79OXynWUHolo8xFv3BJwndqXsdvBWdwL3N+3yM0=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "755788e2d6065ac35e680a23c48125a5cd63f7b7", + "rev": "8b06995115a8ade5e0b154311b771279ff97317f", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1719915848, - "narHash": "sha256-zq+CMkdT8A9z74HonwspXp8HsX4OvP4uaVdD98AO6as=", + "lastModified": 1720472194, + "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=", "owner": "catppuccin", "repo": "nix", - "rev": "9345073d27d91ab66c1b6ab65df322906992aa59", + "rev": "d75d5803852fb0833767dc969a4581ac13204e22", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1720072522, - "narHash": "sha256-ZHYStZaFXB28CjKmk3bHtLTMXFj0OVs84GpFJJIzggs=", + "lastModified": 1720663246, + "narHash": "sha256-7h/Tnl5X27g2XayLjXjOUkjaKsfTDuOYcgoAmQshzBM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "9a0ffd55da7ebc530040be6f0cc2b64c70447bfa", + "rev": "b5d4a1c1b0c1e5cd8e399caa01744d46a8e34ff4", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1716569590, - "narHash": "sha256-5eDbq8TuXFGGO3mqJFzhUbt5zHVTf5zilQoyW5jnJwo=", + "lastModified": 1720226507, + "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", "owner": "ipetkov", "repo": "crane", - "rev": "109987da061a1bf452f435f1653c47511587d919", + "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1718730147, - "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", + "lastModified": 1720226507, + "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", "owner": "ipetkov", "repo": "crane", - "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", + "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1720056646, - "narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=", + "lastModified": 1720661479, + "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", "owner": "nix-community", "repo": "disko", - "rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e", + "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", "type": "github" }, "original": { @@ -544,11 +544,11 @@ "rust-analyzer-src": "rust-analyzer-src_3" }, "locked": { - "lastModified": 1716359173, - "narHash": "sha256-pYcjP6Gy7i6jPWrjiWAVV0BCQp+DdmGaI/k65lBb/kM=", + "lastModified": 1720420198, + "narHash": "sha256-OIuDb6pHDyGpo7YMFyuRzMLcHm7mRvlYOz0Ht7ps2sU=", "owner": "nix-community", "repo": "fenix", - "rev": "b6fc5035b28e36a98370d0eac44f4ef3fd323df6", + "rev": "abc0549e3560189462a7d394cc9d50af4608d103", "type": "github" }, "original": { @@ -953,11 +953,11 @@ ] }, "locked": { - "lastModified": 1720045378, - "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", + "lastModified": 1720646128, + "narHash": "sha256-BivO5yIQukDlJL+1875Sqf3GuOPxZDdA48dYDi3PkL8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", + "rev": "c085b984ff2808bf322f375b10fea5a415a9c43d", "type": "github" }, "original": { @@ -973,11 +973,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1720025282, - "narHash": "sha256-I70ARXPm1YjGJ0efykd5zsapUZtmVZ/sIgwJ0F0j17w=", + "lastModified": 1720697445, + "narHash": "sha256-IvFFc57vljkR1eP4VeNMuXJTS/POClq+ytFAadigSY0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8dd0f8383bd60b8ed66cd27c1b49cdbf7be4ad9d", + "rev": "bba994424596df09228f5437bcf8ef7fde1fe56e", "type": "github" }, "original": { @@ -1142,11 +1142,11 @@ ] }, "locked": { - "lastModified": 1719832725, - "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", + "lastModified": 1720334033, + "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", + "rev": "685e40e1348007d2cf76747a201bab43d86b38cb", "type": "github" }, "original": { @@ -1224,11 +1224,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719895800, - "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", + "lastModified": 1720515935, + "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", + "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", "type": "github" }, "original": { @@ -1271,11 +1271,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1720104015, - "narHash": "sha256-jOP2BID6nd4prNl5AXwEX97WIB9TqvcE/+scdKVfNug=", + "lastModified": 1720705017, + "narHash": "sha256-eDbw6fazdrsvoQaiTLRHaJgJm2H/HO9uu31dzOf8C5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a4d0f448db4f73897abdb32fcdc6092a050bd0", + "rev": "bed9309adc836ddea35a5923fdca425d23002abf", "type": "github" }, "original": { @@ -1382,27 +1382,27 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1719663039, - "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", + "lastModified": 1720282526, + "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", + "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -1414,11 +1414,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1719468428, - "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", + "lastModified": 1720181791, + "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", + "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", "type": "github" }, "original": { @@ -1430,11 +1430,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1720181791, + "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", "type": "github" }, "original": { @@ -1510,11 +1510,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1720418205, + "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "655a58a72a6601292512670343087c2d75d859c1", "type": "github" }, "original": { @@ -1542,11 +1542,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -1581,11 +1581,11 @@ ] }, "locked": { - "lastModified": 1719875930, - "narHash": "sha256-jQmdWLxRP6BzOxRF8hQEhDD7UKw7UrnYbmaAPOSaXWY=", + "lastModified": 1720603727, + "narHash": "sha256-A5qYbCT3rHvVi95u8Zy12cRmW5OPT7yFl1LrTDSejyE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "7e062fcd669e261fb06cf54fe0ef2e46c3db8e83", + "rev": "f0691e1a9fff4684ce399c345c3a941d2ef0fe78", "type": "github" }, "original": { @@ -1768,11 +1768,11 @@ "rust-analyzer-src_3": { "flake": false, "locked": { - "lastModified": 1716107283, - "narHash": "sha256-NJgrwLiLGHDrCia5AeIvZUHUY7xYGVryee0/9D3Ir1I=", + "lastModified": 1720344064, + "narHash": "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "21ec8f523812b88418b2bfc64240c62b3dd967bd", + "rev": "a5b21ea0aa644dffd7cf958b43f11f221d53404e", "type": "github" }, "original": { @@ -1815,11 +1815,11 @@ ] }, "locked": { - "lastModified": 1719109180, - "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", + "lastModified": 1720232258, + "narHash": "sha256-eR5glZHS2bLpzUgTDhWGm04j+j5KMYKoDsY5DXAiuKQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", + "rev": "05ccbe21233d4e9110fc6428d2c3d74b430c3c69", "type": "github" }, "original": { @@ -1856,11 +1856,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1719873517, - "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", + "lastModified": 1720479166, + "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a11224af8d824935f363928074b4717ca2e280db", + "rev": "67035a355b1d52d2d238501f8cc1a18706979760", "type": "github" }, "original": { @@ -1988,11 +1988,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1719650330, - "narHash": "sha256-spoLPg8Ty7LvypwM4JpuWA06B/TUcIzyjs+N1nzGha4=", + "lastModified": 1720291207, + "narHash": "sha256-0az2z890pvKAxn2LJaHxWPgpSvbx0DlNbBIZlYyP7Y4=", "owner": "dj95", "repo": "zjstatus", - "rev": "f5fd92d8ebd3152b0db4c85c6ff7b638c6f52d14", + "rev": "af66be8031cbccf484363fc3efe6c020cd602b1e", "type": "github" }, "original": { diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 1ad4cf2..20a22ec 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -14,6 +14,10 @@ sops.age.keyFile = ../../../../../../var/secrets/keys.txt; sops.secrets."lillian-password".neededForUsers = true; + #TODO: remove this when unneeded for freetube + nixpkgs.config.permittedInsecurePackages = [ + "python3.12-youtube-dl-2021.12.17" + ]; nix = { package = pkgs.lix; gc = { From c94191d60ad1e415bb283d4437a35572210d5a65 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jul 2024 16:07:20 +0200 Subject: [PATCH 1912/2308] Plugins not available anymore --- home-manager/desktop/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 088d5ca..43c1a80 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -152,8 +152,6 @@ ms-toolsai.jupyter ms-pyright.pyright ms-python.black-formatter - ms-python.vscode-pylance - ms-vscode-remote.remote-ssh oderwat.indent-rainbow rust-lang.rust-analyzer yzhang.markdown-all-in-one From d87f842ad5b518c9e820fa2973693bce83b27a24 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jul 2024 22:33:42 +0200 Subject: [PATCH 1913/2308] Add protonup-qt to shodan for junk-store --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 8acd75b..190cbae 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -65,6 +65,7 @@ util-linux waypipe python3 + protonup-qt #KDE: krunner-translator From 8f624841129c8d19d418c34d9a9ccd7819353d8e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jul 2024 22:49:08 +0200 Subject: [PATCH 1914/2308] Add protontricks too --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 190cbae..5eff55f 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -83,6 +83,7 @@ #Gaming: heroic legendary-gl + protontricks rare ]; From 142b9c79502eb145b06450dfbf06fd0a9202fb73 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jul 2024 13:58:21 +0200 Subject: [PATCH 1915/2308] error said this option does nothing anymore --- nixos/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 791cdaf..d867eab 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -144,7 +144,6 @@ services.fwupd.enable = true; # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { From f5475e17523cf9ed027bca4f640982bcfe45a64d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jul 2024 14:45:34 +0200 Subject: [PATCH 1916/2308] also remove the sound option for shodan --- nixos/hosts/shodan/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 5eff55f..9f586a6 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -166,7 +166,6 @@ services.fwupd.enable = true; # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { From b6d43632fe5cc3aad75372e32b2594a8549374fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jul 2024 14:47:57 +0200 Subject: [PATCH 1917/2308] update flake lock --- flake.lock | 158 ++++++++++++++++++++++++++--------------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/flake.lock b/flake.lock index 8f626dc..c40cdbf 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717279440, - "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=", + "lastModified": 1720542474, + "narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=", "owner": "zhaofengli", "repo": "attic", - "rev": "717cc95983cdc357bc347d70be20ced21f935843", + "rev": "6139576a3ce6bb992e0f6c3022528ec233e45f00", "type": "github" }, "original": { @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1720185405, - "narHash": "sha256-Ze9X79OXynWUHolo8xFv3BJwndqXsdvBWdwL3N+3yM0=", + "lastModified": 1721350094, + "narHash": "sha256-JbiL5dMpHEKs044XVJEnT3l+ny369auBjchR8DiESao=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "8b06995115a8ade5e0b154311b771279ff97317f", + "rev": "60ff4f2f3c3da34746f0993d4e6f1de79979f580", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "complement_2": { "flake": false, "locked": { - "lastModified": 1719903368, - "narHash": "sha256-PPzgxM4Bir+Zh9FUV/v+RBxEYeJxYVmi/BYo3uqt268=", + "lastModified": 1720637557, + "narHash": "sha256-oZz6nCmFmdJZpC+K1iOG2KkzTI6rlAmndxANPDVU7X0=", "owner": "matrix-org", "repo": "complement", - "rev": "bc97f1ddc1cd7485faf80c8935ee2641f3e1b57c", + "rev": "0d14432e010482ea9e13a6f7c47c1533c0c9d62f", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1720663246, - "narHash": "sha256-7h/Tnl5X27g2XayLjXjOUkjaKsfTDuOYcgoAmQshzBM=", + "lastModified": 1721267279, + "narHash": "sha256-99utYoUwaX10XMjZiqe1YqhtWg4kUFBXnQikFkWTGtY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "b5d4a1c1b0c1e5cd8e399caa01744d46a8e34ff4", + "rev": "06531993f69b8cefd5d67d3589791ca9cd6785c2", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1720226507, - "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", + "lastModified": 1720546058, + "narHash": "sha256-iU2yVaPIZm5vMGdlT0+57vdB/aPq/V5oZFBRwYw+HBM=", "owner": "ipetkov", "repo": "crane", - "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", + "rev": "2d83156f23c43598cf44e152c33a59d3892f8b29", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1720226507, - "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", + "lastModified": 1720975002, + "narHash": "sha256-1i521ecK2MFg+lxSk9oRx/C0SsdlI6GS6eYT79nA6TA=", "owner": "ipetkov", "repo": "crane", - "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", + "rev": "1791a5b98d2c1bf143ad85469abcfa2426f3f087", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1720661479, - "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", + "lastModified": 1721266288, + "narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=", "owner": "nix-community", "repo": "disko", - "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", + "rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47", "type": "github" }, "original": { @@ -544,11 +544,11 @@ "rust-analyzer-src": "rust-analyzer-src_3" }, "locked": { - "lastModified": 1720420198, - "narHash": "sha256-OIuDb6pHDyGpo7YMFyuRzMLcHm7mRvlYOz0Ht7ps2sU=", + "lastModified": 1720852044, + "narHash": "sha256-3NBYz8VuXuKU+8ONd9NFafCNjPEGHIZQ2Mdoam1a4mY=", "owner": "nix-community", "repo": "fenix", - "rev": "abc0549e3560189462a7d394cc9d50af4608d103", + "rev": "5087b12a595ee73131a944d922f24d81dae05725", "type": "github" }, "original": { @@ -953,11 +953,11 @@ ] }, "locked": { - "lastModified": 1720646128, - "narHash": "sha256-BivO5yIQukDlJL+1875Sqf3GuOPxZDdA48dYDi3PkL8=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c085b984ff2808bf322f375b10fea5a415a9c43d", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { @@ -973,11 +973,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1720697445, - "narHash": "sha256-IvFFc57vljkR1eP4VeNMuXJTS/POClq+ytFAadigSY0=", + "lastModified": 1721226562, + "narHash": "sha256-KfdwusX12hhkzXKBmu2HhaU9EhaxVeWLDQw1Ll2A03o=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bba994424596df09228f5437bcf8ef7fde1fe56e", + "rev": "927eea31915468e06b94bedf678261dc7cf048c8", "type": "github" }, "original": { @@ -1013,11 +1013,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1719025212, - "narHash": "sha256-kD0yhjNStqC6uFqC1AxBwUpc/HlSFtiKrV+gwDyroDc=", + "lastModified": 1720798442, + "narHash": "sha256-gtPppAoksMLW4GuruQ36nf4EAqIA1Bs6V9Xcx8dBxrQ=", "owner": "axboe", "repo": "liburing", - "rev": "7b3245583069bd481190c9da18f22e9fc8c3a805", + "rev": "1d674f83b7d0f07553ac44d99a401b05853d9dbe", "type": "github" }, "original": { @@ -1142,11 +1142,11 @@ ] }, "locked": { - "lastModified": 1720334033, - "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=", + "lastModified": 1720926593, + "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "685e40e1348007d2cf76747a201bab43d86b38cb", + "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", "type": "github" }, "original": { @@ -1209,11 +1209,11 @@ ] }, "locked": { - "lastModified": 1720055043, - "narHash": "sha256-SKizewU4UeYrkZWPUjur8EoxscGoNb0pGcrNL4YzAIg=", + "lastModified": 1720859326, + "narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "168b220231a70e47cc1f0919048fa5914415fb18", + "rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7", "type": "github" }, "original": { @@ -1224,11 +1224,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720515935, - "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", + "lastModified": 1721331912, + "narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", + "rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be", "type": "github" }, "original": { @@ -1271,11 +1271,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1720705017, - "narHash": "sha256-eDbw6fazdrsvoQaiTLRHaJgJm2H/HO9uu31dzOf8C5M=", + "lastModified": 1721393053, + "narHash": "sha256-xNiw9gIxyF6xsyXCiFESPjxMjuVAfmr4sBpM9u2l5io=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bed9309adc836ddea35a5923fdca425d23002abf", + "rev": "a0691657e9634cfc001f02995cca394025e3e940", "type": "github" }, "original": { @@ -1382,11 +1382,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1720282526, - "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", + "lastModified": 1720915306, + "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", + "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", "type": "github" }, "original": { @@ -1398,11 +1398,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { @@ -1414,11 +1414,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1720781449, + "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", "type": "github" }, "original": { @@ -1430,11 +1430,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1720955038, + "narHash": "sha256-GaliJqfFwyYxReFywxAa8orCO+EnDq2NK2F+5aSc8vo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "aa247c0c90ecf4ae7a032c54fdc21b91ca274062", "type": "github" }, "original": { @@ -1542,11 +1542,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { @@ -1581,11 +1581,11 @@ ] }, "locked": { - "lastModified": 1720603727, - "narHash": "sha256-A5qYbCT3rHvVi95u8Zy12cRmW5OPT7yFl1LrTDSejyE=", + "lastModified": 1720992717, + "narHash": "sha256-8j1bZVfKT1vJ0e+U7NYRNBG+DdBj5C/tpwe5krxT4/4=", "owner": "pjones", "repo": "plasma-manager", - "rev": "f0691e1a9fff4684ce399c345c3a941d2ef0fe78", + "rev": "460b48dc3dcd05df568e27cbb90581d23baec8dc", "type": "github" }, "original": { @@ -1693,16 +1693,16 @@ "rocksdb_2": { "flake": false, "locked": { - "lastModified": 1719949653, - "narHash": "sha256-DYx7XHH2GEh17GukKhXs6laM6l+eugCmRkF0adpi9wk=", + "lastModified": 1720900786, + "narHash": "sha256-Vta9Um/RRuWwZ46BjXftV06iWLm/j/9MX39emXUvSAY=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "a935c0273e1ba44eacf88ce3685a9b9831486155", + "rev": "911f4243e69c2e320a7a209bf1f5f3ff5f825495", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.3.1", + "ref": "v9.4.0", "repo": "rocksdb", "type": "github" } @@ -1768,11 +1768,11 @@ "rust-analyzer-src_3": { "flake": false, "locked": { - "lastModified": 1720344064, - "narHash": "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk=", + "lastModified": 1720717809, + "narHash": "sha256-6I+fm+nTLF/iaj7ffiFGlSY7POmubwUaPA/Wq0Bm53M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a5b21ea0aa644dffd7cf958b43f11f221d53404e", + "rev": "ffbc5ad993d5cd2f3b8bcf9a511165470944ab91", "type": "github" }, "original": { @@ -1815,11 +1815,11 @@ ] }, "locked": { - "lastModified": 1720232258, - "narHash": "sha256-eR5glZHS2bLpzUgTDhWGm04j+j5KMYKoDsY5DXAiuKQ=", + "lastModified": 1721010111, + "narHash": "sha256-GuPw2xhJZ+eszIJFu7z7AtqUmirSWPHpxuCpG6dSOic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "05ccbe21233d4e9110fc6428d2c3d74b430c3c69", + "rev": "3ef018b6d0f62eb59580a8e9fe141e37bf1d972d", "type": "github" }, "original": { @@ -1856,11 +1856,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1720479166, - "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", + "lastModified": 1720926522, + "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "67035a355b1d52d2d238501f8cc1a18706979760", + "rev": "0703ba03fd9c1665f8ab68cc3487302475164617", "type": "github" }, "original": { @@ -1988,11 +1988,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1720291207, - "narHash": "sha256-0az2z890pvKAxn2LJaHxWPgpSvbx0DlNbBIZlYyP7Y4=", + "lastModified": 1721054167, + "narHash": "sha256-0ZplHtEXoqytnDExvNoDWoTt1KjcobKVGXv5zmY3jrk=", "owner": "dj95", "repo": "zjstatus", - "rev": "af66be8031cbccf484363fc3efe6c020cd602b1e", + "rev": "924f821cf1a1800baa90a443a7150ca795ad93c7", "type": "github" }, "original": { From 7a95239f84d79df774120d5b876f935376538e3d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 25 Jul 2024 19:41:36 +0200 Subject: [PATCH 1918/2308] update flake lock --- flake.lock | 202 ++++++++++++++++++++++------------------------------- 1 file changed, 82 insertions(+), 120 deletions(-) diff --git a/flake.lock b/flake.lock index c40cdbf..b586175 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721350094, - "narHash": "sha256-JbiL5dMpHEKs044XVJEnT3l+ny369auBjchR8DiESao=", + "lastModified": 1721661754, + "narHash": "sha256-qbDP3rK2yeR83yRzPcJQKCB4/c37iuRFBbp0wOIYCqA=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "60ff4f2f3c3da34746f0993d4e6f1de79979f580", + "rev": "57cd58db1e7945c65ff03035fc54f69b5b3bd565", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1720472194, - "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=", + "lastModified": 1721784420, + "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", "owner": "catppuccin", "repo": "nix", - "rev": "d75d5803852fb0833767dc969a4581ac13204e22", + "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1721267279, - "narHash": "sha256-99utYoUwaX10XMjZiqe1YqhtWg4kUFBXnQikFkWTGtY=", + "lastModified": 1721669480, + "narHash": "sha256-CkGD8ZiiTKf8yBO4ZQcnMyS556GqdZd2R9Vj3ohPQak=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "06531993f69b8cefd5d67d3589791ca9cd6785c2", + "rev": "478804045805230ac0d34e1ea9ad6da4a3580109", "type": "github" }, "original": { @@ -258,11 +258,11 @@ ] }, "locked": { - "lastModified": 1718474113, - "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", + "lastModified": 1721322122, + "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", "owner": "ipetkov", "repo": "crane", - "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", + "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1718474113, - "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", + "lastModified": 1718730147, + "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", "owner": "ipetkov", "repo": "crane", - "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", + "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1721266288, - "narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=", + "lastModified": 1721871128, + "narHash": "sha256-NyWVCnSeePnJHGJxZ0l3zdGQGrVjUcx2IJbV8KIsPf0=", "owner": "nix-community", "repo": "disko", - "rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47", + "rev": "55e874b9c14764cb791e5740f0e92202e41393fc", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1717827974, - "narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=", + "lastModified": 1721456965, + "narHash": "sha256-AJjRiL2diAitpARbE9bUTlgtqHC8QS1ImXNaXMRhKoU=", "owner": "nix-community", "repo": "fenix", - "rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8", + "rev": "d3121c162a1fa4fabcb9af9642d50e8b05ddfe83", "type": "github" }, "original": { @@ -883,24 +883,6 @@ "type": "github" } }, - "flake-utils_8": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -953,11 +935,11 @@ ] }, "locked": { - "lastModified": 1721135958, - "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", + "lastModified": 1721852138, + "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", "owner": "nix-community", "repo": "home-manager", - "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", + "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", "type": "github" }, "original": { @@ -991,17 +973,16 @@ "crane": "crane_6", "flake-compat": "flake-compat_9", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1719818887, - "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=", + "lastModified": 1721581642, + "narHash": "sha256-Bd9ujkwkxwAYCnYKEKeY1fjsvD4vyiFjFS20Lxr/FD4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429", + "rev": "f3b4ade14392861388265e949b7007a8b62e21dc", "type": "github" }, "original": { @@ -1142,11 +1123,11 @@ ] }, "locked": { - "lastModified": 1720926593, - "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", + "lastModified": 1721531260, + "narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", + "rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d", "type": "github" }, "original": { @@ -1188,11 +1169,11 @@ }, "nixlib": { "locked": { - "lastModified": 1719708727, - "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", + "lastModified": 1721523216, + "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", + "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", "type": "github" }, "original": { @@ -1209,11 +1190,11 @@ ] }, "locked": { - "lastModified": 1720859326, - "narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=", + "lastModified": 1721869487, + "narHash": "sha256-zcusn81g+0gO+tSMhfs4W+wAP9As/MWNTBCbS+Ggp7A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7", + "rev": "c12f9a969c8cdf14618774515c7c6c96aef753c7", "type": "github" }, "original": { @@ -1224,11 +1205,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1721331912, - "narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=", + "lastModified": 1721911538, + "narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be", + "rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f", "type": "github" }, "original": { @@ -1271,11 +1252,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1721393053, - "narHash": "sha256-xNiw9gIxyF6xsyXCiFESPjxMjuVAfmr4sBpM9u2l5io=", + "lastModified": 1721929106, + "narHash": "sha256-gYkhL7COqjIxiNzrTB9++C4ATVDxgjPOcr9cHMSnHXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0691657e9634cfc001f02995cca394025e3e940", + "rev": "300a8ae0c5816f16f09c35fd593bf51015498b87", "type": "github" }, "original": { @@ -1366,11 +1347,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1718447546, + "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "842253bf992c3a7157b67600c2857193f126563a", "type": "github" }, "original": { @@ -1382,11 +1363,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1720915306, - "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", + "lastModified": 1721524707, + "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", + "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", "type": "github" }, "original": { @@ -1398,11 +1379,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", + "lastModified": 1721743106, + "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", "type": "github" }, "original": { @@ -1414,11 +1395,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1720781449, - "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", "type": "github" }, "original": { @@ -1526,11 +1507,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1718541509, - "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", + "lastModified": 1719146883, + "narHash": "sha256-DAyIfQgyqalov0DcEKRvDOUin7axELasaP6NCPt7UQA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba06293cdba1c94af9710024abf3b94cf8d76349", + "rev": "084f8df2f3ff80cdec6f515931036f63c5d2f36c", "type": "github" }, "original": { @@ -1542,11 +1523,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", + "lastModified": 1721743106, + "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", "type": "github" }, "original": { @@ -1581,11 +1562,11 @@ ] }, "locked": { - "lastModified": 1720992717, - "narHash": "sha256-8j1bZVfKT1vJ0e+U7NYRNBG+DdBj5C/tpwe5krxT4/4=", + "lastModified": 1721724566, + "narHash": "sha256-6H+OTxXkOrh3P+15bhkQJY7OaBrQVzx4Pz+pCn6rtIg=", "owner": "pjones", "repo": "plasma-manager", - "rev": "460b48dc3dcd05df568e27cbb90581d23baec8dc", + "rev": "b967e042896de0f64513d4596e3d1f3eae445d1c", "type": "github" }, "original": { @@ -1660,11 +1641,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -1734,11 +1715,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1717583671, - "narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=", + "lastModified": 1721414716, + "narHash": "sha256-23zmEelXzAvnfMlLsJ6a6P7yNiI9WOUrS9xh9dXVc/U=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "48bbdd6a74f3176987d5c809894ac33957000d19", + "rev": "b333f85a9dc06a45d9eb126c6371414c49b46784", "type": "github" }, "original": { @@ -1784,21 +1765,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1718504420, - "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=", + "lastModified": 1719109180, + "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9", + "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", "type": "github" }, "original": { @@ -1836,11 +1813,11 @@ "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1718697807, - "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=", + "lastModified": 1721121314, + "narHash": "sha256-zwc7YXga/1ppaZMWFreZykXtFwBgXodxUZiUx969r+g=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b", + "rev": "059b50b2e729729ea00c6831124d3837c494f3d5", "type": "gitlab" }, "original": { @@ -1856,11 +1833,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1720926522, - "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", + "lastModified": 1721688883, + "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0703ba03fd9c1665f8ab68cc3487302475164617", + "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", "type": "github" }, "original": { @@ -1944,21 +1921,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1967,11 +1929,11 @@ ] }, "locked": { - "lastModified": 1718522839, - "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", + "lastModified": 1721458737, + "narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", + "rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97", "type": "github" }, "original": { @@ -1983,7 +1945,7 @@ "zjstatus": { "inputs": { "crane": "crane_7", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_2" }, From 6374b80760832815aa666490a1de3d3d40c13b1a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Aug 2024 11:01:19 +0200 Subject: [PATCH 1919/2308] Add some fonts --- nixos/shared/packages/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index c6817e3..5bc6381 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -63,6 +63,8 @@ paratype-pt-serif roboto twemoji-color-font + fontawesome + atkinson-hyperlegible ]; enableDefaultPackages = false; }; From f2d7ccee9bea356c8c351cdd9925753178f18d4a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Aug 2024 11:03:38 +0200 Subject: [PATCH 1920/2308] Misspelling fixed for font-awesome --- nixos/shared/packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 5bc6381..29be270 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -63,7 +63,7 @@ paratype-pt-serif roboto twemoji-color-font - fontawesome + font-awesome atkinson-hyperlegible ]; enableDefaultPackages = false; From 552c63a073592d5340e7bc64007d190be1f7b92f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 9 Aug 2024 13:07:33 +0200 Subject: [PATCH 1921/2308] update flake lock --- flake.lock | 206 ++++++++++++++++++++++++++--------------------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/flake.lock b/flake.lock index b586175..5304d5a 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721661754, - "narHash": "sha256-qbDP3rK2yeR83yRzPcJQKCB4/c37iuRFBbp0wOIYCqA=", + "lastModified": 1723190888, + "narHash": "sha256-Ly7nXtwKdg0IU6LS0ZGsTKkv21DVzlTYQdJgounfzIA=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "57cd58db1e7945c65ff03035fc54f69b5b3bd565", + "rev": "495a54c03b00ccc913ec8b4f3f5eb837c841d519", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1721784420, - "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "lastModified": 1722997334, + "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", "owner": "catppuccin", "repo": "nix", - "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "complement_2": { "flake": false, "locked": { - "lastModified": 1720637557, - "narHash": "sha256-oZz6nCmFmdJZpC+K1iOG2KkzTI6rlAmndxANPDVU7X0=", + "lastModified": 1722323564, + "narHash": "sha256-6w6/N8walz4Ayc9zu7iySqJRmGFukhkaICLn4dweAcA=", "owner": "matrix-org", "repo": "complement", - "rev": "0d14432e010482ea9e13a6f7c47c1533c0c9d62f", + "rev": "6e4426a9e63233f9821a4d2382bfed145244183f", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1721669480, - "narHash": "sha256-CkGD8ZiiTKf8yBO4ZQcnMyS556GqdZd2R9Vj3ohPQak=", + "lastModified": 1723151906, + "narHash": "sha256-EFUG2y6IkCCKR5BxFRoHyiBZ1eDkl2RQXfR6Cc0gTNw=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "478804045805230ac0d34e1ea9ad6da4a3580109", + "rev": "6662aa21ef4ab8e444fd3c62470fc090f23679fb", "type": "github" }, "original": { @@ -258,11 +258,11 @@ ] }, "locked": { - "lastModified": 1721322122, - "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", + "lastModified": 1721842668, + "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", "owner": "ipetkov", "repo": "crane", - "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", + "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1718730147, - "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", + "lastModified": 1721842668, + "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", "owner": "ipetkov", "repo": "crane", - "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", + "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1720975002, - "narHash": "sha256-1i521ecK2MFg+lxSk9oRx/C0SsdlI6GS6eYT79nA6TA=", + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", "owner": "ipetkov", "repo": "crane", - "rev": "1791a5b98d2c1bf143ad85469abcfa2426f3f087", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1721871128, - "narHash": "sha256-NyWVCnSeePnJHGJxZ0l3zdGQGrVjUcx2IJbV8KIsPf0=", + "lastModified": 1723080788, + "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", "owner": "nix-community", "repo": "disko", - "rev": "55e874b9c14764cb791e5740f0e92202e41393fc", + "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1721456965, - "narHash": "sha256-AJjRiL2diAitpARbE9bUTlgtqHC8QS1ImXNaXMRhKoU=", + "lastModified": 1722320953, + "narHash": "sha256-DfGaJtgrzcwPQYLTvjL1KaVIjpvi85b2MpM6yEGvJzM=", "owner": "nix-community", "repo": "fenix", - "rev": "d3121c162a1fa4fabcb9af9642d50e8b05ddfe83", + "rev": "483df76def3e5010d709aa3a0418ba2088503994", "type": "github" }, "original": { @@ -727,11 +727,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -748,11 +748,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -935,11 +935,11 @@ ] }, "locked": { - "lastModified": 1721852138, - "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", + "lastModified": 1723015306, + "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "owner": "nix-community", "repo": "home-manager", - "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", + "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "type": "github" }, "original": { @@ -955,11 +955,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1721226562, - "narHash": "sha256-KfdwusX12hhkzXKBmu2HhaU9EhaxVeWLDQw1Ll2A03o=", + "lastModified": 1723016361, + "narHash": "sha256-iEVCAOn7WUdJGrK2EW5hkfl4gBmYl5gVck+MSn6ba44=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "927eea31915468e06b94bedf678261dc7cf048c8", + "rev": "fc3d12deef508a73c7beef4cd9bebe03acde4ed7", "type": "github" }, "original": { @@ -978,11 +978,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1721581642, - "narHash": "sha256-Bd9ujkwkxwAYCnYKEKeY1fjsvD4vyiFjFS20Lxr/FD4=", + "lastModified": 1722329086, + "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f3b4ade14392861388265e949b7007a8b62e21dc", + "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a", "type": "github" }, "original": { @@ -1123,11 +1123,11 @@ ] }, "locked": { - "lastModified": 1721531260, - "narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=", + "lastModified": 1722740924, + "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d", + "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ }, "nixlib": { "locked": { - "lastModified": 1721523216, - "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", + "lastModified": 1722732880, + "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", + "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", "type": "github" }, "original": { @@ -1190,11 +1190,11 @@ ] }, "locked": { - "lastModified": 1721869487, - "narHash": "sha256-zcusn81g+0gO+tSMhfs4W+wAP9As/MWNTBCbS+Ggp7A=", + "lastModified": 1723078345, + "narHash": "sha256-HSxOQEKNZXiJe9aWnckTTCThOhcRCabwHa32IduDKLk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "c12f9a969c8cdf14618774515c7c6c96aef753c7", + "rev": "d6c5d29f58acc10ea82afff1de2b28f038f572bd", "type": "github" }, "original": { @@ -1205,11 +1205,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1721911538, - "narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=", + "lastModified": 1723149858, + "narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f", + "rev": "107bb46eef1f05e86fc485ee8af9b637e5157988", "type": "github" }, "original": { @@ -1252,11 +1252,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1721929106, - "narHash": "sha256-gYkhL7COqjIxiNzrTB9++C4ATVDxgjPOcr9cHMSnHXk=", + "lastModified": 1723199741, + "narHash": "sha256-on+MQChgPNpKkVZ+pRkg059AnxmgcaTXxJyrbfuiGx0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "300a8ae0c5816f16f09c35fd593bf51015498b87", + "rev": "15fc4bb22f8b0faa99db98fd88f22eb2e0bf5eef", "type": "github" }, "original": { @@ -1347,16 +1347,16 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1718447546, - "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842253bf992c3a7157b67600c2857193f126563a", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1379,11 +1379,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721743106, - "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1411,11 +1411,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1720955038, - "narHash": "sha256-GaliJqfFwyYxReFywxAa8orCO+EnDq2NK2F+5aSc8vo=", + "lastModified": 1722957468, + "narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa247c0c90ecf4ae7a032c54fdc21b91ca274062", + "rev": "2a13929e1f191b3690dd2f2db13098b04adb9043", "type": "github" }, "original": { @@ -1491,11 +1491,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { @@ -1507,11 +1507,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1719146883, - "narHash": "sha256-DAyIfQgyqalov0DcEKRvDOUin7axELasaP6NCPt7UQA=", + "lastModified": 1722264024, + "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "084f8df2f3ff80cdec6f515931036f63c5d2f36c", + "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", "type": "github" }, "original": { @@ -1523,11 +1523,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1721743106, - "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1562,11 +1562,11 @@ ] }, "locked": { - "lastModified": 1721724566, - "narHash": "sha256-6H+OTxXkOrh3P+15bhkQJY7OaBrQVzx4Pz+pCn6rtIg=", + "lastModified": 1723141065, + "narHash": "sha256-6HD3Cx4KofX3jyWpZK1Nt1RmnPs2tD4HQLm3Ytk+htk=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b967e042896de0f64513d4596e3d1f3eae445d1c", + "rev": "5ab818b79ba5c6651209cc1c1d19afe6c9046ed4", "type": "github" }, "original": { @@ -1641,11 +1641,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1718879355, - "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -1715,11 +1715,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1721414716, - "narHash": "sha256-23zmEelXzAvnfMlLsJ6a6P7yNiI9WOUrS9xh9dXVc/U=", + "lastModified": 1722262053, + "narHash": "sha256-KxjkPVn9rQqYam6DhiN/V2NcMXtYW25maxkJoiVMpmE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "b333f85a9dc06a45d9eb126c6371414c49b46784", + "rev": "a021b85be57d34b1eed687fcafd5d5ec64b2d853", "type": "github" }, "original": { @@ -1771,11 +1771,11 @@ ] }, "locked": { - "lastModified": 1719109180, - "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", + "lastModified": 1722219664, + "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", + "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", "type": "github" }, "original": { @@ -1792,11 +1792,11 @@ ] }, "locked": { - "lastModified": 1721010111, - "narHash": "sha256-GuPw2xhJZ+eszIJFu7z7AtqUmirSWPHpxuCpG6dSOic=", + "lastModified": 1722997267, + "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3ef018b6d0f62eb59580a8e9fe141e37bf1d972d", + "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", "type": "github" }, "original": { @@ -1813,11 +1813,11 @@ "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1721121314, - "narHash": "sha256-zwc7YXga/1ppaZMWFreZykXtFwBgXodxUZiUx969r+g=", + "lastModified": 1722877200, + "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "059b50b2e729729ea00c6831124d3837c494f3d5", + "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", "type": "gitlab" }, "original": { @@ -1833,11 +1833,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1721688883, - "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", + "lastModified": 1722897572, + "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", + "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", "type": "github" }, "original": { @@ -1929,11 +1929,11 @@ ] }, "locked": { - "lastModified": 1721458737, - "narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=", + "lastModified": 1722330636, + "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97", + "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", "type": "github" }, "original": { @@ -1950,11 +1950,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1721054167, - "narHash": "sha256-0ZplHtEXoqytnDExvNoDWoTt1KjcobKVGXv5zmY3jrk=", + "lastModified": 1723031177, + "narHash": "sha256-bjiFmTOpd42a15NTtn8taQxUzCD+7+XbR+HklijsVO4=", "owner": "dj95", "repo": "zjstatus", - "rev": "924f821cf1a1800baa90a443a7150ca795ad93c7", + "rev": "e1e3b566268fbf6c80d6544f38b06368d23b4b46", "type": "github" }, "original": { From 148ac15889d694f7bdbb88c350350137be34c1d9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 11 Aug 2024 16:03:59 +0200 Subject: [PATCH 1922/2308] Should probably also install install-nix-no-inhibit to everything huh --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 29be270..8ca7a33 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -22,6 +22,7 @@ rebuild rebuild-no-inhibit install-nix + install-nix-no-inhibit update upgrade simple-completion-language-server From 71eab709e772956f58b3f12d7af4374e20f80d35 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:23:55 +0200 Subject: [PATCH 1923/2308] Let's see if we can run writefreely like this :) --- nixos/hosts/queen/secrets/sops.yaml | 7 ++--- .../package-configs/writefreely/default.nix | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 nixos/server/package-configs/writefreely/default.nix diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index d8c5ab7..68d0e73 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -11,6 +11,7 @@ lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW coturn-auth-secret: ENC[AES256_GCM,data:RYxyATuYIcrGd8h8Gc4CP9ZQ80ekuuwHehnOPYisHejmycgT8a2mWpk+5r3HkFmBNcLDeNlfnhIif5oLHGuHyw==,iv:M2GdNDxP4xpP35FJPTgljbcKpOm6DmEEnIYRItAxDVI=,tag:IiiNXeTi6Yja5PrnKRkhdA==,type:str] grafana-telegraf-key: ENC[AES256_GCM,data:agpUzG1/n2NAKDt45IgelmDf0CUlC82fmD4f7JdcszNuUg7uCNA7XeaJ6PZtHQ==,iv:keo3i+qSbtXkA5fyCr2S5z9nJS9bXUn5WDiPgWocPU8=,tag:p/nDff10PRhi9pOszp1PnA==,type:str] sync-secrets: ENC[AES256_GCM,data:AwCgqfSXmYVGnCV5PJ5Ql44IiutTS76F1H7Ow7gB4mQQ8PtiAsmArzpAXd7LzsXedm55X04U+GvkcbM9cwPcF+psyb3Zi8EnI/mjnI9MgFyySSEcosJZVAtCpXGIMyYgRXtF5OBh5CzupAG059d1TDAqrSpLXMuSDdypTaOMHxnlq5q1swfpzhhY3PVgUKVFXdjZLX8aF3JTE9ceVxFsB+traLzOQsl+QKty0x0mpuqR97zkMCchX7bTwgUgbl7phzTvmwV8Qw==,iv:gkZs5NB9+CLfz4kfV4ha2llZQPP81uuXRKqUlASgpiA=,tag:DXkiG0ZFHLHlVhwLwtv/XQ==,type:str] +writefreely: ENC[AES256_GCM,data:QOj5h/rHCxmgpPNhu3IS4eyruhQokHTJxW6yQM9YDgQ=,iv:qAd+/rAAanzL9FTIX22M+2kwI0WI2d3i86cJrn8MFBo=,tag:3zvpqnovDEoJdvK/qcFDuQ==,type:str] sops: kms: [] gcp_kms: [] @@ -26,8 +27,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-04T16:38:10Z" - mac: ENC[AES256_GCM,data:KqkNjZe/rMhiWNS3SeYHm+b23u1LD1jq3f0+jB/BVmy6pDQDTNgA/wWHF/HcorU2Z7TOdjofJPuvRuF6C8ec4RCtTxX2ubIYWV4H3BynYxrEuEsIN8EnPJDcFFc92n9PKzoWnHo2NK1a4ZX+DxYVjDDdjhOMWj/kqWRWZRU+qEw=,iv:rarq3mCSfDFzbIdSIe+3mTNTnoZwFZ2uPkYMGt/xqos=,tag:rCD6SUpwOktRo7fM3Irv7g==,type:str] + lastmodified: "2024-08-16T13:19:27Z" + mac: ENC[AES256_GCM,data:C/wU6gDxhgkmzFEOw+NJNRNyDctnCgt8/FsJUhysJ18f344GlCZcLNTOKT04bklfP1y/LGWeALZPWB5crump3k2YuK6kwQsoOkder9BO2GY/bPaLty03KY5xALYFP7vQwfLx7Z/pO76jHVRT19Eh0/tXqb0BHs8qXtvot81g5HU=,iv:GbEt2IFMc/QaUCOcrVhjYVbLUh4monovspYl9DxTA/w=,tag:5dt+5yK/kNOhkn56ufYDxg==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.8.1 + version: 3.9.0 diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix new file mode 100644 index 0000000..e196004 --- /dev/null +++ b/nixos/server/package-configs/writefreely/default.nix @@ -0,0 +1,26 @@ +{ + config, + pkgs, + ... +}: { + sops.secrets."writefreely".mode = "0440"; + sops.secrets."writefreely".owner = config.users.users.writefreely.name; + services.writefreely = { + enable = true; + host = "writefreely.gladtherescake.eu"; + nginx.enable = true; + nginx.forceSSL = true; + acme.enable = true; + database = { + type = "mysql"; + createLocally = true; + }; + admin = { + initialPasswordFile = config.sops.secrets."writefreely".path; + name = "GLaDTheresCake"; + }; + settings = { + server.port = "15763"; + }; + }; +} From e5e108e98315d95da80def91ac277dd593e482c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:30:58 +0200 Subject: [PATCH 1924/2308] For some reason gladtherescake.eu is being weird, let's try this domain --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index e196004..5e85aec 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -7,7 +7,7 @@ sops.secrets."writefreely".owner = config.users.users.writefreely.name; services.writefreely = { enable = true; - host = "writefreely.gladtherescake.eu"; + host = "writefreely.lillianviolet.dev"; nginx.enable = true; nginx.forceSSL = true; acme.enable = true; From aab4b5c8e30eff4e25314006b36d7a7f440d09c4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:32:50 +0200 Subject: [PATCH 1925/2308] Wait I might want to actually add writefreely to packages loaded haha --- nixos/server/package-configs/default.nix | 1 + nixos/server/package-configs/writefreely/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 3d72d65..7314158 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -19,5 +19,6 @@ ./dashboard ./cinny ./firefox-sync + ./writefreely ]; } diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 5e85aec..e196004 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -7,7 +7,7 @@ sops.secrets."writefreely".owner = config.users.users.writefreely.name; services.writefreely = { enable = true; - host = "writefreely.lillianviolet.dev"; + host = "writefreely.gladtherescake.eu"; nginx.enable = true; nginx.forceSSL = true; acme.enable = true; From 648af577625a0142ec98e5eaf44bfb070c1aceba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:35:18 +0200 Subject: [PATCH 1926/2308] Let's set a db password too --- nixos/hosts/queen/secrets/sops.yaml | 5 +++-- nixos/server/package-configs/writefreely/default.nix | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index 68d0e73..2213774 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -12,6 +12,7 @@ coturn-auth-secret: ENC[AES256_GCM,data:RYxyATuYIcrGd8h8Gc4CP9ZQ80ekuuwHehnOPYis grafana-telegraf-key: ENC[AES256_GCM,data:agpUzG1/n2NAKDt45IgelmDf0CUlC82fmD4f7JdcszNuUg7uCNA7XeaJ6PZtHQ==,iv:keo3i+qSbtXkA5fyCr2S5z9nJS9bXUn5WDiPgWocPU8=,tag:p/nDff10PRhi9pOszp1PnA==,type:str] sync-secrets: ENC[AES256_GCM,data:AwCgqfSXmYVGnCV5PJ5Ql44IiutTS76F1H7Ow7gB4mQQ8PtiAsmArzpAXd7LzsXedm55X04U+GvkcbM9cwPcF+psyb3Zi8EnI/mjnI9MgFyySSEcosJZVAtCpXGIMyYgRXtF5OBh5CzupAG059d1TDAqrSpLXMuSDdypTaOMHxnlq5q1swfpzhhY3PVgUKVFXdjZLX8aF3JTE9ceVxFsB+traLzOQsl+QKty0x0mpuqR97zkMCchX7bTwgUgbl7phzTvmwV8Qw==,iv:gkZs5NB9+CLfz4kfV4ha2llZQPP81uuXRKqUlASgpiA=,tag:DXkiG0ZFHLHlVhwLwtv/XQ==,type:str] writefreely: ENC[AES256_GCM,data:QOj5h/rHCxmgpPNhu3IS4eyruhQokHTJxW6yQM9YDgQ=,iv:qAd+/rAAanzL9FTIX22M+2kwI0WI2d3i86cJrn8MFBo=,tag:3zvpqnovDEoJdvK/qcFDuQ==,type:str] +writefreelymysql: ENC[AES256_GCM,data:1JZwIX04O3DBAo7JvEkeNrFcSdcmk/u4WUf/kkbr2JA=,iv:8H8MR8w1iLfl2r62EbxPnLzs4qWFmwB5gNKEaly8q6c=,tag:K01oKMXkeMOFs3u7frMs0Q==,type:str] sops: kms: [] gcp_kms: [] @@ -27,8 +28,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-08-16T13:19:27Z" - mac: ENC[AES256_GCM,data:C/wU6gDxhgkmzFEOw+NJNRNyDctnCgt8/FsJUhysJ18f344GlCZcLNTOKT04bklfP1y/LGWeALZPWB5crump3k2YuK6kwQsoOkder9BO2GY/bPaLty03KY5xALYFP7vQwfLx7Z/pO76jHVRT19Eh0/tXqb0BHs8qXtvot81g5HU=,iv:GbEt2IFMc/QaUCOcrVhjYVbLUh4monovspYl9DxTA/w=,tag:5dt+5yK/kNOhkn56ufYDxg==,type:str] + lastmodified: "2024-08-16T13:34:43Z" + mac: ENC[AES256_GCM,data:IdQmx7/Y2fdQ9gBgKYCUZQuAVRqbP5KWG4EplO6pYqA8b5xzGnmCSCwyYIXU+3NExEZCEKEfX68mdYlWPRTKUdamOBdN+fQrGXwr5lw5dpKe03ccGw7Hayi0B4O8WbLEjw1RU50v2eoK9MpD5FPrUu1AzGz3+txxzV3hoxg6Sp0=,iv:WXvxAvg+sAKYbzjaz1QKDgVrnMraO3EtIgC12zb9Xi0=,tag:FmH84rGBotouvjCOq+xL8w==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.0 diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index e196004..8021324 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -5,6 +5,8 @@ }: { sops.secrets."writefreely".mode = "0440"; sops.secrets."writefreely".owner = config.users.users.writefreely.name; + sops.secrets."writefreelymysql".mode = "0440"; + sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; services.writefreely = { enable = true; host = "writefreely.gladtherescake.eu"; @@ -14,6 +16,7 @@ database = { type = "mysql"; createLocally = true; + passwordFile = config.sops.secrets."writefreelymysql".path; }; admin = { initialPasswordFile = config.sops.secrets."writefreely".path; From 9cfb2ad379951b60ca3bdf27e0904fedd8ee139f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:36:11 +0200 Subject: [PATCH 1927/2308] That port is wrong --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 8021324..9056a76 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -23,7 +23,7 @@ name = "GLaDTheresCake"; }; settings = { - server.port = "15763"; + server.port = "1576"; }; }; } From d54ba8432a22d138091478fb04256cb8ad0d570d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:37:13 +0200 Subject: [PATCH 1928/2308] Oh it needs to be a number not a string I think --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 9056a76..47cea68 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -23,7 +23,7 @@ name = "GLaDTheresCake"; }; settings = { - server.port = "1576"; + server.port = 15763; }; }; } From 5854b7cb85fb71bb07b1426727f6f43c72c83ae2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:58:26 +0200 Subject: [PATCH 1929/2308] mysql doesn't want to cooperate, let's try sqlite for now --- nixos/server/package-configs/writefreely/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 47cea68..f04248e 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -14,9 +14,9 @@ nginx.forceSSL = true; acme.enable = true; database = { - type = "mysql"; - createLocally = true; - passwordFile = config.sops.secrets."writefreelymysql".path; + # type = "mysql"; + # createLocally = true; + # passwordFile = config.sops.secrets."writefreelymysql".path; }; admin = { initialPasswordFile = config.sops.secrets."writefreely".path; From bb5a1a1d8f1bd16f39bb1d54a6ba1f98cb19bffc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 19:55:34 +0200 Subject: [PATCH 1930/2308] Enable federation stuff on writefreely --- nixos/server/package-configs/writefreely/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index f04248e..f8c26f4 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -23,6 +23,10 @@ name = "GLaDTheresCake"; }; settings = { + min_username_len = 2; + max_blogs = 100; + default_visibility = "public"; + federation = true; server.port = 15763; }; }; From d947010d5d375ab510041ed5f611a7be21035b45 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 19:58:44 +0200 Subject: [PATCH 1931/2308] Ini type not valid? --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index f8c26f4..724dcc9 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -25,7 +25,7 @@ settings = { min_username_len = 2; max_blogs = 100; - default_visibility = "public"; + "default_visibility" = "public"; federation = true; server.port = 15763; }; From e4947f89aee34923d636aa86ffe02f11e85bb78b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 20:01:55 +0200 Subject: [PATCH 1932/2308] This is the correct hierarchy for the ini --- nixos/server/package-configs/writefreely/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 724dcc9..05173b1 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -23,10 +23,12 @@ name = "GLaDTheresCake"; }; settings = { - min_username_len = 2; - max_blogs = 100; - "default_visibility" = "public"; - federation = true; + app = { + min_username_len = 2; + max_blogs = 100; + default_visibility = "public"; + federation = true; + }; server.port = 15763; }; }; From a939521573c2e3571410ec981eb41bc1fe0b895b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 13:17:58 +0200 Subject: [PATCH 1933/2308] Enable local timeline on writefreely --- nixos/server/package-configs/writefreely/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 05173b1..402eec9 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -28,6 +28,7 @@ max_blogs = 100; default_visibility = "public"; federation = true; + local_timeline = true; }; server.port = 15763; }; From 77cd704f97494f36f9c727d823e22f2e04d0b653 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 13:31:57 +0200 Subject: [PATCH 1934/2308] update flake lock --- flake.lock | 114 ++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 5304d5a..92fd07b 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723190888, - "narHash": "sha256-Ly7nXtwKdg0IU6LS0ZGsTKkv21DVzlTYQdJgounfzIA=", + "lastModified": 1723325427, + "narHash": "sha256-aOZcDWVv2b0MjkzZIHdEM1NIoO/0U1XtuVD4jGnMxLk=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "495a54c03b00ccc913ec8b4f3f5eb837c841d519", + "rev": "8b93af8747bd9de6bce60d1da2d6c8f2728f9ce3", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1722997334, - "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", + "lastModified": 1723691425, + "narHash": "sha256-F25VvHFMaqr26b7goaVWspXaK6XTRFz8RnILV+9OPkk=", "owner": "catppuccin", "repo": "nix", - "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", + "rev": "552056779a136092eb6358c573d925630172fc30", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1723151906, - "narHash": "sha256-EFUG2y6IkCCKR5BxFRoHyiBZ1eDkl2RQXfR6Cc0gTNw=", + "lastModified": 1723861150, + "narHash": "sha256-Px5wNTHVgTAYKCoyaBn8HCuzjBhz/xBXZwMJLLcIxqs=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "6662aa21ef4ab8e444fd3c62470fc090f23679fb", + "rev": "28cd784972f9e6e78a77ee54ca07d998ca15a788", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1723080788, - "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", + "lastModified": 1723685519, + "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=", "owner": "nix-community", "repo": "disko", - "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", + "rev": "276a0d055a720691912c6a34abb724e395c8e38a", "type": "github" }, "original": { @@ -935,11 +935,11 @@ ] }, "locked": { - "lastModified": 1723015306, - "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -955,11 +955,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1723016361, - "narHash": "sha256-iEVCAOn7WUdJGrK2EW5hkfl4gBmYl5gVck+MSn6ba44=", + "lastModified": 1723743257, + "narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fc3d12deef508a73c7beef4cd9bebe03acde4ed7", + "rev": "e4e0ca14918919300e04e80c34036028b4370640", "type": "github" }, "original": { @@ -1123,11 +1123,11 @@ ] }, "locked": { - "lastModified": 1722740924, - "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", + "lastModified": 1723352546, + "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", + "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ }, "nixlib": { "locked": { - "lastModified": 1722732880, - "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", + "lastModified": 1723337705, + "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", + "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a", "type": "github" }, "original": { @@ -1190,11 +1190,11 @@ ] }, "locked": { - "lastModified": 1723078345, - "narHash": "sha256-HSxOQEKNZXiJe9aWnckTTCThOhcRCabwHa32IduDKLk=", + "lastModified": 1723870831, + "narHash": "sha256-rXQKvogLHY3BxRVVt5unpbi0zpRf965f57gplWSzQ5k=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d6c5d29f58acc10ea82afff1de2b28f038f572bd", + "rev": "32e9d82bada67fc5155e8d4d99b6fc3a1765bfdc", "type": "github" }, "original": { @@ -1205,11 +1205,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723149858, - "narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=", + "lastModified": 1723310128, + "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "107bb46eef1f05e86fc485ee8af9b637e5157988", + "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "type": "github" }, "original": { @@ -1252,11 +1252,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1723199741, - "narHash": "sha256-on+MQChgPNpKkVZ+pRkg059AnxmgcaTXxJyrbfuiGx0=", + "lastModified": 1723893954, + "narHash": "sha256-InDwKFEbiv9cYr+gXdQU2x6TUOkpHcKUIfOTYUu+THc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "15fc4bb22f8b0faa99db98fd88f22eb2e0bf5eef", + "rev": "9b503a951d1536dd5467fe8f1956f9312327cc89", "type": "github" }, "original": { @@ -1379,11 +1379,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -1411,11 +1411,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1722957468, - "narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=", + "lastModified": 1723703277, + "narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a13929e1f191b3690dd2f2db13098b04adb9043", + "rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d", "type": "github" }, "original": { @@ -1491,11 +1491,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1523,11 +1523,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -1562,11 +1562,11 @@ ] }, "locked": { - "lastModified": 1723141065, - "narHash": "sha256-6HD3Cx4KofX3jyWpZK1Nt1RmnPs2tD4HQLm3Ytk+htk=", + "lastModified": 1723804780, + "narHash": "sha256-uuiu1UAfYr2Lo+5Ul6eA0UIYouoPvH9aIfYbq7wVF6c=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5ab818b79ba5c6651209cc1c1d19afe6c9046ed4", + "rev": "8726ecaa8b8c06910ef31abced57bf08a59730a1", "type": "github" }, "original": { @@ -1792,11 +1792,11 @@ ] }, "locked": { - "lastModified": 1722997267, - "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", + "lastModified": 1723774846, + "narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", + "rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f", "type": "github" }, "original": { @@ -1833,11 +1833,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1722897572, - "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", + "lastModified": 1723501126, + "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", + "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", "type": "github" }, "original": { @@ -1950,11 +1950,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1723031177, - "narHash": "sha256-bjiFmTOpd42a15NTtn8taQxUzCD+7+XbR+HklijsVO4=", + "lastModified": 1723818372, + "narHash": "sha256-dxRAONapqZRIlNfDyh/RVh011pdklBEDr92OsJizkAA=", "owner": "dj95", "repo": "zjstatus", - "rev": "e1e3b566268fbf6c80d6544f38b06368d23b4b46", + "rev": "671e0d12737cd8b269ca4408cfc67295ad3760b7", "type": "github" }, "original": { From 7fe5ec85133ed8b1b37c75683a232936cdbf1fc3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:04:38 +0200 Subject: [PATCH 1935/2308] Simple completion language server won't build so let's just disable it --- nixos/shared/packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 8ca7a33..307e099 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -25,7 +25,7 @@ install-nix-no-inhibit update upgrade - simple-completion-language-server + # simple-completion-language-server # System tools age From 1fcf3ceebeb3b8fd83299c98c54d2c43d459cd82 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:37:57 +0200 Subject: [PATCH 1936/2308] I might need to add the https --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 402eec9..ca41449 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -9,7 +9,7 @@ sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; services.writefreely = { enable = true; - host = "writefreely.gladtherescake.eu"; + host = "https://writefreely.gladtherescake.eu"; nginx.enable = true; nginx.forceSSL = true; acme.enable = true; From bf76c84f13cfbc32394199d75a1538df886464ef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:41:09 +0200 Subject: [PATCH 1937/2308] Never mind that, undo --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index ca41449..402eec9 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -9,7 +9,7 @@ sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; services.writefreely = { enable = true; - host = "https://writefreely.gladtherescake.eu"; + host = "writefreely.gladtherescake.eu"; nginx.enable = true; nginx.forceSSL = true; acme.enable = true; From c19ea7a450d99ecff512f1ce190607c4ca98c747 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:43:28 +0200 Subject: [PATCH 1938/2308] Maybe it won't work on another port? --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 402eec9..cfaf814 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -30,7 +30,7 @@ federation = true; local_timeline = true; }; - server.port = 15763; + server.port = 80; }; }; } From fdc3c697bd4d97746a319cd1171d3574f7dbd2fa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:44:46 +0200 Subject: [PATCH 1939/2308] Nope that's not it --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index cfaf814..911452e 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -30,7 +30,7 @@ federation = true; local_timeline = true; }; - server.port = 80; + server.port = 1212; }; }; } From caa3d25659e0a3b5882b7cc992bfb10c4f6c39ca Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:48:47 +0200 Subject: [PATCH 1940/2308] Disable firefox sync --- nixos/server/package-configs/default.nix | 2 +- nixos/server/package-configs/writefreely/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 7314158..ef92293 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -18,7 +18,7 @@ ./coturn ./dashboard ./cinny - ./firefox-sync + #./firefox-sync ./writefreely ]; } diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 911452e..8f04a8a 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -14,9 +14,9 @@ nginx.forceSSL = true; acme.enable = true; database = { - # type = "mysql"; + type = "mysql"; # createLocally = true; - # passwordFile = config.sops.secrets."writefreelymysql".path; + passwordFile = config.sops.secrets."writefreelymysql".path; }; admin = { initialPasswordFile = config.sops.secrets."writefreely".path; From b17fea860ab7bfba8cb5c168fadc9950374725b1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:49:52 +0200 Subject: [PATCH 1941/2308] Try again to enable mysql --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 8f04a8a..f83c10f 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -15,7 +15,7 @@ acme.enable = true; database = { type = "mysql"; - # createLocally = true; + createLocally = true; passwordFile = config.sops.secrets."writefreelymysql".path; }; admin = { From a331ba6a399ec6b2643c4c8b1b12c4c3e6a8eed6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:51:47 +0200 Subject: [PATCH 1942/2308] Urgh doesn't work still --- nixos/server/package-configs/writefreely/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index f83c10f..8dc9ab7 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -13,11 +13,11 @@ nginx.enable = true; nginx.forceSSL = true; acme.enable = true; - database = { - type = "mysql"; - createLocally = true; - passwordFile = config.sops.secrets."writefreelymysql".path; - }; + # database = { + # type = "mysql"; + # createLocally = true; + # passwordFile = config.sops.secrets."writefreelymysql".path; + # }; admin = { initialPasswordFile = config.sops.secrets."writefreely".path; name = "GLaDTheresCake"; From 6aa4012f878bfd89400941567a113ff430428bfc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 15:00:52 +0200 Subject: [PATCH 1943/2308] Error says I'm missing openssl in my path, maybe this will fix federation? --- nixos/server/package-configs/writefreely/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 8dc9ab7..1c7329d 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -8,6 +8,7 @@ sops.secrets."writefreelymysql".mode = "0440"; sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; services.writefreely = { + path = with pkgs; [openssl]; enable = true; host = "writefreely.gladtherescake.eu"; nginx.enable = true; From 596abd5e90910bfb21492058be3219de44e77b7b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 15:03:52 +0200 Subject: [PATCH 1944/2308] Maybe just installing it is enough? --- nixos/hosts/queen/configuration.nix | 1 + nixos/server/package-configs/writefreely/default.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 3495abc..9c9ba8b 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -73,6 +73,7 @@ nextcloud28 nginx onlyoffice-documentserver + openssl phanpy postgresql_16 python310 diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 1c7329d..8dc9ab7 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -8,7 +8,6 @@ sops.secrets."writefreelymysql".mode = "0440"; sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; services.writefreely = { - path = with pkgs; [openssl]; enable = true; host = "writefreely.gladtherescake.eu"; nginx.enable = true; From 8dab56592764281a64f30565128c24ec8e0165ea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 15:08:57 +0200 Subject: [PATCH 1945/2308] Let me try manually adding it to the systemd service? --- nixos/server/package-configs/writefreely/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 8dc9ab7..0d2b4e4 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -33,4 +33,7 @@ server.port = 1212; }; }; + systemd.services.writefreely = { + path = [openssl]; + }; } From 12dc7835a0139b856fc4d88d6e77a85f3fd632d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 15:09:29 +0200 Subject: [PATCH 1946/2308] Need to add pkgs --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 0d2b4e4..43dc7bc 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -34,6 +34,6 @@ }; }; systemd.services.writefreely = { - path = [openssl]; + path = [pkgs.openssl]; }; } From 0d34709c233daabc96120f46ed3b7ebf653050ba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 19:08:10 +0200 Subject: [PATCH 1947/2308] Add exfat support to maybe make the sd car reader work --- nixos/desktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index d867eab..3b49a33 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -49,6 +49,8 @@ clinfo comma direnv + exfat + exfatprogs git-filter-repo gnupg pciutils From f0a50b9b5324c6f66649b8cdd727da098efab476 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 19:58:16 +0200 Subject: [PATCH 1948/2308] Disable watchmate for now since it's broken --- home-manager/desktop/default.nix | 2 +- home-manager/hosts/shodan/lillian.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 43c1a80..19ff7a4 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -110,7 +110,7 @@ nitrokey-app protonvpn-gui virtualbox - watchmate + #watchmate qbittorrent # Theming: diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index c37facd..f0a5c0d 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -73,7 +73,7 @@ nitrokey-app protonvpn-gui sops - watchmate + #watchmate qbittorrent zsh From 4ae563422d5eb0a1e106fa1e71e3d42545ff3816 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 20:09:13 +0200 Subject: [PATCH 1949/2308] Same deal for rustdesk --- nixos/desktop/default.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 3b49a33..39f1937 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -88,7 +88,7 @@ noisetorch qjackctl wireplumber - rustdesk + #rustdesk ]) ++ (with pkgs-edge; [ # list of latest packages from nixpkgs master diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 9f586a6..f7e0c3e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -59,7 +59,7 @@ noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji - rustdesk + #rustdesk sbctl udisks util-linux From 9295fa0327b25b843e9eb86fd755e78e6105daee Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 08:17:15 +0000 Subject: [PATCH 1950/2308] Change ssh key for EDI The new key signature for EDI for sshing updated --- nixos/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 20a22ec..41cf391 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -66,7 +66,7 @@ shell = pkgs.zsh; hashedPasswordFile = config.sops.secrets."lillian-password".path; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" ]; }; From f9d4122ff2e233421c4886bd135f782a68dda0a3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 08:18:13 +0000 Subject: [PATCH 1951/2308] Remove bcachefs stuff from desktops --- nixos/desktop/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 39f1937..80a26bf 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -17,9 +17,9 @@ nixpkgs = { # You can add overlays here overlays = [ - (final: prev: { - bcachefs-tools = pkgs-edge.bcachefs-tools; - }) + #(final: prev: { + #bcachefs-tools = pkgs-edge.bcachefs-tools; + #}) # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions outputs.overlays.modifications @@ -45,7 +45,7 @@ # System tools aha - bcachefs-tools + #bcachefs-tools clinfo comma direnv @@ -173,8 +173,8 @@ # FIXME: re-enable virtual camera loopback when it build again. boot.bootspec.enable = true; - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - boot.supportedFilesystems = ["bcachefs"]; + #boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + #boot.supportedFilesystems = ["bcachefs"]; boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; boot.kernelModules = [ # Virtual Camera From 1f10354d14f3d3827d9ece8ebcc1bde590d6b930 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 08:18:54 +0000 Subject: [PATCH 1952/2308] Make bcachefs ext4 in EDI --- disko/EDI/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disko/EDI/default.nix b/disko/EDI/default.nix index 1c2ab31..6fe0e0a 100644 --- a/disko/EDI/default.nix +++ b/disko/EDI/default.nix @@ -57,7 +57,7 @@ size = "100%FREE"; content = { type = "filesystem"; - format = "bcachefs"; + format = "ext4"; mountpoint = "/"; mountOptions = [ "defaults" From c33fbecf66584a78bcbf50916a94440380a26097 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 08:20:28 +0000 Subject: [PATCH 1953/2308] Change conduit to conduwuit in the flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 40ddf08..03cf2a4 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,7 @@ jovian, nixos-hardware, nix-index-database, - conduit, + conduwuit, ... } @ inputs: let inherit (self) outputs; From 71c086cd45b24331e0164d6b19e55be9ac7f9188 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 10:51:45 +0200 Subject: [PATCH 1954/2308] Update flake lock & disable cinny for now --- flake.lock | 592 ++++++----------------- nixos/server/package-configs/default.nix | 2 +- 2 files changed, 141 insertions(+), 453 deletions(-) diff --git a/flake.lock b/flake.lock index 92fd07b..5c813e1 100644 --- a/flake.lock +++ b/flake.lock @@ -8,29 +8,6 @@ "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, - "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, - "attic_2": { - "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_2" - }, "locked": { "lastModified": 1720542474, "narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=", @@ -60,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723325427, - "narHash": "sha256-aOZcDWVv2b0MjkzZIHdEM1NIoO/0U1XtuVD4jGnMxLk=", + "lastModified": 1724456070, + "narHash": "sha256-Mbi9N8S3OjS1XywvkraGf+jmOXZrjhTjVoWYxSf+XSY=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "8b93af8747bd9de6bce60d1da2d6c8f2728f9ce3", + "rev": "b422b19f636329e1a082bcacd3ac6b485d7a5b3e", "type": "github" }, "original": { @@ -92,8 +69,8 @@ "cachix": { "inputs": { "devenv": "devenv", - "flake-compat": "flake-compat_6", - "nixpkgs": "nixpkgs_5", + "flake-compat": "flake-compat_4", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -149,11 +126,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1723691425, - "narHash": "sha256-F25VvHFMaqr26b7goaVWspXaK6XTRFz8RnILV+9OPkk=", + "lastModified": 1724469296, + "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", "owner": "catppuccin", "repo": "nix", - "rev": "552056779a136092eb6358c573d925630172fc30", + "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", "type": "github" }, "original": { @@ -163,23 +140,6 @@ } }, "complement": { - "flake": false, - "locked": { - "lastModified": 1715700731, - "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", - "owner": "matrix-org", - "repo": "complement", - "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "complement_2": { "flake": false, "locked": { "lastModified": 1722323564, @@ -196,52 +156,28 @@ "type": "github" } }, - "conduit": { + "conduwuit": { "inputs": { "attic": "attic", + "cachix": "cachix", "complement": "complement", "crane": "crane_3", "fenix": "fenix_2", - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_2", - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1715983991, - "narHash": "sha256-2OL8zPpDHXgOxNqXlWqd1aJ2uZJCAuoqBWaabwWUg2M=", - "path": "/nix/store/2h6yxx9z1if5pqwsr7m6pr07h8i498qz-source", - "rev": "8bffcfe82b3cc50bb095f41afc585fabacb963e3", - "type": "path" - }, - "original": { - "id": "conduit", - "type": "indirect" - } - }, - "conduwuit": { - "inputs": { - "attic": "attic_2", - "cachix": "cachix", - "complement": "complement_2", - "crane": "crane_5", - "fenix": "fenix_3", - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_3", "liburing": "liburing", - "nix-filter": "nix-filter_2", + "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ], - "rocksdb": "rocksdb_2" + "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1723861150, - "narHash": "sha256-Px5wNTHVgTAYKCoyaBn8HCuzjBhz/xBXZwMJLLcIxqs=", + "lastModified": 1724781403, + "narHash": "sha256-MO4WUq7p4SRnGVtxuDH5PLZnPgwl1ZtoXmwt5R/OTwc=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "28cd784972f9e6e78a77ee54ca07d998ca15a788", + "rev": "d26493562528172595ea063c55f76b7eb0d6b7c4", "type": "github" }, "original": { @@ -272,50 +208,6 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "inputs": { - "nixpkgs": [ - "conduit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715274763, - "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", - "owner": "ipetkov", - "repo": "crane", - "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { "inputs": { "nixpkgs": [ "conduwuit", @@ -337,7 +229,7 @@ "type": "github" } }, - "crane_5": { + "crane_3": { "inputs": { "nixpkgs": [ "conduwuit", @@ -359,7 +251,7 @@ "type": "github" } }, - "crane_6": { + "crane_4": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -380,7 +272,7 @@ "type": "github" } }, - "crane_7": { + "crane_5": { "inputs": { "nixpkgs": [ "zjstatus", @@ -388,11 +280,11 @@ ] }, "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "lastModified": 1724537630, + "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", "owner": "ipetkov", "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", "type": "github" }, "original": { @@ -445,7 +337,7 @@ "flake-compat" ], "nix": "nix", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "poetry2nix": "poetry2nix", "pre-commit-hooks": [ "conduwuit", @@ -477,11 +369,11 @@ ] }, "locked": { - "lastModified": 1723685519, - "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=", + "lastModified": 1724895876, + "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=", "owner": "nix-community", "repo": "disko", - "rev": "276a0d055a720691912c6a34abb724e395c8e38a", + "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3", "type": "github" }, "original": { @@ -513,35 +405,12 @@ } }, "fenix_2": { - "inputs": { - "nixpkgs": [ - "conduit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1715322226, - "narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=", - "owner": "nix-community", - "repo": "fenix", - "rev": "297c756ba6249d483c1dafe42378560458842173", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "fenix", - "type": "github" - } - }, - "fenix_3": { "inputs": { "nixpkgs": [ "conduwuit", "nixpkgs" ], - "rust-analyzer-src": "rust-analyzer-src_3" + "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { "lastModified": 1720852044, @@ -574,22 +443,6 @@ "type": "github" } }, - "flake-compat_10": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-compat_2": { "flake": false, "locked": { @@ -609,16 +462,15 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { "owner": "edolstra", - "ref": "master", "repo": "flake-compat", "type": "github" } @@ -626,11 +478,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -642,11 +494,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -667,6 +519,7 @@ }, "original": { "owner": "edolstra", + "ref": "master", "repo": "flake-compat", "type": "github" } @@ -688,23 +541,6 @@ } }, "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "master", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_9": { "flake": false, "locked": { "lastModified": 1696426674, @@ -780,40 +616,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1689068808, "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", @@ -828,9 +630,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -847,9 +649,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -865,9 +667,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -935,11 +737,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -952,14 +754,14 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1723743257, - "narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=", + "lastModified": 1724908834, + "narHash": "sha256-QYtm4H+nzO8lYJYN6TfitmZ5jvb94YqY5MGWvZRCre8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e4e0ca14918919300e04e80c34036028b4370640", + "rev": "0ce5684924f553c65828041a86e7e3e09aeaac29", "type": "github" }, "original": { @@ -970,10 +772,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_6", - "flake-compat": "flake-compat_9", + "crane": "crane_4", + "flake-compat": "flake-compat_7", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -1010,7 +812,7 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_3", "nixpkgs": [ "conduwuit", "cachix", @@ -1052,22 +854,6 @@ "type": "github" } }, - "nix-filter_2": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -1123,11 +909,11 @@ ] }, "locked": { - "lastModified": 1723352546, - "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", + "lastModified": 1724576102, + "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", + "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5", "type": "github" }, "original": { @@ -1169,11 +955,11 @@ }, "nixlib": { "locked": { - "lastModified": 1723337705, - "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=", + "lastModified": 1724547350, + "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a", + "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", "type": "github" }, "original": { @@ -1190,11 +976,11 @@ ] }, "locked": { - "lastModified": 1723870831, - "narHash": "sha256-rXQKvogLHY3BxRVVt5unpbi0zpRf965f57gplWSzQ5k=", + "lastModified": 1724893087, + "narHash": "sha256-M3+Z8SSpzKPQ+/vw9a99G9HfqKWbVGzhFz4p3KAX0NI=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "32e9d82bada67fc5155e8d4d99b6fc3a1765bfdc", + "rev": "0dd0205bc3f6d602ddb62aaece5f62a8715a9e85", "type": "github" }, "original": { @@ -1205,11 +991,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1724878143, + "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "type": "github" }, "original": { @@ -1252,11 +1038,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1723893954, - "narHash": "sha256-InDwKFEbiv9cYr+gXdQU2x6TUOkpHcKUIfOTYUu+THc=", + "lastModified": 1724918179, + "narHash": "sha256-vQ1gVPgJiDHPTjhwCqr9c/Z1YEhRzvhy6NvH2En200c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b503a951d1536dd5467fe8f1956f9312327cc89", + "rev": "9e073dc84d49aca4f845305641c552d9332b212f", "type": "github" }, "original": { @@ -1314,22 +1100,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1718811006, "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", @@ -1345,7 +1115,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -1361,7 +1131,7 @@ "type": "github" } }, - "nixpkgs-stable_5": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1721524707, "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", @@ -1379,11 +1149,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -1393,71 +1163,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1721466660, - "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1723703277, - "narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1692808169, "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", @@ -1473,7 +1179,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1719848872, "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", @@ -1489,13 +1195,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -1505,7 +1211,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1722264024, "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", @@ -1521,13 +1227,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -1537,7 +1243,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1552,6 +1258,38 @@ "type": "indirect" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1724748588, + "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1562,11 +1300,11 @@ ] }, "locked": { - "lastModified": 1723804780, - "narHash": "sha256-uuiu1UAfYr2Lo+5Ul6eA0UIYouoPvH9aIfYbq7wVF6c=", + "lastModified": 1724556439, + "narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", "owner": "pjones", "repo": "plasma-manager", - "rev": "8726ecaa8b8c06910ef31abced57bf08a59730a1", + "rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", "type": "github" }, "original": { @@ -1577,7 +1315,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "conduwuit", @@ -1604,14 +1342,14 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_5", "gitignore": "gitignore", "nixpkgs": [ "conduwuit", "cachix", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1719259945, @@ -1638,7 +1376,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1721042469, @@ -1655,23 +1393,6 @@ } }, "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1714770052, - "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "db6df0b185774778457dabfcbd822cb81760cade", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.1.1", - "repo": "rocksdb", - "type": "github" - } - }, - "rocksdb_2": { "flake": false, "locked": { "lastModified": 1720900786, @@ -1692,18 +1413,17 @@ "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", - "conduit": "conduit", "conduwuit": "conduwuit", "disko": "disko", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_6", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1730,23 +1450,6 @@ } }, "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1715255944, - "narHash": "sha256-vLLgYpdtKBaGYTamNLg1rbRo1bPXp4Jgded/gnprPVw=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "5bf2f85c8054d80424899fa581db1b192230efb5", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_3": { "flake": false, "locked": { "lastModified": 1720717809, @@ -1792,11 +1495,11 @@ ] }, "locked": { - "lastModified": 1723774846, - "narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=", + "lastModified": 1724811750, + "narHash": "sha256-PvhVgQ1rm3gfhK7ts4emprhh/KMkFwXogmgsQ3srR7g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f", + "rev": "6a1c4915dca7149e7258d8c7f3ac634d8c65f6c6", "type": "github" }, "original": { @@ -1808,8 +1511,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_10", - "nixpkgs": "nixpkgs_9", + "flake-compat": "flake-compat_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1829,8 +1532,8 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_10", - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs": "nixpkgs_8", + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1723501126, @@ -1906,21 +1609,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1944,17 +1632,17 @@ }, "zjstatus": { "inputs": { - "crane": "crane_7", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_11", + "crane": "crane_5", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_9", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1723818372, - "narHash": "sha256-dxRAONapqZRIlNfDyh/RVh011pdklBEDr92OsJizkAA=", + "lastModified": 1724858904, + "narHash": "sha256-QGzfl4YHTl/HuYy6oe/OqAX8xViYht1BCCIpWq7uH5U=", "owner": "dj95", "repo": "zjstatus", - "rev": "671e0d12737cd8b269ca4408cfc67295ad3760b7", + "rev": "b2f15019bdfc04f65cac7cd073418ac6ad4dbddc", "type": "github" }, "original": { diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index ef92293..6384555 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -17,7 +17,7 @@ ./roundcube ./coturn ./dashboard - ./cinny + #./cinny #./firefox-sync ./writefreely ]; From 8d291e248885f1390053522dbaa895ec1e54c5fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 11:17:20 +0200 Subject: [PATCH 1955/2308] Disable lanzaboote for now --- nixos/hosts/EDI/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 78ee9f7..d0d1767 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -49,13 +49,13 @@ # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. - boot.loader.systemd-boot.enable = lib.mkForce false; + boot.loader.systemd-boot.enable = true; boot.initrd.systemd.enable = true; - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; + # boot.lanzaboote = { + # enable = true; + # pkiBundle = "/etc/secureboot"; + # }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "24.11"; From d1fc8d1b869a976a110cb91b845438135d0c3d16 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 11:46:26 +0200 Subject: [PATCH 1956/2308] Fix sidebar in firefox --- .../desktop/package-configs/firefox.nix | 398 +++++++++--------- 1 file changed, 199 insertions(+), 199 deletions(-) diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 8145022..0da278d 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -29,342 +29,342 @@ "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "DuckDuckGo"; }; userChrome = '' - /* - Title: Drannex42's FirefoxSidebar / Vertical Tabs - Description: Vertical tab design for Firefox with dynamic indentation:: - Sideberry and TreeStyleTabs (Legacy) themes available! - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: 12022.04.17 - */ - /* - Preferences / Settings :: - Use this file to set your preferences this will save them in one place for easier future updating - ========================================================================= - */ - - /* - Preferences / Settings - Use this file to set your preferences this will save them in one place for easier future updating - ========================================================================= + Title: Drannex42's FirefoxSidebar / Vertical Tabs + Description: Vertical tab design for Firefox with dynamic indentation:: + Sideberry and TreeStyleTabs (Legacy) themes available! + Repository URL: https://github.com/drannex42/FirefoxSidebar + Version: 12022.04.17 */ :root { - --sidebar-width: 50px; - --toolbar-height: -12px; - --menubar-height: -42px; - --sidebar-padding: calc(var(--sidebar-width) + 5px); - --toolbar-start-end-padding: 5px !important; + --sidebar-width: 50px; + --toolbar-height: 10px; + --menubar-height: 100px; + --sidebar-padding: calc(var(--sidebar-width) + 5px); + --toolbar-start-end-padding: 5px !important; - /* Custom Sidebar/Header Backround :: + /* Custom Sidebar/Header Backround :: This sets the background for the other sidebar options (bookmarks, history, in case it is transparent from a theme that is not set up properly - */ + */ /* --custom-sidebar-bg: Field; /* Default: Field (Disabled) */ - --custom-sidebar-header-bg: #000; /* Default: Field (Disabled) */ + /* --custom-sidebar-header-bg: #000; */ - /* ====== Extension Settings ====== */ + /* ====== Extension Settings ====== */ - /* Window Control / Client Side Display Settings === + /* Window Control / Client Side Display Settings === If you are putting this on the left or right side uncomment the side preferences below and comment the other ========================================================================= - */ + */ --csd-width: 100px; --csd-top: 8px; /* - CSD - Left Side === - Default: --csd-left: 50px; --csd-margin-left: 92px; + CSD - Left Side === + Default: --csd-left: 50px; --csd-margin-left: 92px; */ - /* - --csd-left: 50px; - --csd-margin-left: 92px; - */ - /* - CSD - Right Side === - Defaults: --csd-right: 0px; --csd-margin-right: 95px; + --csd-left: 50px; + --csd-margin-left: 92px; */ - --csd-right: 36px; - --csd-margin-right: 130px; + /* + CSD - Right Side === + Defaults: --csd-right: 0px; --csd-margin-right: 95px; + */ - /* === END: Window Control / Client Side Display Settings === */ + --csd-right: 36px; + --csd-margin-right: 130px; - /* === END: Extension Settings === */ + /* === END: Window Control / Client Side Display Settings === */ + + /* === END: Extension Settings === */ } /* ========================================================================= */ - /* Sidebar (Core) :: This file is for the sidebar implementation */ /* - Extension (Core): Sidebar - Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: v12022.11.22 (YYYYY.MM.DD) + Extension (Core): Sidebar + Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. + Repository URL: https://github.com/drannex42/FirefoxSidebar + Version: v12024.05.15 (YYYYY.MM.DD) */ #main-window #TabsToolbar { - visibility: collapse; + visibility: collapse; } + /* As of v12024.05.15 we updated to using this one by MrOtherGuy, with modifications */ + /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_sidebar.css made available under Mozilla Public License v. 2.0 */ + /* Show sidebar only when the cursor is over it */ + /* The border controlling sidebar width will be removed so you'll need to modify these values to change width */ - #sidebar-box > #browser, - #webextpanels-window { - background: transparent !important; - - } - - #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] - #sidebar-header { - /*! display: none; */ - } - - /*Collapse in default state and add transition*/ #sidebar-box { - /*! overflow: visible !important; */ - border-right: none !important; /* border-right: 1px solid var(--sidebar-border-color) !important; */ - z-index: 2; - border-right: none !important; - width: 100% !important; - background: var(--custom-sidebar-bg, --sidebar-background); - - /* lock sidebar to height by doing the inverse margin of the toolbar element */ - z-index: 1000 !important; - position: relative !important; - margin-top: var(--menubar-height) !important; - border-right: none; - transition: none !important; - - /* lock sidebar to specified width */ - min-width: var(--sidebar-width) !important; - max-width: var(--sidebar-width) !important; - overflow: hidden !important; - transition-property: width; - transition-duration: 0.25s; - transition-delay: 0.25s; - transition-timing-function: ease-in; + --uc-sidebar-width: 50px; + --uc-sidebar-hover-width: 260px; + --uc-autohide-sidebar-delay: 10ms; + /* Wait 0.6s before hiding sidebar */ + --uc-autohide-transition-duration: 115ms; + --uc-autohide-transition-type: linear; + position: relative; + min-width: var(--uc-sidebar-width) !important; + width: var(--uc-sidebar-width) !important; + max-width: var(--uc-sidebar-width) !important; + z-index: 1; + margin-top: -40px; } - #sidebar-box::after { - background: var(--sidebar-border-color) !important; - margin-left: 207px; - z-index: 9999999; - position: absolute; - content: " "; - width: 1px; - height: 100%; - top: 0; - right: 0px; + + #sidebar-box[positionend] { + direction: rtl } - #sidebar-box:hover:after { - top: 42px; + #sidebar-box[positionend]>* { + direction: ltr } - /*All other sidebar-boxes should be larger on hover*/ - #sidebar-box:hover, #sidebar-box #sidebar:hover { - min-width: 350px !important; - max-width: 350px !important; - z-index: 999; - margin-right: -300px !important; + #sidebar-box[positionend]:-moz-locale-dir(rtl) { + direction: ltr } - /*Tree Style Tabs && Sideberry specific sidebar width and size*/ + #sidebar-box[positionend]:-moz-locale-dir(rtl)>* { + direction: rtl + } - #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"]:hover, - #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]:hover, - #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] #sidebar:hover { - min-width: 260px !important; - max-width: 260px !important; - margin-right: -210px !important; + #main-window[sizemode="fullscreen"] #sidebar-box { + --uc-sidebar-width: 1px; + } + + #sidebar-splitter { + display: none } #sidebar-header { - border: none !important; - border-right: 1px solid var(--sidebar-border-color); - background: var(--custom-sidebar-header-bg, transparent) !important; + overflow: hidden; + color: var(--chrome-color, inherit) !important; + padding-inline: 0 !important; + background: var(--custom-sidebar-header-bg, inherit) !important; + padding: 8px 12px !important; + padding-top: 9px !important; + border-bottom: none !Important; } - #sidebar-close, - #sidebar-title, - #sidebar-switcher-arrow { - display: none; - border: none; + #sidebar-header::before, + #sidebar-header::after { + content: ""; + display: flex; + padding-left: 0px; } - #sidebar-switcher-target { - border: none !important; - margin-left: 4.5px !important; - padding-top: 4px !important; - padding-bottom: 6px !important; + #sidebar-header, + #sidebar { + transition: min-width var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important; + min-width: var(--uc-sidebar-width) !important; + will-change: min-width; } - #sidebar-switcher-target:focus-visible:not(:hover, [open]), - #sidebar-close:focus-visible:not(:hover, [open]) { - outline: none !important; + #sidebar-box:hover>#sidebar-header, + #sidebar-box:hover>#sidebar { + min-width: var(--uc-sidebar-hover-width) !important; + width: var(--uc-sidebar-hover-width) !important; + transition-delay: 0ms !important; + } + + #sidebar-box>#sidebar-header #sidebar-title { + opacity: 0; + } + + #sidebar-box:hover>#sidebar-header #sidebar-title { + opacity: 1; + } + + .sidebar-panel { + background-color: transparent !important; + color: var(--newtab-text-primary-color) !important; + } + + .sidebar-panel #search-box { + -moz-appearance: none !important; + background-color: rgba(249, 249, 250, 0.1) !important; + color: inherit !important; + } + + /* Add sidebar divider and give it background */ + + #sidebar, + #sidebar-header { + background-color: inherit !important; + border-right: 1px solid var(--sidebar-border-color); + border-inline-width: 0px 1px; + } + + #sidebar-box:not([positionend])> :-moz-locale-dir(rtl), + #sidebar-box[positionend]>* { + border-inline-width: 1px 0px; } + /* Move statuspanel to the other side when sidebar is hovered so it doesn't get covered by sidebar */ - .sidebar-splitter { - opacity: 0 !important; - width: 0px !important; - border: none !important; - --avatar-image-url: none !important; + #sidebar-box:not([positionend]):hover~#appcontent #statuspanel { + inset-inline: auto 0px !important; } - #sidebarMenu-popup .subviewbutton { - min-width: 0px; - padding: 0; - margin: 0 !important; + #sidebar-box:not([positionend]):hover~#appcontent #statuspanel-label { + margin-inline: 0px !important; + border-left-style: solid !important; } - toolbarseparator { - display: none; - } - - #nav-bar-customization-target { - z-index: 99999; - position: relative; - } .browser-toolbar { - padding-left: var(--sidebar-width) !important; - position: relative !important; + padding-left: var(--sidebar-width) !important; + position: relative !important; } #PersonalToolbar { - padding: 2px 5px !important; - padding-top: 0px !important; - margin-top: 0px !important; - padding-left: calc(var(--sidebar-width) + 6px) !important; + padding: 2px 5px !important; + padding-top: 0px !important; + margin-top: 0px !important; + padding-left: calc(var(--sidebar-width) + 6px) !important; } /* - Extensions :: - To enable/disable specific extensions just comment/uncomment the line below. - ========================================================================= + Extensions :: + To enable/disable specific extensions just comment/uncomment the line below. + ========================================================================= */ - /* CSD / Window Controls */ /* - Extension: Window Controls / Client Side Decorations (CSD) - Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Contributors: Mr-nUUb, Xanaxus, Drannex42 - Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 + Extension: Window Controls / Client Side Decorations (CSD) + Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. + Repository URL: https://github.com/drannex42/FirefoxSidebar + Contributors: Mr-nUUb, Xanaxus, Drannex42 + Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 */ /* allow the buttons to appear */ .browser-toolbar { - position: unset !important; + position: unset !important; } /* reserve space for buttons */ #nav-bar { - padding-right: var(--csd-margin-right) !important; - margin-left: var(--csd-margin-left) !important; + padding-right: var(--csd-margin-right) !important; + margin-left: var(--csd-margin-left) !important; } /* move buttons next to menu button */ .titlebar-buttonbox-container { - visibility: visible !important; - position: fixed !important; - display: block; - z-index: 999999999; - top: var(--csd-top, inherit); - right: var(--csd-right, inherit); - left: var(--csd-left, inherit); - max-width: var(--csd-width); + visibility: visible !important; + position: fixed !important; + display: block; + z-index: 999999999; + top: var(--csd-top, inherit); + right: var(--csd-right, inherit); + left: var(--csd-left, inherit); + max-width: var(--csd-width); } /* hide buttons in fullscreen mode (video player and F11) */ #main-window[inFullscreen="true"] .titlebar-buttonbox-container, #main-window[inDOMFullscreen="true"] .titlebar-buttonbox-container { - visibility: hidden !important; + visibility: hidden !important; } /* remove empty space when in fullscreen mode (F11) */ #main-window[inFullscreen="true"] #nav-bar { - padding-right: 0px !important; - margin-left: 0px !important; + padding-right: 0px !important; + margin-left: 0px !important; } + /* END Client Side Decorations / Window Controls */ + /* + Extension: Superbox Removal (and compaction) + Description: This removes the superbox and fixes some padding around the urlbar. + Repository URL: https://github.com/drannex42/FirefoxSidebar + */ + /* --- Prevent enlargement */ #urlbar[breakout-extend] { - top: calc( - (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 - ) !important; - left: 0 !important; - width: 100% !important; + /* top: calc( */ + /* (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 */ + /* ) !important; */ + /* Fix due to deprecation https://www.reddit.com/r/firefox/comments/1cs3g49/address_bar_suggestions_going_up_instead_of_down/ */ + top: calc((var(--urlbar-container-height, --urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important; + left: 0 !important; + width: 100% !important; } #urlbar[breakout-extend] #urlbar-input-container { - height: var(--urlbar-height) !important; - /* padding: 0px !important; */ - padding-block: 0px !important; - padding-inline: 0px !important; + height: var(--urlbar-height) !important; + /* padding: 0px !important; */ + padding-block: 0px !important; + padding-inline: 0px !important; } + .urlbarView-row { - padding: 0px 2px 0px 2px; + padding: 0px 2px 0px 2px; } + /* END Prevent enlargement --- */ /*/* --- Reduce row paddings to make them more compact */ .urlbarView-row { - padding: 2px 0px !important; - line-height: 1.2em !important; - margin: -1px; - margin-bottom: 0px; + padding: 2px 0px !important; + line-height: 1.2em !important; + margin: -1px; + margin-bottom: 0px; } + .urlbarView-row-inner { - padding-bottom: 6px !important; + padding-bottom: 6px !important; } + .urlbarView { - margin: 0px !important; - width: 100% !important; + margin: 0px !important; + width: 100% !important; } + /* END Reduce row paddings to make them more compact --- */ /* Disable Urlbar Animation */ - #urlbar[breakout][breakout-extend][breakout-extend-animate] - > #urlbar-background { - animation-name: none !important; - animation: none !important; + #urlbar[breakout][breakout-extend][breakout-extend-animate]>#urlbar-background { + animation-name: none !important; + animation: none !important; } + /* END Disable Urlbar Animation */ /* --- More compact "Search with Google" rows */ - .urlbarView-row[dynamicType="onboardTabToSearch"] > .urlbarView-row-inner { - min-height: auto !important; - width: auto !important; + .urlbarView-row[dynamicType="onboardTabToSearch"]>.urlbarView-row-inner { + min-height: auto !important; + width: auto !important; } - .urlbarView-row[dynamicType="onboardTabToSearch"] - > .urlbarView-row-inner - > .urlbarView-no-wrap - > .urlbarView-favicon { - margin-bottom: -1px; + + .urlbarView-row[dynamicType="onboardTabToSearch"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon { + margin-bottom: -1px; } + /* END More compact "Search with Google" rows --- */ /* Remove active border on the addressbar when in focus */ #nav-bar { - --toolbar-field-focus-border-color: #ccc; + --toolbar-field-focus-border-color: #ccc; } /* Remove box shadow on address bar */ #urlbar-background, #searchbar { - box-shadow: none !important; + box-shadow: none !important; } ''; bookmarks = [ From 469bd2b40a7a4c41896bf3a09f221f1e08fe2876 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 13:58:18 +0200 Subject: [PATCH 1957/2308] Update zsh for firefox and enable lanzaboote on EDI --- home-manager/shared/shell/zsh.nix | 9 +++++++++ nixos/hosts/EDI/configuration.nix | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index d68ee10..cc38d8f 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -34,6 +34,15 @@ sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM="; }; } + { + name = "terraform"; + src = pkgs.fetchFromGitHub { + owner = "macunha1"; + repo = "zsh-terraform"; + rev = "fd1471d3757f8ed13f56c4426f88616111de2a87"; + sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc"; + }; + } ]; autosuggestion.enable = true; enableCompletion = true; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index d0d1767..78ee9f7 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -49,13 +49,13 @@ # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. - boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.enable = lib.mkForce false; boot.initrd.systemd.enable = true; - # boot.lanzaboote = { - # enable = true; - # pkiBundle = "/etc/secureboot"; - # }; + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "24.11"; From bebd3cc4876da24439d46fccbda4377e1fdae505 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 14:46:04 +0200 Subject: [PATCH 1958/2308] Use more up to date version of konsole --- nixos/desktop/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 80a26bf..0970a21 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -18,7 +18,7 @@ # You can add overlays here overlays = [ #(final: prev: { - #bcachefs-tools = pkgs-edge.bcachefs-tools; + #bcachefs-tools = pkgs-edge.bcachefs-tools; #}) # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions @@ -75,6 +75,7 @@ kdePackages.kdepim-addons kdePackages.kirigami kdePackages.kdeconnect-kde + kdePackages.konsole # kdePackages.krunner-ssh # kdePackages.krunner-symbols kdePackages.packagekit-qt From fcef7501938237b9ef885cabf5537a0c732c22c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 15:12:50 +0200 Subject: [PATCH 1959/2308] Add filelight for disk usage stuff --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 0970a21..2997f89 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -71,6 +71,7 @@ # KDE/QT krunner-translator kdePackages.discover + kdePackages.filelight kdePackages.kcalc kdePackages.kdepim-addons kdePackages.kirigami From 9d3ca00a9951844a030f987cdc15666514af7449 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 2 Sep 2024 21:35:04 +0200 Subject: [PATCH 1960/2308] update flake lock --- flake.lock | 290 +++++++++++++++++++++++++++-------------------------- 1 file changed, 148 insertions(+), 142 deletions(-) diff --git a/flake.lock b/flake.lock index 5c813e1..8387f1c 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1720542474, - "narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=", + "lastModified": 1724226964, + "narHash": "sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68=", "owner": "zhaofengli", "repo": "attic", - "rev": "6139576a3ce6bb992e0f6c3022528ec233e45f00", + "rev": "6d9aeaef0a067d664cb11bb7704f7ec373d47fb2", "type": "github" }, "original": { @@ -37,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724456070, - "narHash": "sha256-Mbi9N8S3OjS1XywvkraGf+jmOXZrjhTjVoWYxSf+XSY=", + "lastModified": 1725154455, + "narHash": "sha256-EAfDQEnWPL/ch6zfPFukXw3tb6yl9+k81x6jI7RjJyg=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "b422b19f636329e1a082bcacd3ac6b485d7a5b3e", + "rev": "1e058db4b603f8992b781b4654b48221dd04407a", "type": "github" }, "original": { @@ -70,15 +70,15 @@ "inputs": { "devenv": "devenv", "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks" + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1719923519, - "narHash": "sha256-7Rhljj2fsklFRsu+eq7N683Z9qukmreMEj5C1GqCrSA=", + "lastModified": 1724232775, + "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", "owner": "cachix", "repo": "cachix", - "rev": "4e9e71f78b9500fa6210cf1eaa4d75bdbab777c3", + "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", "type": "github" }, "original": { @@ -163,7 +163,7 @@ "complement": "complement", "crane": "crane_3", "fenix": "fenix_2", - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_3", "liburing": "liburing", "nix-filter": "nix-filter", @@ -173,11 +173,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1724781403, - "narHash": "sha256-MO4WUq7p4SRnGVtxuDH5PLZnPgwl1ZtoXmwt5R/OTwc=", + "lastModified": 1725209064, + "narHash": "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "d26493562528172595ea063c55f76b7eb0d6b7c4", + "rev": "8f7ade4c22533a3177bfd8f175e178573ba6c1d4", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1717025063, - "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", "owner": "ipetkov", "repo": "crane", - "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1720546058, - "narHash": "sha256-iU2yVaPIZm5vMGdlT0+57vdB/aPq/V5oZFBRwYw+HBM=", + "lastModified": 1724006180, + "narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=", "owner": "ipetkov", "repo": "crane", - "rev": "2d83156f23c43598cf44e152c33a59d3892f8b29", + "rev": "7ce92819802bc583b7e82ebc08013a530f22209f", "type": "github" }, "original": { @@ -310,15 +310,15 @@ "pre-commit-hooks": [ "conduwuit", "cachix", - "pre-commit-hooks" + "git-hooks" ] }, "locked": { - "lastModified": 1719759336, - "narHash": "sha256-3a34VL/QnHprl5gMy9xlx6d8J+iNp+W88Ex8smkgH9M=", + "lastModified": 1723156315, + "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", "owner": "cachix", "repo": "devenv", - "rev": "bb32aa986f2f695385e54428d0eaf7d05b31466e", + "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1724895876, - "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=", + "lastModified": 1725242307, + "narHash": "sha256-a2iTMBngegEZvaNAzzxq5Gc5Vp3UWoGUqWtK11Txbic=", "owner": "nix-community", "repo": "disko", - "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3", + "rev": "96073e6423623d4a8027e9739d2af86d6422ea7a", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1720852044, - "narHash": "sha256-3NBYz8VuXuKU+8ONd9NFafCNjPEGHIZQ2Mdoam1a4mY=", + "lastModified": 1724221791, + "narHash": "sha256-mKX67QPnUybOopVph/LhOV1G/H4EvPxDIfSmbufrVdA=", "owner": "nix-community", "repo": "fenix", - "rev": "5087b12a595ee73131a944d922f24d81dae05725", + "rev": "e88b38a5a3834e039d413a88f8150a75ef6453ef", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -503,6 +503,7 @@ }, "original": { "owner": "edolstra", + "ref": "master", "repo": "flake-compat", "type": "github" } @@ -519,7 +520,6 @@ }, "original": { "owner": "edolstra", - "ref": "master", "repo": "flake-compat", "type": "github" } @@ -540,22 +540,6 @@ "type": "github" } }, - "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -563,11 +547,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -598,12 +582,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -614,7 +601,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1689068808, @@ -632,7 +619,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -651,7 +638,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -669,7 +656,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -685,12 +672,41 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ "conduwuit", "cachix", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -737,11 +753,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "type": "github" }, "original": { @@ -757,11 +773,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1724908834, - "narHash": "sha256-QYtm4H+nzO8lYJYN6TfitmZ5jvb94YqY5MGWvZRCre8=", + "lastModified": 1725153537, + "narHash": "sha256-8+BJdXM1WBAttY+C63pEMUmUtSEWXHEhXOkLK4k1s2E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0ce5684924f553c65828041a86e7e3e09aeaac29", + "rev": "b13488a1f8ab01db6a3d18629f7b22a430f03984", "type": "github" }, "original": { @@ -773,7 +789,7 @@ "lanzaboote": { "inputs": { "crane": "crane_4", - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", @@ -796,11 +812,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1720798442, - "narHash": "sha256-gtPppAoksMLW4GuruQ36nf4EAqIA1Bs6V9Xcx8dBxrQ=", + "lastModified": 1724199144, + "narHash": "sha256-MVjnwO6EbKzzSrU51dSseLarZ1fRp+6SagAf/nE/XZU=", "owner": "axboe", "repo": "liburing", - "rev": "1d674f83b7d0f07553ac44d99a401b05853d9dbe", + "rev": "2d4e799017d64cd2f8304503eef9064931bb3fbd", "type": "github" }, "original": { @@ -909,11 +925,11 @@ ] }, "locked": { - "lastModified": 1724576102, - "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=", + "lastModified": 1725161148, + "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5", + "rev": "32058e9138248874773630c846563b1a78ee7a5b", "type": "github" }, "original": { @@ -955,11 +971,11 @@ }, "nixlib": { "locked": { - "lastModified": 1724547350, - "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", + "lastModified": 1725152544, + "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", + "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", "type": "github" }, "original": { @@ -976,11 +992,11 @@ ] }, "locked": { - "lastModified": 1724893087, - "narHash": "sha256-M3+Z8SSpzKPQ+/vw9a99G9HfqKWbVGzhFz4p3KAX0NI=", + "lastModified": 1725298144, + "narHash": "sha256-LI+gI4qeVTQaS0vW6tn49RG+f8cH1KBALaligCeHLog=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0dd0205bc3f6d602ddb62aaece5f62a8715a9e85", + "rev": "8e337ce40421c4f33e7535aeb988d8e30fe067eb", "type": "github" }, "original": { @@ -1007,11 +1023,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "lastModified": 1723827930, + "narHash": "sha256-EU+W5F6y2CVNxGrGIMpY7nSVYq72WRChYxF4zpjx0y4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "rev": "d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d", "type": "github" }, "original": { @@ -1038,11 +1054,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1724918179, - "narHash": "sha256-vQ1gVPgJiDHPTjhwCqr9c/Z1YEhRzvhy6NvH2En200c=", + "lastModified": 1725304648, + "narHash": "sha256-RzrNqB6nJx0/eUaP7WASW3iqjvxrHUcVtkrYdVwi+do=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e073dc84d49aca4f845305641c552d9332b212f", + "rev": "5b5931f371c926c622332b6724c7fecc60e78c97", "type": "github" }, "original": { @@ -1085,11 +1101,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -1101,16 +1117,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1718811006, - "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1149,11 +1165,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -1181,11 +1197,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1229,11 +1245,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -1300,11 +1316,11 @@ ] }, "locked": { - "lastModified": 1724556439, - "narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", + "lastModified": 1725210710, + "narHash": "sha256-HHWEeLhfDeprabbxjGc/jVWpUu0+gFaQ0jWgohe02XE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", + "rev": "c00261909b44a960894552bbeafb762af2fa9bd8", "type": "github" }, "original": { @@ -1340,31 +1356,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_5", - "gitignore": "gitignore", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1395,16 +1386,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1720900786, - "narHash": "sha256-Vta9Um/RRuWwZ46BjXftV06iWLm/j/9MX39emXUvSAY=", + "lastModified": 1724285323, + "narHash": "sha256-k60kreKQ0v+bQ16yBd2SfLYpuNjMw2qoRmZL/S3k6CU=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "911f4243e69c2e320a7a209bf1f5f3ff5f825495", + "rev": "5a67ad7ce46328578ee5587fb0c23faa03d14e67", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.4.0", + "ref": "v9.5.2", "repo": "rocksdb", "type": "github" } @@ -1452,11 +1443,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1720717809, - "narHash": "sha256-6I+fm+nTLF/iaj7ffiFGlSY7POmubwUaPA/Wq0Bm53M=", + "lastModified": 1724153119, + "narHash": "sha256-WxpvDJDttkINkXmUA/W5o11lwLPYhATAgu0QUAacZ2g=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ffbc5ad993d5cd2f3b8bcf9a511165470944ab91", + "rev": "3723e5910c14f0ffbd13de474b8a8fcc74db04ce", "type": "github" }, "original": { @@ -1511,7 +1502,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "nixpkgs": "nixpkgs_7", "nixpkgs-24_05": "nixpkgs-24_05" }, @@ -1536,11 +1527,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1723501126, - "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", + "lastModified": 1725201042, + "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", + "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", "type": "github" }, "original": { @@ -1609,6 +1600,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ From 2df0f3e7817e6a7cd2bbe47527f01243dfb38251 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 3 Sep 2024 10:26:58 +0200 Subject: [PATCH 1961/2308] update flake lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8387f1c..222535a 100644 --- a/flake.lock +++ b/flake.lock @@ -1054,11 +1054,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1725304648, - "narHash": "sha256-RzrNqB6nJx0/eUaP7WASW3iqjvxrHUcVtkrYdVwi+do=", + "lastModified": 1725351521, + "narHash": "sha256-ho00xV4BBpKa03Oe7mce+4+gMvvzRJbb5uW38eYnM0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5931f371c926c622332b6724c7fecc60e78c97", + "rev": "1f20f29afc062d092282fdfdc53a18dd2b011bb1", "type": "github" }, "original": { @@ -1316,11 +1316,11 @@ ] }, "locked": { - "lastModified": 1725210710, - "narHash": "sha256-HHWEeLhfDeprabbxjGc/jVWpUu0+gFaQ0jWgohe02XE=", + "lastModified": 1725327224, + "narHash": "sha256-+cMfiE+zigDuChOFlhUH3yN7Yll9hr1LRBHsO09pqjY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "c00261909b44a960894552bbeafb762af2fa9bd8", + "rev": "3f1589c38428bd8121fd5deebd86ce4108b29d6e", "type": "github" }, "original": { From cdb3860b76306cc48cd80912deb31a35ad77bd35 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 5 Sep 2024 14:54:01 +0200 Subject: [PATCH 1962/2308] Trying to enable the well known for conduwuit --- nixos/server/package-configs/conduit/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 1e8e631..f69a9ab 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -44,6 +44,10 @@ in { allow_registration = false; turn_uris = ["turn:turn.gladtherescake.eu.url?transport=udp" "turn:turn.gladtherescake.eu?transport=tcp"]; turn_secret = "cPKWEn4Fo5TAJoE7iX3xeVOaMVE4afeRN1iRGWYfbkWbkaZMxTpnmazHyH6c6yXT"; + well_known = { + server = "matrix.gladtherescake.eu:443"; + client = "https://matrix.gladtherescake.eu"; + }; }; }; From 9deba2b39541d89645bd2844efac903bbab6f738 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 6 Sep 2024 15:22:47 +0200 Subject: [PATCH 1963/2308] update flake lock --- flake.lock | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 222535a..e152f6c 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725154455, - "narHash": "sha256-EAfDQEnWPL/ch6zfPFukXw3tb6yl9+k81x6jI7RjJyg=", + "lastModified": 1725464380, + "narHash": "sha256-E9Xdw5/jkU9yhqjU+EzoBS0OKbL0a8YEkInYrriaUkQ=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "1e058db4b603f8992b781b4654b48221dd04407a", + "rev": "68704c30dce693b83deb0e7ea40d47bae8e359b4", "type": "github" }, "original": { @@ -126,11 +126,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1724469296, - "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", + "lastModified": 1725509983, + "narHash": "sha256-NHCgHVqumPraFJnLrkanoLDuhOoUHUvRhvp/RIHJR+A=", "owner": "catppuccin", "repo": "nix", - "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", + "rev": "45745fe5960acaefef2b60f3455bcac6a0ca6bc9", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1725242307, - "narHash": "sha256-a2iTMBngegEZvaNAzzxq5Gc5Vp3UWoGUqWtK11Txbic=", + "lastModified": 1725377834, + "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", "owner": "nix-community", "repo": "disko", - "rev": "96073e6423623d4a8027e9739d2af86d6422ea7a", + "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", "type": "github" }, "original": { @@ -753,11 +753,11 @@ ] }, "locked": { - "lastModified": 1725180166, - "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "lastModified": 1725627831, + "narHash": "sha256-MIaU+T3DIowKvy1esp2owm3EgeyVgWFEoJ5jwAJIyvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "rev": "7d569851e95e8b360a3d7a2f52c5fc6a597a7657", "type": "github" }, "original": { @@ -773,11 +773,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1725153537, - "narHash": "sha256-8+BJdXM1WBAttY+C63pEMUmUtSEWXHEhXOkLK4k1s2E=", + "lastModified": 1725600800, + "narHash": "sha256-wst7p3RZ9kZUNzN22d27wU8YSBB7Grlx6Q03A7boRaU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b13488a1f8ab01db6a3d18629f7b22a430f03984", + "rev": "2d050e65a71e02a1f19d1a35c086bd2e3dfb2cdb", "type": "github" }, "original": { @@ -796,11 +796,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1722329086, - "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=", + "lastModified": 1725379389, + "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a", + "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", "type": "github" }, "original": { @@ -992,11 +992,11 @@ ] }, "locked": { - "lastModified": 1725298144, - "narHash": "sha256-LI+gI4qeVTQaS0vW6tn49RG+f8cH1KBALaligCeHLog=", + "lastModified": 1725497951, + "narHash": "sha256-fayKyVs/9FQdYH+3SCOkQM1GCsEPPVE+lSiVGlYQ7i0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "8e337ce40421c4f33e7535aeb988d8e30fe067eb", + "rev": "15a07ebf4a041bf232026263f1f96f2af390f3bc", "type": "github" }, "original": { @@ -1007,11 +1007,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724878143, - "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", + "lastModified": 1725477728, + "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", + "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1725351521, - "narHash": "sha256-ho00xV4BBpKa03Oe7mce+4+gMvvzRJbb5uW38eYnM0U=", + "lastModified": 1725628719, + "narHash": "sha256-n1LM+y4GJdr0VXvsFPqGo9ED4Ut6n8ERg6+/MKMDQiM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f20f29afc062d092282fdfdc53a18dd2b011bb1", + "rev": "31247792c61e44f71eb67ce0584a49bab177f869", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { @@ -1245,11 +1245,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { @@ -1276,11 +1276,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1721466660, - "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { @@ -1316,11 +1316,11 @@ ] }, "locked": { - "lastModified": 1725327224, - "narHash": "sha256-+cMfiE+zigDuChOFlhUH3yN7Yll9hr1LRBHsO09pqjY=", + "lastModified": 1725575977, + "narHash": "sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408=", "owner": "pjones", "repo": "plasma-manager", - "rev": "3f1589c38428bd8121fd5deebd86ce4108b29d6e", + "rev": "b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39", "type": "github" }, "original": { @@ -1527,11 +1527,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1725201042, - "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", + "lastModified": 1725540166, + "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", + "rev": "d9d781523a1463965cd1e1333a306e70d9feff07", "type": "github" }, "original": { From 202893ec08fc4fa2e3d692ff7bf8e1bd517fb9d4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 10:28:05 +0200 Subject: [PATCH 1964/2308] Add pylsp to python editing in helix --- home-manager/shared/shell/helix/default.nix | 2 +- nixos/server/package-configs/conduit/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index ae6d948..b8ee578 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -36,7 +36,7 @@ language-id = "python"; auto-format = true; file-types = ["py"]; - language-servers = ["ruff" "scls"]; + language-servers = ["ruff" "scls" "pylsp"]; } { name = "typst"; diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index f69a9ab..2ea9053 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -127,7 +127,7 @@ in { ''; }; locations."/_matrix/client/unstable/org.matrix.msc3575/sync" = { - proxyPass = "http://backend_conduit/client/unstable/org.matrix.msc3575/sync"; + proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync"; proxyWebsockets = true; recommendedProxySettings = false; extraConfig = '' From 460d421513675c61feb154a412b7b94b635a3a14 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 14:10:41 +0200 Subject: [PATCH 1965/2308] Add ruff plugin to pylsp --- home-manager/shared/shell/helix/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index b8ee578..5aad24a 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -76,6 +76,15 @@ } ]; language-server = { + pylsp = { + config.pylsp.plugins = { + ruff = { + enabled = true; + ignore = ["F401"]; + lineLength = 120; + }; + }; + }; ruff = { command = "ruff-lsp"; }; From 8d36a530a81302f78aa7b22560b09bccd610c315 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 14:50:16 +0200 Subject: [PATCH 1966/2308] Disable the other linters aside from ruff in helix --- home-manager/shared/shell/helix/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 5aad24a..7eaee34 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -78,6 +78,13 @@ language-server = { pylsp = { config.pylsp.plugins = { + flake8 = {enabled = false;}; + autopep8 = {enabled = false;}; + mccabe = {enabled = false;}; + pycodestyle = {enabled = false;}; + pyflakes = {enabled = false;}; + pylint = {enabled = false;}; + yapf = {enabled = false;}; ruff = { enabled = true; ignore = ["F401"]; From 17200daa04fd6c0cf3aa788296c9370f9fe2b04f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 15:03:55 +0200 Subject: [PATCH 1967/2308] Enable more lints with ruff --- home-manager/shared/shell/helix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 7eaee34..a452603 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -87,6 +87,7 @@ yapf = {enabled = false;}; ruff = { enabled = true; + select = ["E" "F" "UP" "B" "SIM" "I" "PD"]; ignore = ["F401"]; lineLength = 120; }; From 76248fcd2c434a93284516da73196e3ecb68f7d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 15:37:42 +0200 Subject: [PATCH 1968/2308] Add all the features for ruff I want --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index a452603..e755fcf 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -87,7 +87,7 @@ yapf = {enabled = false;}; ruff = { enabled = true; - select = ["E" "F" "UP" "B" "SIM" "I" "PD"]; + select = ["E" "F" "UP" "B" "SIM" "I" "PD" "NPY" "PERF" "FURB" "DOC" "TRY" "W" "R" "PL" "TCH" "Q" "PT" "ICN" "C4" "COM" "FBT" "S" "N"]; ignore = ["F401"]; lineLength = 120; }; From d75850955135df66ce3d315079379e7ee3b78b40 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 17:00:25 +0200 Subject: [PATCH 1969/2308] update flake lock --- flake.lock | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index e152f6c..c28bfbb 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725464380, - "narHash": "sha256-E9Xdw5/jkU9yhqjU+EzoBS0OKbL0a8YEkInYrriaUkQ=", + "lastModified": 1725762345, + "narHash": "sha256-e2He1FFN35H3uVeUYO9+2fbG7IPoOSGub9oEKc1S0eQ=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "68704c30dce693b83deb0e7ea40d47bae8e359b4", + "rev": "bc5d903fdae933fad017d370764e2ae38d58b42d", "type": "github" }, "original": { @@ -753,11 +753,11 @@ ] }, "locked": { - "lastModified": 1725627831, - "narHash": "sha256-MIaU+T3DIowKvy1esp2owm3EgeyVgWFEoJ5jwAJIyvc=", + "lastModified": 1725948275, + "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d569851e95e8b360a3d7a2f52c5fc6a597a7657", + "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", "type": "github" }, "original": { @@ -773,11 +773,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1725600800, - "narHash": "sha256-wst7p3RZ9kZUNzN22d27wU8YSBB7Grlx6Q03A7boRaU=", + "lastModified": 1725944773, + "narHash": "sha256-MG/rHAx1soZTnuSrFsYLuSRzuQCUOXP8o7k8M0FzEd8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2d050e65a71e02a1f19d1a35c086bd2e3dfb2cdb", + "rev": "b9af8b3887f231334c1fae0efcb7be45096559e4", "type": "github" }, "original": { @@ -925,11 +925,11 @@ ] }, "locked": { - "lastModified": 1725161148, - "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=", + "lastModified": 1725765290, + "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "32058e9138248874773630c846563b1a78ee7a5b", + "rev": "642275444c5a9defce57219c944b3179bf2adaa9", "type": "github" }, "original": { @@ -971,11 +971,11 @@ }, "nixlib": { "locked": { - "lastModified": 1725152544, - "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", + "lastModified": 1725757153, + "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", + "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", "type": "github" }, "original": { @@ -992,11 +992,11 @@ ] }, "locked": { - "lastModified": 1725497951, - "narHash": "sha256-fayKyVs/9FQdYH+3SCOkQM1GCsEPPVE+lSiVGlYQ7i0=", + "lastModified": 1725843519, + "narHash": "sha256-Z6DglUwgFDz6fIvQ89wx/uBVWrGvEGECq0Ypyk/eigE=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "15a07ebf4a041bf232026263f1f96f2af390f3bc", + "rev": "214efbd73241d72a8f48b8b9a73bb54895cd51a7", "type": "github" }, "original": { @@ -1007,11 +1007,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725477728, - "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1725628719, - "narHash": "sha256-n1LM+y4GJdr0VXvsFPqGo9ED4Ut6n8ERg6+/MKMDQiM=", + "lastModified": 1725980019, + "narHash": "sha256-RJvwwGhegNA8+hSj3nQKhheO6ruZv8hY6zQF6J1sXAU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "31247792c61e44f71eb67ce0584a49bab177f869", + "rev": "d174eca1faa532934280f9c826af2f0b77217404", "type": "github" }, "original": { @@ -1149,11 +1149,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1721524707, - "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", + "lastModified": 1725762081, + "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", + "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -1245,11 +1245,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -1276,11 +1276,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1725534445, + "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", "type": "github" }, "original": { @@ -1316,11 +1316,11 @@ ] }, "locked": { - "lastModified": 1725575977, - "narHash": "sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408=", + "lastModified": 1725914634, + "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39", + "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", "type": "github" }, "original": { @@ -1527,11 +1527,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1725540166, - "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", + "lastModified": 1725922448, + "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d9d781523a1463965cd1e1333a306e70d9feff07", + "rev": "cede1a08039178ac12957733e97ab1006c6b6892", "type": "github" }, "original": { From 5f43f81d51cb219df5dbfceedf21fb24eae69b6f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 17:25:28 +0200 Subject: [PATCH 1970/2308] Disable lanzaboote on shodan for now --- flake.nix | 2 +- nixos/hosts/shodan/configuration.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 03cf2a4..bf5e57f 100644 --- a/flake.nix +++ b/flake.nix @@ -213,7 +213,7 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops - lanzaboote.nixosModules.lanzaboote + #lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f7e0c3e..3b7eed4 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -207,13 +207,13 @@ # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. - boot.loader.systemd-boot.enable = lib.mkForce false; + boot.loader.systemd-boot.enable = true; boot.initrd.systemd.enable = true; - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; + #boot.lanzaboote = { + # enable = true; + # pkiBundle = "/etc/secureboot"; + #}; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; From 40f0c218d9d5132c0af35db145ed9776814a520d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:18:22 +0200 Subject: [PATCH 1971/2308] We can't do that because secure boot is on... --- flake.nix | 2 +- nixos/hosts/shodan/configuration.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index bf5e57f..03cf2a4 100644 --- a/flake.nix +++ b/flake.nix @@ -213,7 +213,7 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops - #lanzaboote.nixosModules.lanzaboote + lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 3b7eed4..f7e0c3e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -207,13 +207,13 @@ # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. - boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.enable = lib.mkForce false; boot.initrd.systemd.enable = true; - #boot.lanzaboote = { - # enable = true; - # pkiBundle = "/etc/secureboot"; - #}; + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; From 9929c7447dd232ffa135d5667effa64c41966701 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:25:10 +0200 Subject: [PATCH 1972/2308] I don't think this'll fix the lanzaboote error but we can try --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 03cf2a4..5428f52 100644 --- a/flake.nix +++ b/flake.nix @@ -220,8 +220,8 @@ catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager inputs.catppuccin.homeManagerModules.catppuccin + inputs.plasma-manager.homeManagerModules.plasma-manager ]; } ]; From a6312e6805c28b7f51c866696afaf7f2d758bec4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:27:05 +0200 Subject: [PATCH 1973/2308] update flake lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index c28bfbb..1c494aa 100644 --- a/flake.lock +++ b/flake.lock @@ -753,11 +753,11 @@ ] }, "locked": { - "lastModified": 1725948275, - "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", + "lastModified": 1726036828, + "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", + "rev": "8a1671642826633586d12ac3158e463c7a50a112", "type": "github" }, "original": { @@ -773,11 +773,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1725944773, - "narHash": "sha256-MG/rHAx1soZTnuSrFsYLuSRzuQCUOXP8o7k8M0FzEd8=", + "lastModified": 1726031155, + "narHash": "sha256-QUv5cxy40HRC7vJz9JjbVEmlHT+q1VIuikNJUQZHre0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b9af8b3887f231334c1fae0efcb7be45096559e4", + "rev": "90c68db7d9430bd30e8c5096a0e3dc078b410050", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1725980019, - "narHash": "sha256-RJvwwGhegNA8+hSj3nQKhheO6ruZv8hY6zQF6J1sXAU=", + "lastModified": 1726057121, + "narHash": "sha256-6xBH5ii+WfuU6A4nJ2JMAajl0N+v+OLnt9y6eC+pphw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d174eca1faa532934280f9c826af2f0b77217404", + "rev": "842d84cdcc779f2e3ad1950f19cab533833ba0ea", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1725983898, + "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "type": "github" }, "original": { @@ -1245,11 +1245,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1725983898, + "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "type": "github" }, "original": { From cee4f93f32aceacb9a1d4176244831f67e8bcb00 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:33:51 +0200 Subject: [PATCH 1974/2308] I don't think this will fix things but we'll see what impact it has --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 5428f52..2e0723c 100644 --- a/flake.nix +++ b/flake.nix @@ -213,7 +213,7 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops - lanzaboote.nixosModules.lanzaboote + # lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager From f0ba3cb27d37c0b856365e75e9b48cadbb3e478a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:34:50 +0200 Subject: [PATCH 1975/2308] Maybe just put it in imports? --- nixos/hosts/shodan/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f7e0c3e..7c5eae2 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -15,6 +15,8 @@ # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default + inputs.lanzaboote.nixosModules.lanzaboote + # Import the shared settings ../../shared ../../desktop/package-configs/firefox From 57f50e54c6188b74038367fde26d62f54c804bc3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:35:56 +0200 Subject: [PATCH 1976/2308] And with the original module? --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2e0723c..5428f52 100644 --- a/flake.nix +++ b/flake.nix @@ -213,7 +213,7 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops - # lanzaboote.nixosModules.lanzaboote + lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager From 2f6ba250cc6fc0bbae9de6f1fc1f09a7289101e3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 16 Sep 2024 21:09:20 +0200 Subject: [PATCH 1977/2308] Why does it work here now? I don't know, this should build according to nix flake check, flake lock updated, removed isos for now --- flake.lock | 175 +++++++++++++++------------ flake.nix | 78 ++++++------ nixos/hosts/shodan/configuration.nix | 2 - 3 files changed, 135 insertions(+), 120 deletions(-) diff --git a/flake.lock b/flake.lock index 1c494aa..7691bc0 100644 --- a/flake.lock +++ b/flake.lock @@ -4,16 +4,17 @@ "inputs": { "crane": "crane_2", "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1724226964, - "narHash": "sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68=", + "lastModified": 1725300620, + "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", "owner": "zhaofengli", "repo": "attic", - "rev": "6d9aeaef0a067d664cb11bb7704f7ec373d47fb2", + "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", "type": "github" }, "original": { @@ -142,11 +143,11 @@ "complement": { "flake": false, "locked": { - "lastModified": 1722323564, - "narHash": "sha256-6w6/N8walz4Ayc9zu7iySqJRmGFukhkaICLn4dweAcA=", + "lastModified": 1724347376, + "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", "owner": "matrix-org", "repo": "complement", - "rev": "6e4426a9e63233f9821a4d2382bfed145244183f", + "rev": "39733c1b2f8314800776748cc7164f9a34650686", "type": "github" }, "original": { @@ -173,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1725209064, - "narHash": "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE=", + "lastModified": 1726444589, + "narHash": "sha256-dWKVjS4wvyZxRjhUICTnnw8mHYwJij4SGvXIG/U5oRo=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "8f7ade4c22533a3177bfd8f175e178573ba6c1d4", + "rev": "032b199129f8648a77bde285f755a78e9ec349a7", "type": "github" }, "original": { @@ -230,18 +231,12 @@ } }, "crane_3": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724006180, - "narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=", + "lastModified": 1725409566, + "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", "owner": "ipetkov", "repo": "crane", - "rev": "7ce92819802bc583b7e82ebc08013a530f22209f", + "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "type": "github" }, "original": { @@ -369,11 +364,11 @@ ] }, "locked": { - "lastModified": 1725377834, - "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", + "lastModified": 1726396892, + "narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=", "owner": "nix-community", "repo": "disko", - "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", + "rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce", "type": "github" }, "original": { @@ -413,11 +408,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1724221791, - "narHash": "sha256-mKX67QPnUybOopVph/LhOV1G/H4EvPxDIfSmbufrVdA=", + "lastModified": 1725690497, + "narHash": "sha256-5fT+96rV7Hx29HG+4/oBbr3V+yExKuLN2vcBcPbVBlU=", "owner": "nix-community", "repo": "fenix", - "rev": "e88b38a5a3834e039d413a88f8150a75ef6453ef", + "rev": "4b8d964df93d1f918ee6c4f003b3548c432cc866", "type": "github" }, "original": { @@ -543,15 +538,17 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "conduwuit", + "attic", "nixpkgs" ] }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -561,6 +558,26 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -753,11 +770,11 @@ ] }, "locked": { - "lastModified": 1726036828, - "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", + "lastModified": 1726440980, + "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a1671642826633586d12ac3158e463c7a50a112", + "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "type": "github" }, "original": { @@ -773,11 +790,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1726031155, - "narHash": "sha256-QUv5cxy40HRC7vJz9JjbVEmlHT+q1VIuikNJUQZHre0=", + "lastModified": 1726115155, + "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "90c68db7d9430bd30e8c5096a0e3dc078b410050", + "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", "type": "github" }, "original": { @@ -790,7 +807,7 @@ "inputs": { "crane": "crane_4", "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" @@ -812,11 +829,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1724199144, - "narHash": "sha256-MVjnwO6EbKzzSrU51dSseLarZ1fRp+6SagAf/nE/XZU=", + "lastModified": 1725659644, + "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", "owner": "axboe", "repo": "liburing", - "rev": "2d4e799017d64cd2f8304503eef9064931bb3fbd", + "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", "type": "github" }, "original": { @@ -925,11 +942,11 @@ ] }, "locked": { - "lastModified": 1725765290, - "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", + "lastModified": 1726449931, + "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "642275444c5a9defce57219c944b3179bf2adaa9", + "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", "type": "github" }, "original": { @@ -971,11 +988,11 @@ }, "nixlib": { "locked": { - "lastModified": 1725757153, - "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", + "lastModified": 1726362065, + "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", + "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555", "type": "github" }, "original": { @@ -992,11 +1009,11 @@ ] }, "locked": { - "lastModified": 1725843519, - "narHash": "sha256-Z6DglUwgFDz6fIvQ89wx/uBVWrGvEGECq0Ypyk/eigE=", + "lastModified": 1726494069, + "narHash": "sha256-eBmurYEjTDfWbpJOO5jQu9yxoznOxLF/7IwYJyD+ljw=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "214efbd73241d72a8f48b8b9a73bb54895cd51a7", + "rev": "934dff070150ec3f67aea4f1dbe6ad303870669f", "type": "github" }, "original": { @@ -1007,11 +1024,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "lastModified": 1726489388, + "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "type": "github" }, "original": { @@ -1023,11 +1040,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723827930, - "narHash": "sha256-EU+W5F6y2CVNxGrGIMpY7nSVYq72WRChYxF4zpjx0y4=", + "lastModified": 1724999960, + "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d", + "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", "type": "github" }, "original": { @@ -1054,11 +1071,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1726057121, - "narHash": "sha256-6xBH5ii+WfuU6A4nJ2JMAajl0N+v+OLnt9y6eC+pphw=", + "lastModified": 1726513143, + "narHash": "sha256-z3JL4iYtx2+dcEm4JlHmOM+2/JHWb9YLp0NBWqUihk4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842d84cdcc779f2e3ad1950f19cab533833ba0ea", + "rev": "bff640bbd7eb7ebec2a7a9d99291fbbc7b3177ba", "type": "github" }, "original": { @@ -1101,16 +1118,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1165,11 +1182,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -1245,11 +1262,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -1316,11 +1333,11 @@ ] }, "locked": { - "lastModified": 1725914634, - "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", + "lastModified": 1726509788, + "narHash": "sha256-PmCmO8NDKzwHrTp9Ox/rcLiCYivqIpZlnLk8wZRjv2I=", "owner": "pjones", "repo": "plasma-manager", - "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", + "rev": "5a0c70a007837e2db01e0bb68971792e8653d32c", "type": "github" }, "original": { @@ -1386,16 +1403,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1724285323, - "narHash": "sha256-k60kreKQ0v+bQ16yBd2SfLYpuNjMw2qoRmZL/S3k6CU=", + "lastModified": 1725811807, + "narHash": "sha256-k6aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "5a67ad7ce46328578ee5587fb0c23faa03d14e67", + "rev": "347d50e212b24d98b5ad9841404ff80c1bb873f0", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.5.2", + "ref": "v9.6.1", "repo": "rocksdb", "type": "github" } @@ -1406,7 +1423,7 @@ "catppuccin": "catppuccin", "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", @@ -1443,11 +1460,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1724153119, - "narHash": "sha256-WxpvDJDttkINkXmUA/W5o11lwLPYhATAgu0QUAacZ2g=", + "lastModified": 1725630423, + "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "3723e5910c14f0ffbd13de474b8a8fcc74db04ce", + "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d", "type": "github" }, "original": { @@ -1527,11 +1544,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1725922448, - "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=", + "lastModified": 1726218807, + "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cede1a08039178ac12957733e97ab1006c6b6892", + "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5428f52..95a8488 100644 --- a/flake.nix +++ b/flake.nix @@ -227,46 +227,46 @@ ]; }; - ISO = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - {_module.args = {inherit pkgs-edge;};} - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" - "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" - ./nixos/hosts/iso/configuration.nix - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager - nix-index-database.nixosModules.nix-index - catppuccin.nixosModules.catppuccin - { - home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager - inputs.catppuccin.homeManagerModules.catppuccin - ]; - } - ]; - }; + # ISO = nixpkgs.lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = {inherit inputs outputs;}; + # modules = [ + # {_module.args = {inherit pkgs-edge;};} + # "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + # "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + # ./nixos/hosts/iso/configuration.nix + # sops-nix.nixosModules.sops + # home-manager.nixosModules.home-manager + # nix-index-database.nixosModules.nix-index + # catppuccin.nixosModules.catppuccin + # { + # home-manager.sharedModules = [ + # inputs.plasma-manager.homeManagerModules.plasma-manager + # inputs.catppuccin.homeManagerModules.catppuccin + # ]; + # } + # ]; + # }; - iso_server = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - {_module.args = {inherit pkgs-edge;};} - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" - "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" - ./nixos/hosts/iso_server/configuration.nix - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager - nix-index-database.nixosModules.nix-index - catppuccin.nixosModules.catppuccin - { - home-manager.sharedModules = [ - inputs.catppuccin.homeManagerModules.catppuccin - ]; - } - ]; - }; + # iso_server = nixpkgs.lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = {inherit inputs outputs;}; + # modules = [ + # {_module.args = {inherit pkgs-edge;};} + # "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" + # "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + # ./nixos/hosts/iso_server/configuration.nix + # sops-nix.nixosModules.sops + # home-manager.nixosModules.home-manager + # nix-index-database.nixosModules.nix-index + # catppuccin.nixosModules.catppuccin + # { + # home-manager.sharedModules = [ + # inputs.catppuccin.homeManagerModules.catppuccin + # ]; + # } + # ]; + # }; }; }; } diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 7c5eae2..f7e0c3e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -15,8 +15,6 @@ # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default - inputs.lanzaboote.nixosModules.lanzaboote - # Import the shared settings ../../shared ../../desktop/package-configs/firefox From 08dcbada274718e829785a1eb7d47f4f507f65fb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 18 Sep 2024 16:08:00 +0200 Subject: [PATCH 1978/2308] Add html and css linting to helix --- home-manager/shared/default.nix | 1 + home-manager/shared/shell/helix/default.nix | 33 +++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 465a8ce..8386997 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -21,6 +21,7 @@ home.packages = with pkgs; [ # System tools: + vscode-langservers-extracted sops zsh bat diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index e755fcf..018d614 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -74,8 +74,41 @@ args = ["-q"]; }; } + { + name = "html"; + language-id = "html"; + auto-format = true; + file-types = ["htm" "html"]; + language-servers = ["vscode-html-language-server" "vscode-eslint-language-server"]; + } + { + name = "css"; + language-id = "css"; + auto-format = true; + file-types = ["css"]; + language-servers = ["vscode-css-language-server" "vscode-eslint-language-server"]; + } + { + name = "json"; + language-id = "json"; + auto-format = true; + file-types = ["json"]; + language-servers = ["vscode-json-language-server" "vscode-eslint-language-server"]; + } ]; language-server = { + vscode-html-language-server = { + command = "vscode-html-language-server"; + }; + vscode-css-language-server = { + command = "vscode-css-language-server"; + }; + vscode-eslint-language-server = { + command = "vscode-eslint-language-server"; + }; + vscode-json-language-server = { + command = "vscode-json-language-server"; + }; pylsp = { config.pylsp.plugins = { flake8 = {enabled = false;}; From 503aa6433753bd32d7271e9c88f530791c56bf5f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 23 Sep 2024 22:14:01 +0200 Subject: [PATCH 1979/2308] Not dealing with bcachefs on glados either tbh --- disko/GLaDOS/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index 53ffd96..b418785 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -57,7 +57,7 @@ size = "100%FREE"; content = { type = "filesystem"; - format = "bcachefs"; + format = "ext4"; mountpoint = "/"; mountOptions = [ "defaults" From 93c7e9214bdea21bc1731dee4d9fd7ed449eaeb1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 24 Sep 2024 21:50:15 +0200 Subject: [PATCH 1980/2308] update flake lock --- flake.lock | 120 +++++++++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 7691bc0..b43d281 100644 --- a/flake.lock +++ b/flake.lock @@ -127,11 +127,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1725509983, - "narHash": "sha256-NHCgHVqumPraFJnLrkanoLDuhOoUHUvRhvp/RIHJR+A=", + "lastModified": 1726952185, + "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", "owner": "catppuccin", "repo": "nix", - "rev": "45745fe5960acaefef2b60f3455bcac6a0ca6bc9", + "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", "type": "github" }, "original": { @@ -268,18 +268,12 @@ } }, "crane_5": { - "inputs": { - "nixpkgs": [ - "zjstatus", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724537630, - "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", + "lastModified": 1725409566, + "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", "owner": "ipetkov", "repo": "crane", - "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", + "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "type": "github" }, "original": { @@ -364,11 +358,11 @@ ] }, "locked": { - "lastModified": 1726396892, - "narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=", + "lastModified": 1727196810, + "narHash": "sha256-xQzgXRlczZoFfrUdA4nD5qojCQVqpiIk82aYINQZd+U=", "owner": "nix-community", "repo": "disko", - "rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce", + "rev": "6d42596a35d34918a905e8539a44d3fc91f42b5b", "type": "github" }, "original": { @@ -658,11 +652,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -770,11 +764,11 @@ ] }, "locked": { - "lastModified": 1726440980, - "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", + "lastModified": 1727111745, + "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", + "rev": "21c021862fa696c8199934e2153214ab57150cb6", "type": "github" }, "original": { @@ -790,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1726115155, - "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", + "lastModified": 1727071274, + "narHash": "sha256-xG83n8zvL+fMFArU1ikcUpw0bhRkrzkSTDJPpBCLlUA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", + "rev": "03aa054340528d300711253a98f7dccca9378604", "type": "github" }, "original": { @@ -942,11 +936,11 @@ ] }, "locked": { - "lastModified": 1726449931, - "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", + "lastModified": 1726975622, + "narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", + "rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417", "type": "github" }, "original": { @@ -988,11 +982,11 @@ }, "nixlib": { "locked": { - "lastModified": 1726362065, - "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=", + "lastModified": 1726966855, + "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555", + "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", "type": "github" }, "original": { @@ -1009,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1726494069, - "narHash": "sha256-eBmurYEjTDfWbpJOO5jQu9yxoznOxLF/7IwYJyD+ljw=", + "lastModified": 1727053438, + "narHash": "sha256-t/+z1Tf7hSaStU1pBYkY7i0/GkG+YIPSmfeRrK8eYUw=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "934dff070150ec3f67aea4f1dbe6ad303870669f", + "rev": "e8c1cd886cc17e31e424f915efd32e84d8af0ce9", "type": "github" }, "original": { @@ -1024,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726489388, - "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", + "lastModified": 1727040444, + "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", + "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", "type": "github" }, "original": { @@ -1071,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1726513143, - "narHash": "sha256-z3JL4iYtx2+dcEm4JlHmOM+2/JHWb9YLp0NBWqUihk4=", + "lastModified": 1727207138, + "narHash": "sha256-r1jtkKgmJE88YWdKYGa4XB6fpnQGQfzbAEtIYtbLyzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bff640bbd7eb7ebec2a7a9d99291fbbc7b3177ba", + "rev": "ac35e3b0e0d81c433012534bc213d4cf44da4fd7", "type": "github" }, "original": { @@ -1182,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -1230,11 +1224,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { @@ -1262,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -1309,11 +1303,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1724748588, - "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=", + "lastModified": 1726481836, + "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99", + "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", "type": "github" }, "original": { @@ -1333,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1726509788, - "narHash": "sha256-PmCmO8NDKzwHrTp9Ox/rcLiCYivqIpZlnLk8wZRjv2I=", + "lastModified": 1727193535, + "narHash": "sha256-+OXzeHgg+kErwpJI40xbIAUHZS1Ky9V3wOcfcDmCOJE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5a0c70a007837e2db01e0bb68971792e8653d32c", + "rev": "e3d60d6c8a0ff5f9b8b7db200589524c367af2f4", "type": "github" }, "original": { @@ -1503,11 +1497,11 @@ ] }, "locked": { - "lastModified": 1724811750, - "narHash": "sha256-PvhVgQ1rm3gfhK7ts4emprhh/KMkFwXogmgsQ3srR7g=", + "lastModified": 1726453838, + "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6a1c4915dca7149e7258d8c7f3ac634d8c65f6c6", + "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", "type": "github" }, "original": { @@ -1544,11 +1538,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1726218807, - "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", + "lastModified": 1726524647, + "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", + "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "type": "github" }, "original": { @@ -1661,11 +1655,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1724858904, - "narHash": "sha256-QGzfl4YHTl/HuYy6oe/OqAX8xViYht1BCCIpWq7uH5U=", + "lastModified": 1726515093, + "narHash": "sha256-Y2OHV3QfLPQj3Q4+TmrMeRXthwigU/YSBv2g8y8GWWU=", "owner": "dj95", "repo": "zjstatus", - "rev": "b2f15019bdfc04f65cac7cd073418ac6ad4dbddc", + "rev": "d1c662c1052adec6f14f3ee8a51cecebe4a29ffa", "type": "github" }, "original": { From f96fcb5bf8b685ed28a77d322d3721268fb07288 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 24 Sep 2024 22:52:26 +0200 Subject: [PATCH 1981/2308] updated SSH key for GLaDOS --- nixos/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 41cf391..1138ad2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -67,7 +67,7 @@ hashedPasswordFile = config.sops.secrets."lillian-password".path; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH30G2PJOnI6jnAtxOQV0SpLFUva0adarLZLvaoZvjGE lillian@GLaDOS" ]; }; From 349c7806055553aa30c820f3adf454da6cc7f897 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 25 Sep 2024 22:04:21 +0200 Subject: [PATCH 1982/2308] added gamescope to desktop home manager --- home-manager/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 19ff7a4..8349ffb 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -92,6 +92,7 @@ # Gaming: prismlauncher steam + gamescope # Multimedia: freetube From 84e61ce5757c79420f69f2ab96fc3c77d811f538 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 26 Sep 2024 12:09:58 +0200 Subject: [PATCH 1983/2308] update flake lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index b43d281..379aed3 100644 --- a/flake.lock +++ b/flake.lock @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1727196810, - "narHash": "sha256-xQzgXRlczZoFfrUdA4nD5qojCQVqpiIk82aYINQZd+U=", + "lastModified": 1727249977, + "narHash": "sha256-lAqOCDI4B6hA+t+KHSm/Go8hQF/Ob5sgXaIRtMAnMKw=", "owner": "nix-community", "repo": "disko", - "rev": "6d42596a35d34918a905e8539a44d3fc91f42b5b", + "rev": "c1c472f4cd91e4b0703e02810a8c7ed30186b6fa", "type": "github" }, "original": { @@ -764,11 +764,11 @@ ] }, "locked": { - "lastModified": 1727111745, - "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", + "lastModified": 1727246346, + "narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=", "owner": "nix-community", "repo": "home-manager", - "rev": "21c021862fa696c8199934e2153214ab57150cb6", + "rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1727053438, - "narHash": "sha256-t/+z1Tf7hSaStU1pBYkY7i0/GkG+YIPSmfeRrK8eYUw=", + "lastModified": 1727312535, + "narHash": "sha256-exnTgS6OBYvEa8v5x8UsLQK2ERdDFwXNFQHoT2cqycY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "e8c1cd886cc17e31e424f915efd32e84d8af0ce9", + "rev": "f31447cd3f8e54674bd1675969e97e6043a309bc", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1727207138, - "narHash": "sha256-r1jtkKgmJE88YWdKYGa4XB6fpnQGQfzbAEtIYtbLyzc=", + "lastModified": 1727343478, + "narHash": "sha256-oswVBH+Nzbfn6Qfq52uKBgDtMiYZUyl5bLEaGrpNWqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35e3b0e0d81c433012534bc213d4cf44da4fd7", + "rev": "dec1098ad00f65a42e06eb2affdb0ee265e88cd5", "type": "github" }, "original": { @@ -1176,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1727193535, - "narHash": "sha256-+OXzeHgg+kErwpJI40xbIAUHZS1Ky9V3wOcfcDmCOJE=", + "lastModified": 1727210241, + "narHash": "sha256-lufS6uzSbSrggNCSgubymMQWnQMh7PvQ+lRZ8qH9Uoc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "e3d60d6c8a0ff5f9b8b7db200589524c367af2f4", + "rev": "a02fef2ece8084aff0b41700bb57d24d73574cd1", "type": "github" }, "original": { From 751f68bcde20521ae4d7eb75e7badc7bfb7ab069 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 28 Sep 2024 22:46:37 +0200 Subject: [PATCH 1984/2308] added btop to shared --- home-manager/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 8386997..5f9116c 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -25,5 +25,6 @@ sops zsh bat + btop ]; } From 2b463461fad8d1cf5423fcf8dff26add680c5d17 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 16:36:42 +0200 Subject: [PATCH 1985/2308] Update plasma manager config --- home-manager/desktop/plasma-desktop.nix | 1177 +++++++++++++++++++++++ 1 file changed, 1177 insertions(+) create mode 100644 home-manager/desktop/plasma-desktop.nix diff --git a/home-manager/desktop/plasma-desktop.nix b/home-manager/desktop/plasma-desktop.nix new file mode 100644 index 0000000..1ccfab8 --- /dev/null +++ b/home-manager/desktop/plasma-desktop.nix @@ -0,0 +1,1177 @@ +{ + programs.plasma = { + enable = true; + shortcuts = { + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; + "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; + "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; + "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; + "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; + "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; + "kmix"."decrease_volume" = "Volume Down"; + "kmix"."decrease_volume_small" = "Shift+Volume Down"; + "kmix"."increase_microphone_volume" = "Microphone Volume Up"; + "kmix"."increase_volume" = "Volume Up"; + "kmix"."increase_volume_small" = "Shift+Volume Up"; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; + "kmix"."mute" = "Volume Mute"; + "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; + "ksmserver"."Log Out" = "Ctrl+Alt+Del"; + "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; + "ksmserver"."LogOut" = "none,,Log Out"; + "ksmserver"."Reboot" = "none,,Reboot"; + "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; + "ksmserver"."Shut Down" = "none,,Shut Down"; + "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Cube" = "Meta+C,none"; + "kwin"."Cycle Overview" = []; + "kwin"."Cycle Overview Opposite" = []; + "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; + "kwin"."Edit Tiles" = "Meta+T"; + "kwin"."Expose" = "Ctrl+F9"; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; + "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."Grid View" = "Meta+G"; + "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; + "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = []; + "kwin"."MoveMouseToCenter" = "Meta+F6"; + "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; + "kwin"."Overview" = "Meta+W"; + "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; + "kwin"."Show Desktop" = "Meta+D"; + "kwin"."ShowDesktopGrid" = "Meta+F8,none"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12,none"; + "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; + "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; + "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; + "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; + "kwin"."Switch Window Down" = "Meta+Alt+Down"; + "kwin"."Switch Window Left" = "Meta+Alt+Left"; + "kwin"."Switch Window Right" = "Meta+Alt+Right"; + "kwin"."Switch Window Up" = "Meta+Alt+Up"; + "kwin"."Switch to Desktop 1" = "Ctrl+F1"; + "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; + "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; + "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; + "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; + "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; + "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; + "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; + "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; + "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; + "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; + "kwin"."Switch to Desktop 2" = "Ctrl+F2"; + "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; + "kwin"."Switch to Desktop 3" = "Ctrl+F3"; + "kwin"."Switch to Desktop 4" = "Ctrl+F4"; + "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; + "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; + "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; + "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; + "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; + "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; + "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; + "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; + "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; + "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; + "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; + "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; + "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; + "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; + "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; + "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; + "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; + "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; + "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; + "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; + "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; + "kwin"."Toggle Night Color" = []; + "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; + "kwin"."Walk Through Windows" = "Alt+Tab"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab,Alt+Shift+Tab,Walk Through Windows (Reverse)"; + "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; + "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; + "kwin"."Walk Through Windows of Current Application" = "none,Alt+`,Walk Through Windows of Current Application"; + "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; + "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; + "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; + "kwin"."Window Close" = "Alt+F4"; + "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; + "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; + "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; + "kwin"."Window Lower" = "none,,Lower Window"; + "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; + "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; + "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = "none,,Move Window"; + "kwin"."Window Move Center" = "none,,Move Window to the Center"; + "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; + "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; + "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; + "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; + "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; + "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; + "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; + "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; + "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; + "kwin"."Window Operations Menu" = "Alt+F3"; + "kwin"."Window Pack Down" = "none,,Move Window Down"; + "kwin"."Window Pack Left" = "none,,Move Window Left"; + "kwin"."Window Pack Right" = "none,,Move Window Right"; + "kwin"."Window Pack Up" = "none,,Move Window Up"; + "kwin"."Window Quick Tile Bottom" = "Meta+Down"; + "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; + "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; + "kwin"."Window Quick Tile Left" = "Meta+Left"; + "kwin"."Window Quick Tile Right" = "Meta+Right"; + "kwin"."Window Quick Tile Top" = "Meta+Up"; + "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; + "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; + "kwin"."Window Raise" = "none,,Raise Window"; + "kwin"."Window Resize" = "none,,Resize Window"; + "kwin"."Window Shade" = "none,,Shade Window"; + "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; + "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; + "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; + "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; + "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; + "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; + "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; + "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; + "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; + "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; + "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; + "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; + "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; + "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; + "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; + "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; + "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; + "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; + "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; + "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; + "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; + "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; + "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; + "kwin"."Window to Next Screen" = "none,Meta+Shift+Right,Move Window to Next Screen"; + "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; + "kwin"."Window to Previous Screen" = "none,Meta+Shift+Left,Move Window to Previous Screen"; + "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; + "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; + "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; + "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; + "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; + "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; + "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; + "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; + "kwin"."view_actual_size" = "Meta+0"; + "kwin"."view_zoom_in" = ["Meta++,Meta++" "Meta+=,Zoom In"]; + "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = "none,,Media volume down"; + "mediacontrol"."mediavolumeup" = "none,,Media volume up"; + "mediacontrol"."nextmedia" = "Media Next"; + "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = "none,,Play media playback"; + "mediacontrol"."playpausemedia" = "Media Play"; + "mediacontrol"."previousmedia" = "Media Previous"; + "mediacontrol"."stopmedia" = "Media Stop"; + "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down"; + "org_kde_powerdevil"."Hibernate" = "Hibernate"; + "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up"; + "org_kde_powerdevil"."PowerDown" = "Power Down"; + "org_kde_powerdevil"."PowerOff" = "Power Off"; + "org_kde_powerdevil"."Sleep" = "Sleep"; + "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; + "org_kde_powerdevil"."Turn Off Screen" = []; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; + "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; + "plasmashell"."activate task manager entry 1" = "Meta+1"; + "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10"; + "plasmashell"."activate task manager entry 2" = "Meta+2"; + "plasmashell"."activate task manager entry 3" = "Meta+3"; + "plasmashell"."activate task manager entry 4" = "Meta+4"; + "plasmashell"."activate task manager entry 5" = "Meta+5"; + "plasmashell"."activate task manager entry 6" = "Meta+6"; + "plasmashell"."activate task manager entry 7" = "Meta+7"; + "plasmashell"."activate task manager entry 8" = "Meta+8"; + "plasmashell"."activate task manager entry 9" = "Meta+9"; + "plasmashell"."clear-history" = "none,,Clear Clipboard History"; + "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; + "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = "none,,Next History Item"; + "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; + "plasmashell"."edit_clipboard" = []; + "plasmashell"."manage activities" = "Meta+Q"; + "plasmashell"."next activity" = "Meta+Tab,none,Walk through activities"; + "plasmashell"."previous activity" = "Meta+Shift+Tab,none,Walk through activities (Reverse)"; + "plasmashell"."repeat_action" = "Meta+Ctrl+R"; + "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = "none,,Show Barcode…"; + "plasmashell"."show-on-mouse-pos" = "Meta+V"; + "plasmashell"."stop current activity" = "Meta+S"; + "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; + "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; + "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; + "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/org.kde.spectacle.desktop"."RecordRegion" = []; + "services/org.kde.spectacle.desktop"."RecordScreen" = []; + "services/org.kde.spectacle.desktop"."RecordWindow" = []; + "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "services/org.kde.spectacle.desktop"."_launch" = "Print"; + "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; + "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; + }; + configFile = { + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 8; + "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; + "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; + "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; + "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; + "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; + "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; + "dolphinrc"."General"."RememberOpenedTabs" = false; + "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; + "dolphinrc"."IconsMode"."PreviewSize" = 80; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "dolphinrc"."PreviewSettings"."Plugins" = "mobithumbnail,fontthumbnail,ebookthumbnail,kraorathumbnail,jpegthumbnail,windowsexethumbnail,comicbookthumbnail,djvuthumbnail,opendocumentthumbnail,windowsimagethumbnail,exrthumbnail,audiothumbnail,cursorthumbnail,svgthumbnail,blenderthumbnail,gsthumbnail,rawthumbnail,ffmpegthumbs,imagethumbnail,directorythumbnail"; + "dolphinrc"."Search"."Location" = "Everywhere"; + "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "katerc"."General"."Days Meta Infos" = 30; + "katerc"."General"."Save Meta Infos" = true; + "katerc"."General"."Show Full Path in Title" = false; + "katerc"."General"."Show Menu Bar" = true; + "katerc"."General"."Show Status Bar" = true; + "katerc"."General"."Show Tab Bar" = true; + "katerc"."General"."Show Url Nav Bar" = true; + "katerc"."KTextEditor Document"."Allow End of Line Detection" = true; + "katerc"."KTextEditor Document"."Auto Detect Indent" = true; + "katerc"."KTextEditor Document"."Auto Reload If State Is In Version Control" = true; + "katerc"."KTextEditor Document"."Auto Save" = false; + "katerc"."KTextEditor Document"."Auto Save Interval" = 0; + "katerc"."KTextEditor Document"."Auto Save On Focus Out" = false; + "katerc"."KTextEditor Document"."BOM" = false; + "katerc"."KTextEditor Document"."Backup Local" = false; + "katerc"."KTextEditor Document"."Backup Prefix" = ""; + "katerc"."KTextEditor Document"."Backup Remote" = false; + "katerc"."KTextEditor Document"."Backup Suffix" = "~"; + "katerc"."KTextEditor Document"."Camel Cursor" = true; + "katerc"."KTextEditor Document"."Encoding" = "UTF-8"; + "katerc"."KTextEditor Document"."End of Line" = 0; + "katerc"."KTextEditor Document"."Indent On Backspace" = true; + "katerc"."KTextEditor Document"."Indent On Tab" = true; + "katerc"."KTextEditor Document"."Indent On Text Paste" = false; + "katerc"."KTextEditor Document"."Indentation Mode" = "normal"; + "katerc"."KTextEditor Document"."Indentation Width" = 4; + "katerc"."KTextEditor Document"."Keep Extra Spaces" = false; + "katerc"."KTextEditor Document"."Line Length Limit" = 10000; + "katerc"."KTextEditor Document"."Newline at End of File" = true; + "katerc"."KTextEditor Document"."On-The-Fly Spellcheck" = false; + "katerc"."KTextEditor Document"."Overwrite Mode" = false; + "katerc"."KTextEditor Document"."PageUp/PageDown Moves Cursor" = false; + "katerc"."KTextEditor Document"."Remove Spaces" = 1; + "katerc"."KTextEditor Document"."ReplaceTabsDyn" = true; + "katerc"."KTextEditor Document"."Show Spaces" = 0; + "katerc"."KTextEditor Document"."Show Tabs" = true; + "katerc"."KTextEditor Document"."Smart Home" = true; + "katerc"."KTextEditor Document"."Swap Directory" = ""; + "katerc"."KTextEditor Document"."Swap File Mode" = 1; + "katerc"."KTextEditor Document"."Swap Sync Interval" = 15; + "katerc"."KTextEditor Document"."Tab Handling" = 2; + "katerc"."KTextEditor Document"."Tab Width" = 4; + "katerc"."KTextEditor Document"."Trailing Marker Size" = 1; + "katerc"."KTextEditor Document"."Word Wrap" = false; + "katerc"."KTextEditor Document"."Word Wrap Column" = 80; + "katerc"."KTextEditor Editor"."Encoding Prober Type" = 1; + "katerc"."KTextEditor Editor"."Fallback Encoding" = "ISO 8859-15"; + "katerc"."KTextEditor Renderer"."Animate Bracket Matching" = false; + "katerc"."KTextEditor Renderer"."Auto Color Theme Selection" = true; + "katerc"."KTextEditor Renderer"."Color Theme" = "Catppuccin Macchiato"; + "katerc"."KTextEditor Renderer"."Font" = "Hack,10,-1,7,50,0,0,0,0,0"; + "katerc"."KTextEditor Renderer"."Line Height Multiplier" = 1; + "katerc"."KTextEditor Renderer"."Show Indentation Lines" = false; + "katerc"."KTextEditor Renderer"."Show Whole Bracket Expression" = false; + "katerc"."KTextEditor Renderer"."Word Wrap Marker" = false; + "katerc"."KTextEditor View"."Allow Mark Menu" = true; + "katerc"."KTextEditor View"."Auto Brackets" = true; + "katerc"."KTextEditor View"."Auto Center Lines" = 0; + "katerc"."KTextEditor View"."Auto Completion" = true; + "katerc"."KTextEditor View"."Auto Completion Preselect First Entry" = true; + "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; + "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; + "katerc"."KTextEditor View"."Bracket Match Preview" = false; + "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}[]'\""; + "katerc"."KTextEditor View"."Default Mark Type" = 1; + "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; + "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; + "katerc"."KTextEditor View"."Dynamic Word Wrap At Static Marker" = false; + "katerc"."KTextEditor View"."Dynamic Word Wrap Indicators" = 1; + "katerc"."KTextEditor View"."Dynamic Wrap not at word boundaries" = false; + "katerc"."KTextEditor View"."Enable Tab completion" = false; + "katerc"."KTextEditor View"."Fold First Line" = false; + "katerc"."KTextEditor View"."Folding Bar" = true; + "katerc"."KTextEditor View"."Folding Preview" = true; + "katerc"."KTextEditor View"."Icon Bar" = false; + "katerc"."KTextEditor View"."Input Mode" = 0; + "katerc"."KTextEditor View"."Keyword Completion" = true; + "katerc"."KTextEditor View"."Line Modification" = true; + "katerc"."KTextEditor View"."Line Numbers" = true; + "katerc"."KTextEditor View"."Max Clipboard History Entries" = 20; + "katerc"."KTextEditor View"."Maximum Search History Size" = 100; + "katerc"."KTextEditor View"."Mouse Paste At Cursor Position" = false; + "katerc"."KTextEditor View"."Multiple Cursor Modifier" = 134217728; + "katerc"."KTextEditor View"."Persistent Selection" = false; + "katerc"."KTextEditor View"."Scroll Bar Marks" = false; + "katerc"."KTextEditor View"."Scroll Bar Mini Map All" = true; + "katerc"."KTextEditor View"."Scroll Bar Mini Map Width" = 60; + "katerc"."KTextEditor View"."Scroll Bar MiniMap" = true; + "katerc"."KTextEditor View"."Scroll Bar Preview" = true; + "katerc"."KTextEditor View"."Scroll Past End" = false; + "katerc"."KTextEditor View"."Search/Replace Flags" = 140; + "katerc"."KTextEditor View"."Shoe Line Ending Type in Statusbar" = false; + "katerc"."KTextEditor View"."Show Documentation With Completion" = true; + "katerc"."KTextEditor View"."Show File Encoding" = true; + "katerc"."KTextEditor View"."Show Focus Frame Around Editor" = true; + "katerc"."KTextEditor View"."Show Folding Icons On Hover Only" = true; + "katerc"."KTextEditor View"."Show Line Count" = false; + "katerc"."KTextEditor View"."Show Scrollbars" = 0; + "katerc"."KTextEditor View"."Show Statusbar Dictionary" = true; + "katerc"."KTextEditor View"."Show Statusbar Highlighting Mode" = true; + "katerc"."KTextEditor View"."Show Statusbar Input Mode" = true; + "katerc"."KTextEditor View"."Show Statusbar Line Column" = true; + "katerc"."KTextEditor View"."Show Statusbar Tab Settings" = true; + "katerc"."KTextEditor View"."Show Word Count" = false; + "katerc"."KTextEditor View"."Smart Copy Cut" = true; + "katerc"."KTextEditor View"."Statusbar Line Column Compact Mode" = true; + "katerc"."KTextEditor View"."Text Drag And Drop" = true; + "katerc"."KTextEditor View"."User Sets Of Chars To Enclose Selection" = ""; + "katerc"."KTextEditor View"."Vi Input Mode Steal Keys" = false; + "katerc"."KTextEditor View"."Vi Relative Line Numbers" = false; + "katerc"."KTextEditor View"."Word Completion" = true; + "katerc"."KTextEditor View"."Word Completion Minimal Word Length" = 3; + "katerc"."KTextEditor View"."Word Completion Remove Tail" = true; + "katerc"."KTextEditor::Search"."Search History" = "uuid"; + "katerc"."filetree"."editShade" = "93,62,114"; + "katerc"."filetree"."listMode" = false; + "katerc"."filetree"."shadingEnabled" = true; + "katerc"."filetree"."showCloseButton" = false; + "katerc"."filetree"."showFullPathOnRoots" = false; + "katerc"."filetree"."showToolbar" = true; + "katerc"."filetree"."sortRole" = 0; + "katerc"."filetree"."viewShade" = "101,69,143"; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Mouse"."cursorSize" = 32; + "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "960,540"; + "kdeglobals"."General"."AccentColor" = "184,117,220"; + "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; + "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; + "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; + "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; + "kdeglobals"."KDE"."ShowDeleteCommand" = false; + "kdeglobals"."KDE"."SingleClick" = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Preview" = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; + "kdeglobals"."PreviewSettings"."MaximumRemoteSize" = 0; + "kdeglobals"."WM"."activeBackground" = "49,54,59"; + "kdeglobals"."WM"."activeBlend" = "252,252,252"; + "kdeglobals"."WM"."activeForeground" = "252,252,252"; + "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; + "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; + "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; + "khotkeysrc"."Data"."DataCount" = 3; + "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; + "khotkeysrc"."Data_1"."DataCount" = 1; + "khotkeysrc"."Data_1"."Enabled" = true; + "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; + "khotkeysrc"."Data_1"."SystemGroup" = 1; + "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1"."Comment" = "Comment"; + "khotkeysrc"."Data_1_1"."Enabled" = true; + "khotkeysrc"."Data_1_1"."Name" = "Search"; + "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; + "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; + "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; + "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; + "khotkeysrc"."Data_2"."DataCount" = 8; + "khotkeysrc"."Data_2"."Enabled" = false; + "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; + "khotkeysrc"."Data_2"."Name" = "Examples"; + "khotkeysrc"."Data_2"."SystemGroup" = 0; + "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; + "khotkeysrc"."Data_2_1"."Enabled" = false; + "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; + "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; + "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; + "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; + "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; + "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; + "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; + "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; + "khotkeysrc"."Data_2_2"."Enabled" = false; + "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; + "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; + "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; + "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; + "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; + "khotkeysrc"."Data_2_3"."Enabled" = false; + "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; + "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; + "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; + "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; + "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; + "khotkeysrc"."Data_2_4"."Enabled" = false; + "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; + "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; + "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; + "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; + "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; + "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; + "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; + "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; + "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; + "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; + "khotkeysrc"."Data_2_5"."Enabled" = false; + "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; + "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; + "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; + "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; + "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; + "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; + "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; + "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; + "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; + "khotkeysrc"."Data_2_6"."Enabled" = false; + "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; + "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; + "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; + "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; + "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; + "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; + "khotkeysrc"."Data_2_7"."DataCount" = 4; + "khotkeysrc"."Data_2_7"."Enabled" = false; + "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; + "khotkeysrc"."Data_2_7"."SystemGroup" = 0; + "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_7_1"."Comment" = ""; + "khotkeysrc"."Data_2_7_1"."Enabled" = false; + "khotkeysrc"."Data_2_7_1"."Name" = "Back"; + "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2"."Comment" = ""; + "khotkeysrc"."Data_2_7_2"."Enabled" = false; + "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; + "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3"."Comment" = ""; + "khotkeysrc"."Data_2_7_3"."Enabled" = false; + "khotkeysrc"."Data_2_7_3"."Name" = "Up"; + "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4"."Comment" = ""; + "khotkeysrc"."Data_2_7_4"."Enabled" = false; + "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; + "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; + "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; + "khotkeysrc"."Data_2_8"."Enabled" = false; + "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; + "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; + "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; + "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; + "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; + "khotkeysrc"."Data_3"."DataCount" = 14; + "khotkeysrc"."Data_3"."Enabled" = true; + "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; + "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; + "khotkeysrc"."Data_3"."SystemGroup" = 0; + "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konquerors"; + "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; + "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; + "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; + "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; + "khotkeysrc"."Data_3_1"."Enabled" = true; + "khotkeysrc"."Data_3_1"."Name" = "Back"; + "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; + "khotkeysrc"."Data_3_10"."Enabled" = false; + "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; + "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; + "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; + "khotkeysrc"."Data_3_11"."Enabled" = true; + "khotkeysrc"."Data_3_11"."Name" = "Up"; + "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; + "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; + "khotkeysrc"."Data_3_12"."Enabled" = false; + "khotkeysrc"."Data_3_12"."Name" = "Up #2"; + "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; + "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; + "khotkeysrc"."Data_3_13"."Enabled" = true; + "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; + "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; + "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; + "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; + "khotkeysrc"."Data_3_14"."Enabled" = true; + "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; + "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; + "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; + "khotkeysrc"."Data_3_2"."Enabled" = true; + "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; + "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; + "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; + "khotkeysrc"."Data_3_3"."Enabled" = true; + "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; + "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; + "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; + "khotkeysrc"."Data_3_4"."Enabled" = true; + "khotkeysrc"."Data_3_4"."Name" = "Forward"; + "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; + "khotkeysrc"."Data_3_5"."Enabled" = true; + "khotkeysrc"."Data_3_5"."Name" = "Home"; + "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; + "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; + "khotkeysrc"."Data_3_6"."Enabled" = true; + "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; + "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; + "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; + "khotkeysrc"."Data_3_7"."Enabled" = true; + "khotkeysrc"."Data_3_7"."Name" = "New Tab"; + "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; + "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; + "khotkeysrc"."Data_3_8"."Enabled" = true; + "khotkeysrc"."Data_3_8"."Name" = "New Window"; + "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; + "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; + "khotkeysrc"."Data_3_9"."Enabled" = true; + "khotkeysrc"."Data_3_9"."Name" = "Reload"; + "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; + "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions" = ""; + "khotkeysrc"."General"."BrowserApplication" = ""; + "khotkeysrc"."Gestures"."Disabled" = true; + "khotkeysrc"."Gestures"."MouseButton" = 2; + "khotkeysrc"."Gestures"."Timeout" = 300; + "khotkeysrc"."GesturesExclude"."Comment" = ""; + "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; + "khotkeysrc"."KDE"."AnimationDurationFactor" = ""; + "khotkeysrc"."KDE"."ShowDeleteCommand" = ""; + "khotkeysrc"."KDE"."SingleClick" = ""; + "khotkeysrc"."KDE"."widgetStyle" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size" = ""; + "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; + "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."PreviewSettings"."MaximumRemoteSize" = ""; + "khotkeysrc"."Voice"."Shortcut" = ""; + "khotkeysrc"."WM"."activeBackground" = ""; + "khotkeysrc"."WM"."activeBlend" = ""; + "khotkeysrc"."WM"."activeForeground" = ""; + "khotkeysrc"."WM"."inactiveBackground" = ""; + "khotkeysrc"."WM"."inactiveBlend" = ""; + "khotkeysrc"."WM"."inactiveForeground" = ""; + "kiorc"."Confirmations"."ConfirmDelete" = true; + "kiorc"."Confirmations"."ConfirmEmptyTrash" = true; + "kiorc"."Confirmations"."ConfirmTrash" = false; + "kiorc"."Executable scripts"."behaviourOnLaunch" = "alwaysAsk"; + "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "krunnerrc"."Plugins"."locationsEnabled" = true; + "krunnerrc"."Plugins"."placesEnabled" = true; + "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; + "kservicemenurc"."Show"."compressfileitemaction" = true; + "kservicemenurc"."Show"."extractfileitemaction" = true; + "kservicemenurc"."Show"."forgetfileitemaction" = true; + "kservicemenurc"."Show"."installFont" = true; + "kservicemenurc"."Show"."kactivitymanagerd_fileitem_linking_plugin" = true; + "kservicemenurc"."Show"."kdeconnectfileitemaction" = true; + "kservicemenurc"."Show"."kio-admin" = true; + "kservicemenurc"."Show"."mountisoaction" = true; + "kservicemenurc"."Show"."nextclouddolphinactionplugin" = true; + "kservicemenurc"."Show"."runInKonsole" = true; + "kservicemenurc"."Show"."setAsWallpaper" = true; + "kservicemenurc"."Show"."slideshowfileitemaction" = true; + "kservicemenurc"."Show"."tagsfileitemaction" = true; + "ksmserverrc"."General"."loginMode" = "restoreSavedSession"; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; + "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; + "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; + "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; + "kwinrc"."Desktops"."Number" = 4; + "kwinrc"."Desktops"."Rows" = 2; + "kwinrc"."Effect-diminactive"."Strength" = 15; + "kwinrc"."Effect-magiclamp"."AnimationDuration" = 20; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; + "kwinrc"."NightColor"."LongitudeFixed" = 5.44; + "kwinrc"."NightColor"."Mode" = "Location"; + "kwinrc"."NightColor"."NightTemperature" = 1400; + "kwinrc"."Plugins"."diminactiveEnabled" = true; + "kwinrc"."Plugins"."dimscreenEnabled" = true; + "kwinrc"."Plugins"."wobblywindowsEnabled" = true; + "kwinrc"."Tiling"."padding" = 0; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"layoutDirection\":\"vertical\",\"tiles\":x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d}x5d,\"width\":1}x5d}"; + "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}"; + "kwinrc"."Tiling/98e47fc8-bbb3-5a3a-b6a8-d051b513a983"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5005208333333331},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.4994791666666665}]}"; + "kwinrc"."Xwayland"."Scale" = 1; + "kxkbrc"."Layout"."Options" = "compose:caps"; + "kxkbrc"."Layout"."ResetOldOptions" = true; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "plasmanotifyrc"."Applications/firefox"."Seen" = true; + "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; + "plasmarc"."Wallpapers"."usersWallpapers" = ""; + "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; + "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; + }; + dataFile = { + "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true; + "kate/anonymous.katesession"."Document 0"."Bookmarks" = ""; + "kate/anonymous.katesession"."Document 0"."Encoding" = "UTF-8"; + "kate/anonymous.katesession"."Document 0"."Highlighting" = "None"; + "kate/anonymous.katesession"."Document 0"."Highlighting Set By User" = false; + "kate/anonymous.katesession"."Document 0"."Indentation Mode" = "normal"; + "kate/anonymous.katesession"."Document 0"."Mode" = "Normal"; + "kate/anonymous.katesession"."Document 0"."Mode Set By User" = false; + "kate/anonymous.katesession"."Document 0"."URL" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false; + "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."externaltoolsplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."formatplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katebacktracebrowserplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katebuildplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katecloseexceptplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katecolorpickerplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katectagsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katefilebrowserplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katefiletreeplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."kategdbplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."kategitblameplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katekonsoleplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."kateprojectplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."katereplicodeplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesearchplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."katesnippetsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesqlplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesymbolviewerplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katexmlcheckplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katexmltoolsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."keyboardmacrosplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."ktexteditorpreviewplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."latexcompletionplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."lspclientplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."openlinkplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false; + "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; + "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = ""; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = ""; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 1874; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 1634; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,927,0"; + "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0"; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 1874; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Active View" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":[]}"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; + "kate/anonymous.katesession"."Open Documents"."Count" = 1; + "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; + "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentExcludeFilter" = "-1"; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentFilter" = "-1"; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExcludeFilters" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExpandSearchResults" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Filters" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."FollowSymLink" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."HiddenFiles" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."MatchCase" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Place" = 1; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Recursive" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Replaces" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Search" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeAllProjects" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeCurrentFile" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeFolder" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeOpenFiles" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeProject" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiles" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiless" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."UseRegExp" = false; + }; + }; +} From a7982d282ae729bc54b5330958c498a92e57fdaa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 16:46:16 +0200 Subject: [PATCH 1986/2308] Wrong place for it oops --- .../package-configs/plasma-desktop.nix | 558 +++++--- home-manager/desktop/plasma-desktop.nix | 1177 ----------------- 2 files changed, 408 insertions(+), 1327 deletions(-) delete mode 100644 home-manager/desktop/plasma-desktop.nix diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 5d68046..1ccfab8 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -8,7 +8,7 @@ "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; @@ -16,27 +16,28 @@ "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = []; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = []; - "ksmserver"."Reboot" = []; - "ksmserver"."Reboot Without Confirmation" = []; - "ksmserver"."Shut Down" = []; + "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; + "ksmserver"."LogOut" = "none,,Log Out"; + "ksmserver"."Reboot" = "none,,Reboot"; + "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; + "ksmserver"."Shut Down" = "none,,Shut Down"; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cube" = "Meta+C"; + "kwin"."Cube" = "Meta+C,none"; "kwin"."Cycle Overview" = []; "kwin"."Cycle Overview Opposite" = []; - "kwin"."Decrease Opacity" = []; + "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = []; "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = []; + "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; @@ -46,10 +47,10 @@ "kwin"."MoveZoomRight" = []; "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = []; + "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12"; + "kwin"."ShowDesktopGrid" = "Meta+F8,none"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12,none"; "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; @@ -59,136 +60,136 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = []; - "kwin"."Switch to Desktop 11" = []; - "kwin"."Switch to Desktop 12" = []; - "kwin"."Switch to Desktop 13" = []; - "kwin"."Switch to Desktop 14" = []; - "kwin"."Switch to Desktop 15" = []; - "kwin"."Switch to Desktop 16" = []; - "kwin"."Switch to Desktop 17" = []; - "kwin"."Switch to Desktop 18" = []; - "kwin"."Switch to Desktop 19" = []; + "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; + "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; + "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; + "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; + "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; + "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; + "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; + "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; + "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; + "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = []; + "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = []; - "kwin"."Switch to Desktop 6" = []; - "kwin"."Switch to Desktop 7" = []; - "kwin"."Switch to Desktop 8" = []; - "kwin"."Switch to Desktop 9" = []; - "kwin"."Switch to Next Desktop" = []; - "kwin"."Switch to Next Screen" = []; - "kwin"."Switch to Previous Desktop" = []; - "kwin"."Switch to Previous Screen" = []; - "kwin"."Switch to Screen 0" = []; - "kwin"."Switch to Screen 1" = []; - "kwin"."Switch to Screen 2" = []; - "kwin"."Switch to Screen 3" = []; - "kwin"."Switch to Screen 4" = []; - "kwin"."Switch to Screen 5" = []; - "kwin"."Switch to Screen 6" = []; - "kwin"."Switch to Screen 7" = []; - "kwin"."Switch to Screen Above" = []; - "kwin"."Switch to Screen Below" = []; - "kwin"."Switch to Screen to the Left" = []; - "kwin"."Switch to Screen to the Right" = []; + "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; + "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; + "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; + "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; + "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; + "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; + "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; + "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; + "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; + "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; + "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; + "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; + "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; + "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; + "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; + "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; + "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; + "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; + "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; + "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; + "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = []; + "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; "kwin"."Walk Through Desktop List" = []; "kwin"."Walk Through Desktop List (Reverse)" = []; "kwin"."Walk Through Desktops" = []; "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = []; - "kwin"."Walk Through Windows Alternative (Reverse)" = []; - "kwin"."Walk Through Windows of Current Application" = []; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab,Alt+Shift+Tab,Walk Through Windows (Reverse)"; + "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; + "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; + "kwin"."Walk Through Windows of Current Application" = "none,Alt+`,Walk Through Windows of Current Application"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = []; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; - "kwin"."Window Above Other Windows" = []; - "kwin"."Window Below Other Windows" = []; + "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; + "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; + "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = []; - "kwin"."Window Grow Horizontal" = []; - "kwin"."Window Grow Vertical" = []; - "kwin"."Window Lower" = []; + "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; + "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; + "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; + "kwin"."Window Lower" = "none,,Lower Window"; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = []; - "kwin"."Window Maximize Vertical" = []; + "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; + "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = []; - "kwin"."Window Move Center" = []; - "kwin"."Window No Border" = []; - "kwin"."Window On All Desktops" = []; + "kwin"."Window Move" = "none,,Move Window"; + "kwin"."Window Move Center" = "none,,Move Window to the Center"; + "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; + "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = []; - "kwin"."Window One Screen Up" = []; - "kwin"."Window One Screen to the Left" = []; - "kwin"."Window One Screen to the Right" = []; + "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; + "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; + "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; + "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = []; - "kwin"."Window Pack Left" = []; - "kwin"."Window Pack Right" = []; - "kwin"."Window Pack Up" = []; + "kwin"."Window Pack Down" = "none,,Move Window Down"; + "kwin"."Window Pack Left" = "none,,Move Window Left"; + "kwin"."Window Pack Right" = "none,,Move Window Right"; + "kwin"."Window Pack Up" = "none,,Move Window Up"; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = []; - "kwin"."Window Quick Tile Bottom Right" = []; + "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; + "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = []; - "kwin"."Window Quick Tile Top Right" = []; - "kwin"."Window Raise" = []; - "kwin"."Window Resize" = []; - "kwin"."Window Shade" = []; - "kwin"."Window Shrink Horizontal" = []; - "kwin"."Window Shrink Vertical" = []; - "kwin"."Window to Desktop 1" = []; - "kwin"."Window to Desktop 10" = []; - "kwin"."Window to Desktop 11" = []; - "kwin"."Window to Desktop 12" = []; - "kwin"."Window to Desktop 13" = []; - "kwin"."Window to Desktop 14" = []; - "kwin"."Window to Desktop 15" = []; - "kwin"."Window to Desktop 16" = []; - "kwin"."Window to Desktop 17" = []; - "kwin"."Window to Desktop 18" = []; - "kwin"."Window to Desktop 19" = []; - "kwin"."Window to Desktop 2" = []; - "kwin"."Window to Desktop 20" = []; - "kwin"."Window to Desktop 3" = []; - "kwin"."Window to Desktop 4" = []; - "kwin"."Window to Desktop 5" = []; - "kwin"."Window to Desktop 6" = []; - "kwin"."Window to Desktop 7" = []; - "kwin"."Window to Desktop 8" = []; - "kwin"."Window to Desktop 9" = []; - "kwin"."Window to Next Desktop" = []; - "kwin"."Window to Next Screen" = []; - "kwin"."Window to Previous Desktop" = []; - "kwin"."Window to Previous Screen" = []; - "kwin"."Window to Screen 0" = []; - "kwin"."Window to Screen 1" = []; - "kwin"."Window to Screen 2" = []; - "kwin"."Window to Screen 3" = []; - "kwin"."Window to Screen 4" = []; - "kwin"."Window to Screen 5" = []; - "kwin"."Window to Screen 6" = []; - "kwin"."Window to Screen 7" = []; + "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; + "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; + "kwin"."Window Raise" = "none,,Raise Window"; + "kwin"."Window Resize" = "none,,Resize Window"; + "kwin"."Window Shade" = "none,,Shade Window"; + "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; + "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; + "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; + "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; + "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; + "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; + "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; + "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; + "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; + "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; + "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; + "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; + "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; + "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; + "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; + "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; + "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; + "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; + "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; + "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; + "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; + "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; + "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; + "kwin"."Window to Next Screen" = "none,Meta+Shift+Right,Move Window to Next Screen"; + "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; + "kwin"."Window to Previous Screen" = "none,Meta+Shift+Left,Move Window to Previous Screen"; + "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; + "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; + "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; + "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; + "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; + "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; + "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; + "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = "Meta++"; + "kwin"."view_zoom_in" = ["Meta++,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = []; - "mediacontrol"."mediavolumeup" = []; + "mediacontrol"."mediavolumedown" = "none,,Media volume down"; + "mediacontrol"."mediavolumeup" = "none,,Media volume up"; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = []; + "mediacontrol"."playmedia" = "none,,Play media playback"; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; @@ -204,9 +205,10 @@ "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = []; - "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"]; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; + "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = []; + "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10"; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -215,23 +217,23 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = []; + "plasmashell"."clear-history" = "none,,Clear Clipboard History"; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = []; - "plasmashell"."cyclePrevAction" = []; + "plasmashell"."cycleNextAction" = "none,,Next History Item"; + "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = "Meta+Tab"; - "plasmashell"."previous activity" = "Meta+Shift+Tab"; + "plasmashell"."next activity" = "Meta+Tab,none,Walk through activities"; + "plasmashell"."previous activity" = "Meta+Shift+Tab,none,Walk through activities (Reverse)"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = []; + "plasmashell"."show-barcode" = "none,,Show Barcode…"; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = []; - "plasmashell"."switch to previous activity" = []; - "plasmashell"."toggle do not disturb" = []; + "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; + "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; + "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; @@ -244,22 +246,22 @@ "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { @@ -268,8 +270,12 @@ "baloofilerc"."General"."exclude filters version" = 8; "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; - "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; + "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; + "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; + "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; + "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; "dolphinrc"."IconsMode"."PreviewSize" = 80; "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; @@ -278,6 +284,128 @@ "dolphinrc"."Search"."Location" = "Everywhere"; "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "katerc"."General"."Days Meta Infos" = 30; + "katerc"."General"."Save Meta Infos" = true; + "katerc"."General"."Show Full Path in Title" = false; + "katerc"."General"."Show Menu Bar" = true; + "katerc"."General"."Show Status Bar" = true; + "katerc"."General"."Show Tab Bar" = true; + "katerc"."General"."Show Url Nav Bar" = true; + "katerc"."KTextEditor Document"."Allow End of Line Detection" = true; + "katerc"."KTextEditor Document"."Auto Detect Indent" = true; + "katerc"."KTextEditor Document"."Auto Reload If State Is In Version Control" = true; + "katerc"."KTextEditor Document"."Auto Save" = false; + "katerc"."KTextEditor Document"."Auto Save Interval" = 0; + "katerc"."KTextEditor Document"."Auto Save On Focus Out" = false; + "katerc"."KTextEditor Document"."BOM" = false; + "katerc"."KTextEditor Document"."Backup Local" = false; + "katerc"."KTextEditor Document"."Backup Prefix" = ""; + "katerc"."KTextEditor Document"."Backup Remote" = false; + "katerc"."KTextEditor Document"."Backup Suffix" = "~"; + "katerc"."KTextEditor Document"."Camel Cursor" = true; + "katerc"."KTextEditor Document"."Encoding" = "UTF-8"; + "katerc"."KTextEditor Document"."End of Line" = 0; + "katerc"."KTextEditor Document"."Indent On Backspace" = true; + "katerc"."KTextEditor Document"."Indent On Tab" = true; + "katerc"."KTextEditor Document"."Indent On Text Paste" = false; + "katerc"."KTextEditor Document"."Indentation Mode" = "normal"; + "katerc"."KTextEditor Document"."Indentation Width" = 4; + "katerc"."KTextEditor Document"."Keep Extra Spaces" = false; + "katerc"."KTextEditor Document"."Line Length Limit" = 10000; + "katerc"."KTextEditor Document"."Newline at End of File" = true; + "katerc"."KTextEditor Document"."On-The-Fly Spellcheck" = false; + "katerc"."KTextEditor Document"."Overwrite Mode" = false; + "katerc"."KTextEditor Document"."PageUp/PageDown Moves Cursor" = false; + "katerc"."KTextEditor Document"."Remove Spaces" = 1; + "katerc"."KTextEditor Document"."ReplaceTabsDyn" = true; + "katerc"."KTextEditor Document"."Show Spaces" = 0; + "katerc"."KTextEditor Document"."Show Tabs" = true; + "katerc"."KTextEditor Document"."Smart Home" = true; + "katerc"."KTextEditor Document"."Swap Directory" = ""; + "katerc"."KTextEditor Document"."Swap File Mode" = 1; + "katerc"."KTextEditor Document"."Swap Sync Interval" = 15; + "katerc"."KTextEditor Document"."Tab Handling" = 2; + "katerc"."KTextEditor Document"."Tab Width" = 4; + "katerc"."KTextEditor Document"."Trailing Marker Size" = 1; + "katerc"."KTextEditor Document"."Word Wrap" = false; + "katerc"."KTextEditor Document"."Word Wrap Column" = 80; + "katerc"."KTextEditor Editor"."Encoding Prober Type" = 1; + "katerc"."KTextEditor Editor"."Fallback Encoding" = "ISO 8859-15"; + "katerc"."KTextEditor Renderer"."Animate Bracket Matching" = false; + "katerc"."KTextEditor Renderer"."Auto Color Theme Selection" = true; + "katerc"."KTextEditor Renderer"."Color Theme" = "Catppuccin Macchiato"; + "katerc"."KTextEditor Renderer"."Font" = "Hack,10,-1,7,50,0,0,0,0,0"; + "katerc"."KTextEditor Renderer"."Line Height Multiplier" = 1; + "katerc"."KTextEditor Renderer"."Show Indentation Lines" = false; + "katerc"."KTextEditor Renderer"."Show Whole Bracket Expression" = false; + "katerc"."KTextEditor Renderer"."Word Wrap Marker" = false; + "katerc"."KTextEditor View"."Allow Mark Menu" = true; + "katerc"."KTextEditor View"."Auto Brackets" = true; + "katerc"."KTextEditor View"."Auto Center Lines" = 0; + "katerc"."KTextEditor View"."Auto Completion" = true; + "katerc"."KTextEditor View"."Auto Completion Preselect First Entry" = true; + "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; + "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; + "katerc"."KTextEditor View"."Bracket Match Preview" = false; + "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}[]'\""; + "katerc"."KTextEditor View"."Default Mark Type" = 1; + "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; + "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; + "katerc"."KTextEditor View"."Dynamic Word Wrap At Static Marker" = false; + "katerc"."KTextEditor View"."Dynamic Word Wrap Indicators" = 1; + "katerc"."KTextEditor View"."Dynamic Wrap not at word boundaries" = false; + "katerc"."KTextEditor View"."Enable Tab completion" = false; + "katerc"."KTextEditor View"."Fold First Line" = false; + "katerc"."KTextEditor View"."Folding Bar" = true; + "katerc"."KTextEditor View"."Folding Preview" = true; + "katerc"."KTextEditor View"."Icon Bar" = false; + "katerc"."KTextEditor View"."Input Mode" = 0; + "katerc"."KTextEditor View"."Keyword Completion" = true; + "katerc"."KTextEditor View"."Line Modification" = true; + "katerc"."KTextEditor View"."Line Numbers" = true; + "katerc"."KTextEditor View"."Max Clipboard History Entries" = 20; + "katerc"."KTextEditor View"."Maximum Search History Size" = 100; + "katerc"."KTextEditor View"."Mouse Paste At Cursor Position" = false; + "katerc"."KTextEditor View"."Multiple Cursor Modifier" = 134217728; + "katerc"."KTextEditor View"."Persistent Selection" = false; + "katerc"."KTextEditor View"."Scroll Bar Marks" = false; + "katerc"."KTextEditor View"."Scroll Bar Mini Map All" = true; + "katerc"."KTextEditor View"."Scroll Bar Mini Map Width" = 60; + "katerc"."KTextEditor View"."Scroll Bar MiniMap" = true; + "katerc"."KTextEditor View"."Scroll Bar Preview" = true; + "katerc"."KTextEditor View"."Scroll Past End" = false; + "katerc"."KTextEditor View"."Search/Replace Flags" = 140; + "katerc"."KTextEditor View"."Shoe Line Ending Type in Statusbar" = false; + "katerc"."KTextEditor View"."Show Documentation With Completion" = true; + "katerc"."KTextEditor View"."Show File Encoding" = true; + "katerc"."KTextEditor View"."Show Focus Frame Around Editor" = true; + "katerc"."KTextEditor View"."Show Folding Icons On Hover Only" = true; + "katerc"."KTextEditor View"."Show Line Count" = false; + "katerc"."KTextEditor View"."Show Scrollbars" = 0; + "katerc"."KTextEditor View"."Show Statusbar Dictionary" = true; + "katerc"."KTextEditor View"."Show Statusbar Highlighting Mode" = true; + "katerc"."KTextEditor View"."Show Statusbar Input Mode" = true; + "katerc"."KTextEditor View"."Show Statusbar Line Column" = true; + "katerc"."KTextEditor View"."Show Statusbar Tab Settings" = true; + "katerc"."KTextEditor View"."Show Word Count" = false; + "katerc"."KTextEditor View"."Smart Copy Cut" = true; + "katerc"."KTextEditor View"."Statusbar Line Column Compact Mode" = true; + "katerc"."KTextEditor View"."Text Drag And Drop" = true; + "katerc"."KTextEditor View"."User Sets Of Chars To Enclose Selection" = ""; + "katerc"."KTextEditor View"."Vi Input Mode Steal Keys" = false; + "katerc"."KTextEditor View"."Vi Relative Line Numbers" = false; + "katerc"."KTextEditor View"."Word Completion" = true; + "katerc"."KTextEditor View"."Word Completion Minimal Word Length" = 3; + "katerc"."KTextEditor View"."Word Completion Remove Tail" = true; + "katerc"."KTextEditor::Search"."Search History" = "uuid"; + "katerc"."filetree"."editShade" = "93,62,114"; + "katerc"."filetree"."listMode" = false; + "katerc"."filetree"."shadingEnabled" = true; + "katerc"."filetree"."showCloseButton" = false; + "katerc"."filetree"."showFullPathOnRoots" = false; + "katerc"."filetree"."showToolbar" = true; + "katerc"."filetree"."sortRole" = 0; + "katerc"."filetree"."viewShade" = "101,69,143"; "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; @@ -289,6 +417,7 @@ "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "960,540"; "kdeglobals"."General"."AccentColor" = "184,117,220"; "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; @@ -322,17 +451,6 @@ "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; - "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; - "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; - "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; - "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; - "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; - "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; - "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; - "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; - "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; - "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "KDE Power Management System"; - "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "plasmashell"; "khotkeysrc"."Data"."DataCount" = 3; "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; "khotkeysrc"."Data_1"."DataCount" = 1; @@ -876,6 +994,7 @@ "kservicemenurc"."Show"."setAsWallpaper" = true; "kservicemenurc"."Show"."slideshowfileitemaction" = true; "kservicemenurc"."Show"."tagsfileitemaction" = true; + "ksmserverrc"."General"."loginMode" = "restoreSavedSession"; "kwalletrc"."Wallet"."First Use" = false; "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; @@ -900,6 +1019,7 @@ "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}"; + "kwinrc"."Tiling/98e47fc8-bbb3-5a3a-b6a8-d051b513a983"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5005208333333331},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.4994791666666665}]}"; "kwinrc"."Xwayland"."Scale" = 1; "kxkbrc"."Layout"."Options" = "compose:caps"; "kxkbrc"."Layout"."ResetOldOptions" = true; @@ -912,8 +1032,146 @@ "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "plasmanotifyrc"."Applications/firefox"."Seen" = true; + "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; "plasmarc"."Wallpapers"."usersWallpapers" = ""; + "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; + "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; }; + dataFile = { + "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true; + "kate/anonymous.katesession"."Document 0"."Bookmarks" = ""; + "kate/anonymous.katesession"."Document 0"."Encoding" = "UTF-8"; + "kate/anonymous.katesession"."Document 0"."Highlighting" = "None"; + "kate/anonymous.katesession"."Document 0"."Highlighting Set By User" = false; + "kate/anonymous.katesession"."Document 0"."Indentation Mode" = "normal"; + "kate/anonymous.katesession"."Document 0"."Mode" = "Normal"; + "kate/anonymous.katesession"."Document 0"."Mode Set By User" = false; + "kate/anonymous.katesession"."Document 0"."URL" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false; + "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."externaltoolsplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."formatplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katebacktracebrowserplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katebuildplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katecloseexceptplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katecolorpickerplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katectagsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katefilebrowserplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katefiletreeplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."kategdbplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."kategitblameplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katekonsoleplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."kateprojectplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."katereplicodeplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesearchplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."katesnippetsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesqlplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesymbolviewerplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katexmlcheckplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katexmltoolsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."keyboardmacrosplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."ktexteditorpreviewplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."latexcompletionplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."lspclientplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."openlinkplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false; + "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; + "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = ""; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = ""; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 1874; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 1634; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,927,0"; + "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0"; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 1874; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Active View" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":[]}"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; + "kate/anonymous.katesession"."Open Documents"."Count" = 1; + "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; + "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentExcludeFilter" = "-1"; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentFilter" = "-1"; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExcludeFilters" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExpandSearchResults" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Filters" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."FollowSymLink" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."HiddenFiles" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."MatchCase" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Place" = 1; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Recursive" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Replaces" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Search" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeAllProjects" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeCurrentFile" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeFolder" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeOpenFiles" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeProject" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiles" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiless" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."UseRegExp" = false; + }; }; } diff --git a/home-manager/desktop/plasma-desktop.nix b/home-manager/desktop/plasma-desktop.nix deleted file mode 100644 index 1ccfab8..0000000 --- a/home-manager/desktop/plasma-desktop.nix +++ /dev/null @@ -1,1177 +0,0 @@ -{ - programs.plasma = { - enable = true; - shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; - "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; - "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; - "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; - "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; - "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; - "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; - "kmix"."decrease_volume" = "Volume Down"; - "kmix"."decrease_volume_small" = "Shift+Volume Down"; - "kmix"."increase_microphone_volume" = "Microphone Volume Up"; - "kmix"."increase_volume" = "Volume Up"; - "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; - "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; - "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; - "ksmserver"."LogOut" = "none,,Log Out"; - "ksmserver"."Reboot" = "none,,Reboot"; - "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; - "ksmserver"."Shut Down" = "none,,Shut Down"; - "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cube" = "Meta+C,none"; - "kwin"."Cycle Overview" = []; - "kwin"."Cycle Overview Opposite" = []; - "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; - "kwin"."Edit Tiles" = "Meta+T"; - "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; - "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = []; - "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; - "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = []; - "kwin"."MoveMouseToCenter" = "Meta+F6"; - "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = []; - "kwin"."MoveZoomLeft" = []; - "kwin"."MoveZoomRight" = []; - "kwin"."MoveZoomUp" = []; - "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; - "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8,none"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12,none"; - "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; - "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; - "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; - "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; - "kwin"."Switch Window Down" = "Meta+Alt+Down"; - "kwin"."Switch Window Left" = "Meta+Alt+Left"; - "kwin"."Switch Window Right" = "Meta+Alt+Right"; - "kwin"."Switch Window Up" = "Meta+Alt+Up"; - "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; - "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; - "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; - "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; - "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; - "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; - "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; - "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; - "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; - "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; - "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; - "kwin"."Switch to Desktop 3" = "Ctrl+F3"; - "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; - "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; - "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; - "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; - "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; - "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; - "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; - "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; - "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; - "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; - "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; - "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; - "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; - "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; - "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; - "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; - "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; - "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; - "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; - "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; - "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; - "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; - "kwin"."Walk Through Desktop List" = []; - "kwin"."Walk Through Desktop List (Reverse)" = []; - "kwin"."Walk Through Desktops" = []; - "kwin"."Walk Through Desktops (Reverse)" = []; - "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab,Alt+Shift+Tab,Walk Through Windows (Reverse)"; - "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; - "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; - "kwin"."Walk Through Windows of Current Application" = "none,Alt+`,Walk Through Windows of Current Application"; - "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; - "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; - "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; - "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; - "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; - "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; - "kwin"."Window Lower" = "none,,Lower Window"; - "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; - "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; - "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = "none,,Move Window"; - "kwin"."Window Move Center" = "none,,Move Window to the Center"; - "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; - "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; - "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; - "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; - "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; - "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; - "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; - "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; - "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; - "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = "none,,Move Window Down"; - "kwin"."Window Pack Left" = "none,,Move Window Left"; - "kwin"."Window Pack Right" = "none,,Move Window Right"; - "kwin"."Window Pack Up" = "none,,Move Window Up"; - "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; - "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; - "kwin"."Window Quick Tile Left" = "Meta+Left"; - "kwin"."Window Quick Tile Right" = "Meta+Right"; - "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; - "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; - "kwin"."Window Raise" = "none,,Raise Window"; - "kwin"."Window Resize" = "none,,Resize Window"; - "kwin"."Window Shade" = "none,,Shade Window"; - "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; - "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; - "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; - "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; - "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; - "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; - "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; - "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; - "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; - "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; - "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; - "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; - "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; - "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; - "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; - "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; - "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; - "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; - "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; - "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; - "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; - "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; - "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; - "kwin"."Window to Next Screen" = "none,Meta+Shift+Right,Move Window to Next Screen"; - "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; - "kwin"."Window to Previous Screen" = "none,Meta+Shift+Left,Move Window to Previous Screen"; - "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; - "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; - "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; - "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; - "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; - "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; - "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; - "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; - "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["Meta++,Meta++" "Meta+=,Zoom In"]; - "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = "none,,Media volume down"; - "mediacontrol"."mediavolumeup" = "none,,Media volume up"; - "mediacontrol"."nextmedia" = "Media Next"; - "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = "none,,Play media playback"; - "mediacontrol"."playpausemedia" = "Media Play"; - "mediacontrol"."previousmedia" = "Media Previous"; - "mediacontrol"."stopmedia" = "Media Stop"; - "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; - "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; - "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down"; - "org_kde_powerdevil"."Hibernate" = "Hibernate"; - "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; - "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; - "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up"; - "org_kde_powerdevil"."PowerDown" = "Power Down"; - "org_kde_powerdevil"."PowerOff" = "Power Off"; - "org_kde_powerdevil"."Sleep" = "Sleep"; - "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = []; - "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; - "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; - "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10"; - "plasmashell"."activate task manager entry 2" = "Meta+2"; - "plasmashell"."activate task manager entry 3" = "Meta+3"; - "plasmashell"."activate task manager entry 4" = "Meta+4"; - "plasmashell"."activate task manager entry 5" = "Meta+5"; - "plasmashell"."activate task manager entry 6" = "Meta+6"; - "plasmashell"."activate task manager entry 7" = "Meta+7"; - "plasmashell"."activate task manager entry 8" = "Meta+8"; - "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = "none,,Clear Clipboard History"; - "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; - "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = "none,,Next History Item"; - "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; - "plasmashell"."edit_clipboard" = []; - "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = "Meta+Tab,none,Walk through activities"; - "plasmashell"."previous activity" = "Meta+Shift+Tab,none,Walk through activities (Reverse)"; - "plasmashell"."repeat_action" = "Meta+Ctrl+R"; - "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = "none,,Show Barcode…"; - "plasmashell"."show-on-mouse-pos" = "Meta+V"; - "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; - "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; - "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; - "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; - "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; - "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/org.kde.spectacle.desktop"."RecordRegion" = []; - "services/org.kde.spectacle.desktop"."RecordScreen" = []; - "services/org.kde.spectacle.desktop"."RecordWindow" = []; - "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; - "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; - "services/org.kde.spectacle.desktop"."_launch" = "Print"; - "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; - "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; - "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; - "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; - "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; - "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; - }; - configFile = { - "baloofilerc"."General"."dbVersion" = 2; - "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; - "baloofilerc"."General"."exclude filters version" = 8; - "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; - "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; - "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; - "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; - "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; - "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; - "dolphinrc"."General"."RememberOpenedTabs" = false; - "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; - "dolphinrc"."IconsMode"."PreviewSize" = 80; - "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; - "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; - "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; - "dolphinrc"."PreviewSettings"."Plugins" = "mobithumbnail,fontthumbnail,ebookthumbnail,kraorathumbnail,jpegthumbnail,windowsexethumbnail,comicbookthumbnail,djvuthumbnail,opendocumentthumbnail,windowsimagethumbnail,exrthumbnail,audiothumbnail,cursorthumbnail,svgthumbnail,blenderthumbnail,gsthumbnail,rawthumbnail,ffmpegthumbs,imagethumbnail,directorythumbnail"; - "dolphinrc"."Search"."Location" = "Everywhere"; - "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; - "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; - "katerc"."General"."Days Meta Infos" = 30; - "katerc"."General"."Save Meta Infos" = true; - "katerc"."General"."Show Full Path in Title" = false; - "katerc"."General"."Show Menu Bar" = true; - "katerc"."General"."Show Status Bar" = true; - "katerc"."General"."Show Tab Bar" = true; - "katerc"."General"."Show Url Nav Bar" = true; - "katerc"."KTextEditor Document"."Allow End of Line Detection" = true; - "katerc"."KTextEditor Document"."Auto Detect Indent" = true; - "katerc"."KTextEditor Document"."Auto Reload If State Is In Version Control" = true; - "katerc"."KTextEditor Document"."Auto Save" = false; - "katerc"."KTextEditor Document"."Auto Save Interval" = 0; - "katerc"."KTextEditor Document"."Auto Save On Focus Out" = false; - "katerc"."KTextEditor Document"."BOM" = false; - "katerc"."KTextEditor Document"."Backup Local" = false; - "katerc"."KTextEditor Document"."Backup Prefix" = ""; - "katerc"."KTextEditor Document"."Backup Remote" = false; - "katerc"."KTextEditor Document"."Backup Suffix" = "~"; - "katerc"."KTextEditor Document"."Camel Cursor" = true; - "katerc"."KTextEditor Document"."Encoding" = "UTF-8"; - "katerc"."KTextEditor Document"."End of Line" = 0; - "katerc"."KTextEditor Document"."Indent On Backspace" = true; - "katerc"."KTextEditor Document"."Indent On Tab" = true; - "katerc"."KTextEditor Document"."Indent On Text Paste" = false; - "katerc"."KTextEditor Document"."Indentation Mode" = "normal"; - "katerc"."KTextEditor Document"."Indentation Width" = 4; - "katerc"."KTextEditor Document"."Keep Extra Spaces" = false; - "katerc"."KTextEditor Document"."Line Length Limit" = 10000; - "katerc"."KTextEditor Document"."Newline at End of File" = true; - "katerc"."KTextEditor Document"."On-The-Fly Spellcheck" = false; - "katerc"."KTextEditor Document"."Overwrite Mode" = false; - "katerc"."KTextEditor Document"."PageUp/PageDown Moves Cursor" = false; - "katerc"."KTextEditor Document"."Remove Spaces" = 1; - "katerc"."KTextEditor Document"."ReplaceTabsDyn" = true; - "katerc"."KTextEditor Document"."Show Spaces" = 0; - "katerc"."KTextEditor Document"."Show Tabs" = true; - "katerc"."KTextEditor Document"."Smart Home" = true; - "katerc"."KTextEditor Document"."Swap Directory" = ""; - "katerc"."KTextEditor Document"."Swap File Mode" = 1; - "katerc"."KTextEditor Document"."Swap Sync Interval" = 15; - "katerc"."KTextEditor Document"."Tab Handling" = 2; - "katerc"."KTextEditor Document"."Tab Width" = 4; - "katerc"."KTextEditor Document"."Trailing Marker Size" = 1; - "katerc"."KTextEditor Document"."Word Wrap" = false; - "katerc"."KTextEditor Document"."Word Wrap Column" = 80; - "katerc"."KTextEditor Editor"."Encoding Prober Type" = 1; - "katerc"."KTextEditor Editor"."Fallback Encoding" = "ISO 8859-15"; - "katerc"."KTextEditor Renderer"."Animate Bracket Matching" = false; - "katerc"."KTextEditor Renderer"."Auto Color Theme Selection" = true; - "katerc"."KTextEditor Renderer"."Color Theme" = "Catppuccin Macchiato"; - "katerc"."KTextEditor Renderer"."Font" = "Hack,10,-1,7,50,0,0,0,0,0"; - "katerc"."KTextEditor Renderer"."Line Height Multiplier" = 1; - "katerc"."KTextEditor Renderer"."Show Indentation Lines" = false; - "katerc"."KTextEditor Renderer"."Show Whole Bracket Expression" = false; - "katerc"."KTextEditor Renderer"."Word Wrap Marker" = false; - "katerc"."KTextEditor View"."Allow Mark Menu" = true; - "katerc"."KTextEditor View"."Auto Brackets" = true; - "katerc"."KTextEditor View"."Auto Center Lines" = 0; - "katerc"."KTextEditor View"."Auto Completion" = true; - "katerc"."KTextEditor View"."Auto Completion Preselect First Entry" = true; - "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; - "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; - "katerc"."KTextEditor View"."Bracket Match Preview" = false; - "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}[]'\""; - "katerc"."KTextEditor View"."Default Mark Type" = 1; - "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; - "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; - "katerc"."KTextEditor View"."Dynamic Word Wrap At Static Marker" = false; - "katerc"."KTextEditor View"."Dynamic Word Wrap Indicators" = 1; - "katerc"."KTextEditor View"."Dynamic Wrap not at word boundaries" = false; - "katerc"."KTextEditor View"."Enable Tab completion" = false; - "katerc"."KTextEditor View"."Fold First Line" = false; - "katerc"."KTextEditor View"."Folding Bar" = true; - "katerc"."KTextEditor View"."Folding Preview" = true; - "katerc"."KTextEditor View"."Icon Bar" = false; - "katerc"."KTextEditor View"."Input Mode" = 0; - "katerc"."KTextEditor View"."Keyword Completion" = true; - "katerc"."KTextEditor View"."Line Modification" = true; - "katerc"."KTextEditor View"."Line Numbers" = true; - "katerc"."KTextEditor View"."Max Clipboard History Entries" = 20; - "katerc"."KTextEditor View"."Maximum Search History Size" = 100; - "katerc"."KTextEditor View"."Mouse Paste At Cursor Position" = false; - "katerc"."KTextEditor View"."Multiple Cursor Modifier" = 134217728; - "katerc"."KTextEditor View"."Persistent Selection" = false; - "katerc"."KTextEditor View"."Scroll Bar Marks" = false; - "katerc"."KTextEditor View"."Scroll Bar Mini Map All" = true; - "katerc"."KTextEditor View"."Scroll Bar Mini Map Width" = 60; - "katerc"."KTextEditor View"."Scroll Bar MiniMap" = true; - "katerc"."KTextEditor View"."Scroll Bar Preview" = true; - "katerc"."KTextEditor View"."Scroll Past End" = false; - "katerc"."KTextEditor View"."Search/Replace Flags" = 140; - "katerc"."KTextEditor View"."Shoe Line Ending Type in Statusbar" = false; - "katerc"."KTextEditor View"."Show Documentation With Completion" = true; - "katerc"."KTextEditor View"."Show File Encoding" = true; - "katerc"."KTextEditor View"."Show Focus Frame Around Editor" = true; - "katerc"."KTextEditor View"."Show Folding Icons On Hover Only" = true; - "katerc"."KTextEditor View"."Show Line Count" = false; - "katerc"."KTextEditor View"."Show Scrollbars" = 0; - "katerc"."KTextEditor View"."Show Statusbar Dictionary" = true; - "katerc"."KTextEditor View"."Show Statusbar Highlighting Mode" = true; - "katerc"."KTextEditor View"."Show Statusbar Input Mode" = true; - "katerc"."KTextEditor View"."Show Statusbar Line Column" = true; - "katerc"."KTextEditor View"."Show Statusbar Tab Settings" = true; - "katerc"."KTextEditor View"."Show Word Count" = false; - "katerc"."KTextEditor View"."Smart Copy Cut" = true; - "katerc"."KTextEditor View"."Statusbar Line Column Compact Mode" = true; - "katerc"."KTextEditor View"."Text Drag And Drop" = true; - "katerc"."KTextEditor View"."User Sets Of Chars To Enclose Selection" = ""; - "katerc"."KTextEditor View"."Vi Input Mode Steal Keys" = false; - "katerc"."KTextEditor View"."Vi Relative Line Numbers" = false; - "katerc"."KTextEditor View"."Word Completion" = true; - "katerc"."KTextEditor View"."Word Completion Minimal Word Length" = 3; - "katerc"."KTextEditor View"."Word Completion Remove Tail" = true; - "katerc"."KTextEditor::Search"."Search History" = "uuid"; - "katerc"."filetree"."editShade" = "93,62,114"; - "katerc"."filetree"."listMode" = false; - "katerc"."filetree"."shadingEnabled" = true; - "katerc"."filetree"."showCloseButton" = false; - "katerc"."filetree"."showFullPathOnRoots" = false; - "katerc"."filetree"."showToolbar" = true; - "katerc"."filetree"."sortRole" = 0; - "katerc"."filetree"."viewShade" = "101,69,143"; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; - "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; - "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; - "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; - "kcminputrc"."Mouse"."cursorSize" = 32; - "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; - "kded5rc"."Module-browserintegrationreminder"."autoload" = false; - "kded5rc"."Module-device_automounter"."autoload" = false; - "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; - "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "960,540"; - "kdeglobals"."General"."AccentColor" = "184,117,220"; - "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; - "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; - "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; - "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; - "kdeglobals"."KDE"."ShowDeleteCommand" = false; - "kdeglobals"."KDE"."SingleClick" = false; - "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; - "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; - "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; - "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; - "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; - "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; - "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; - "kdeglobals"."KFileDialog Settings"."Show Preview" = false; - "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; - "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; - "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; - "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; - "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; - "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; - "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; - "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; - "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; - "kdeglobals"."PreviewSettings"."MaximumRemoteSize" = 0; - "kdeglobals"."WM"."activeBackground" = "49,54,59"; - "kdeglobals"."WM"."activeBlend" = "252,252,252"; - "kdeglobals"."WM"."activeForeground" = "252,252,252"; - "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; - "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; - "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; - "khotkeysrc"."Data"."DataCount" = 3; - "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; - "khotkeysrc"."Data_1"."DataCount" = 1; - "khotkeysrc"."Data_1"."Enabled" = true; - "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; - "khotkeysrc"."Data_1"."SystemGroup" = 1; - "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1"."Comment" = "Comment"; - "khotkeysrc"."Data_1_1"."Enabled" = true; - "khotkeysrc"."Data_1_1"."Name" = "Search"; - "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; - "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; - "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; - "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; - "khotkeysrc"."Data_2"."DataCount" = 8; - "khotkeysrc"."Data_2"."Enabled" = false; - "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; - "khotkeysrc"."Data_2"."Name" = "Examples"; - "khotkeysrc"."Data_2"."SystemGroup" = 0; - "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; - "khotkeysrc"."Data_2_1"."Enabled" = false; - "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; - "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; - "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; - "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; - "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; - "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; - "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; - "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; - "khotkeysrc"."Data_2_2"."Enabled" = false; - "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; - "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; - "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; - "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; - "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; - "khotkeysrc"."Data_2_3"."Enabled" = false; - "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; - "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; - "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; - "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; - "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; - "khotkeysrc"."Data_2_4"."Enabled" = false; - "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; - "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; - "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; - "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; - "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; - "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; - "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; - "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; - "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; - "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; - "khotkeysrc"."Data_2_5"."Enabled" = false; - "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; - "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; - "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; - "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; - "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; - "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; - "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; - "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; - "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; - "khotkeysrc"."Data_2_6"."Enabled" = false; - "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; - "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; - "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; - "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; - "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; - "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; - "khotkeysrc"."Data_2_7"."DataCount" = 4; - "khotkeysrc"."Data_2_7"."Enabled" = false; - "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; - "khotkeysrc"."Data_2_7"."SystemGroup" = 0; - "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_7_1"."Comment" = ""; - "khotkeysrc"."Data_2_7_1"."Enabled" = false; - "khotkeysrc"."Data_2_7_1"."Name" = "Back"; - "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2"."Comment" = ""; - "khotkeysrc"."Data_2_7_2"."Enabled" = false; - "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; - "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3"."Comment" = ""; - "khotkeysrc"."Data_2_7_3"."Enabled" = false; - "khotkeysrc"."Data_2_7_3"."Name" = "Up"; - "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4"."Comment" = ""; - "khotkeysrc"."Data_2_7_4"."Enabled" = false; - "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; - "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; - "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; - "khotkeysrc"."Data_2_8"."Enabled" = false; - "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; - "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; - "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; - "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; - "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; - "khotkeysrc"."Data_3"."DataCount" = 14; - "khotkeysrc"."Data_3"."Enabled" = true; - "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; - "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; - "khotkeysrc"."Data_3"."SystemGroup" = 0; - "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konquerors"; - "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; - "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; - "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; - "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; - "khotkeysrc"."Data_3_1"."Enabled" = true; - "khotkeysrc"."Data_3_1"."Name" = "Back"; - "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; - "khotkeysrc"."Data_3_10"."Enabled" = false; - "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; - "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; - "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; - "khotkeysrc"."Data_3_11"."Enabled" = true; - "khotkeysrc"."Data_3_11"."Name" = "Up"; - "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; - "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; - "khotkeysrc"."Data_3_12"."Enabled" = false; - "khotkeysrc"."Data_3_12"."Name" = "Up #2"; - "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; - "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; - "khotkeysrc"."Data_3_13"."Enabled" = true; - "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; - "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; - "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; - "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; - "khotkeysrc"."Data_3_14"."Enabled" = true; - "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; - "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; - "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; - "khotkeysrc"."Data_3_2"."Enabled" = true; - "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; - "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; - "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; - "khotkeysrc"."Data_3_3"."Enabled" = true; - "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; - "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; - "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; - "khotkeysrc"."Data_3_4"."Enabled" = true; - "khotkeysrc"."Data_3_4"."Name" = "Forward"; - "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; - "khotkeysrc"."Data_3_5"."Enabled" = true; - "khotkeysrc"."Data_3_5"."Name" = "Home"; - "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; - "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; - "khotkeysrc"."Data_3_6"."Enabled" = true; - "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; - "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; - "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; - "khotkeysrc"."Data_3_7"."Enabled" = true; - "khotkeysrc"."Data_3_7"."Name" = "New Tab"; - "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; - "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; - "khotkeysrc"."Data_3_8"."Enabled" = true; - "khotkeysrc"."Data_3_8"."Name" = "New Window"; - "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; - "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; - "khotkeysrc"."Data_3_9"."Enabled" = true; - "khotkeysrc"."Data_3_9"."Name" = "Reload"; - "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; - "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions" = ""; - "khotkeysrc"."General"."BrowserApplication" = ""; - "khotkeysrc"."Gestures"."Disabled" = true; - "khotkeysrc"."Gestures"."MouseButton" = 2; - "khotkeysrc"."Gestures"."Timeout" = 300; - "khotkeysrc"."GesturesExclude"."Comment" = ""; - "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; - "khotkeysrc"."KDE"."AnimationDurationFactor" = ""; - "khotkeysrc"."KDE"."ShowDeleteCommand" = ""; - "khotkeysrc"."KDE"."SingleClick" = ""; - "khotkeysrc"."KDE"."widgetStyle" = ""; - "khotkeysrc"."KFileDialog Settings"."Allow Expansion" = ""; - "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension" = ""; - "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation" = ""; - "khotkeysrc"."KFileDialog Settings"."Decoration position" = ""; - "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode" = ""; - "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Bookmarks" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Full Path" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Inline Previews" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Preview" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Speedbar" = ""; - "khotkeysrc"."KFileDialog Settings"."Show hidden files" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort by" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort directories first" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort hidden files last" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort reversed" = ""; - "khotkeysrc"."KFileDialog Settings"."Speedbar Width" = ""; - "khotkeysrc"."KFileDialog Settings"."View Style" = ""; - "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size" = ""; - "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; - "khotkeysrc"."Main"."Disabled" = false; - "khotkeysrc"."PreviewSettings"."MaximumRemoteSize" = ""; - "khotkeysrc"."Voice"."Shortcut" = ""; - "khotkeysrc"."WM"."activeBackground" = ""; - "khotkeysrc"."WM"."activeBlend" = ""; - "khotkeysrc"."WM"."activeForeground" = ""; - "khotkeysrc"."WM"."inactiveBackground" = ""; - "khotkeysrc"."WM"."inactiveBlend" = ""; - "khotkeysrc"."WM"."inactiveForeground" = ""; - "kiorc"."Confirmations"."ConfirmDelete" = true; - "kiorc"."Confirmations"."ConfirmEmptyTrash" = true; - "kiorc"."Confirmations"."ConfirmTrash" = false; - "kiorc"."Executable scripts"."behaviourOnLaunch" = "alwaysAsk"; - "krunnerrc"."Plugins"."baloosearchEnabled" = false; - "krunnerrc"."Plugins"."locationsEnabled" = true; - "krunnerrc"."Plugins"."placesEnabled" = true; - "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; - "kservicemenurc"."Show"."compressfileitemaction" = true; - "kservicemenurc"."Show"."extractfileitemaction" = true; - "kservicemenurc"."Show"."forgetfileitemaction" = true; - "kservicemenurc"."Show"."installFont" = true; - "kservicemenurc"."Show"."kactivitymanagerd_fileitem_linking_plugin" = true; - "kservicemenurc"."Show"."kdeconnectfileitemaction" = true; - "kservicemenurc"."Show"."kio-admin" = true; - "kservicemenurc"."Show"."mountisoaction" = true; - "kservicemenurc"."Show"."nextclouddolphinactionplugin" = true; - "kservicemenurc"."Show"."runInKonsole" = true; - "kservicemenurc"."Show"."setAsWallpaper" = true; - "kservicemenurc"."Show"."slideshowfileitemaction" = true; - "kservicemenurc"."Show"."tagsfileitemaction" = true; - "ksmserverrc"."General"."loginMode" = "restoreSavedSession"; - "kwalletrc"."Wallet"."First Use" = false; - "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; - "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; - "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; - "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; - "kwinrc"."Desktops"."Number" = 4; - "kwinrc"."Desktops"."Rows" = 2; - "kwinrc"."Effect-diminactive"."Strength" = 15; - "kwinrc"."Effect-magiclamp"."AnimationDuration" = 20; - "kwinrc"."NightColor"."Active" = true; - "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; - "kwinrc"."NightColor"."LongitudeFixed" = 5.44; - "kwinrc"."NightColor"."Mode" = "Location"; - "kwinrc"."NightColor"."NightTemperature" = 1400; - "kwinrc"."Plugins"."diminactiveEnabled" = true; - "kwinrc"."Plugins"."dimscreenEnabled" = true; - "kwinrc"."Plugins"."wobblywindowsEnabled" = true; - "kwinrc"."Tiling"."padding" = 0; - "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"layoutDirection\":\"vertical\",\"tiles\":x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d}x5d,\"width\":1}x5d}"; - "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}"; - "kwinrc"."Tiling/98e47fc8-bbb3-5a3a-b6a8-d051b513a983"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5005208333333331},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.4994791666666665}]}"; - "kwinrc"."Xwayland"."Scale" = 1; - "kxkbrc"."Layout"."Options" = "compose:caps"; - "kxkbrc"."Layout"."ResetOldOptions" = true; - "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; - "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; - "plasmanotifyrc"."Applications/firefox"."Seen" = true; - "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; - "plasmarc"."Wallpapers"."usersWallpapers" = ""; - "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; - "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; - "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; - }; - dataFile = { - "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true; - "kate/anonymous.katesession"."Document 0"."Bookmarks" = ""; - "kate/anonymous.katesession"."Document 0"."Encoding" = "UTF-8"; - "kate/anonymous.katesession"."Document 0"."Highlighting" = "None"; - "kate/anonymous.katesession"."Document 0"."Highlighting Set By User" = false; - "kate/anonymous.katesession"."Document 0"."Indentation Mode" = "normal"; - "kate/anonymous.katesession"."Document 0"."Mode" = "Normal"; - "kate/anonymous.katesession"."Document 0"."Mode Set By User" = false; - "kate/anonymous.katesession"."Document 0"."URL" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false; - "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."externaltoolsplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."formatplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katebacktracebrowserplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katebuildplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katecloseexceptplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katecolorpickerplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katectagsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katefilebrowserplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katefiletreeplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."kategdbplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."kategitblameplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katekonsoleplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."kateprojectplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."katereplicodeplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katesearchplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."katesnippetsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katesqlplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katesymbolviewerplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katexmlcheckplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katexmltoolsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."keyboardmacrosplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."ktexteditorpreviewplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."latexcompletionplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."lspclientplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."openlinkplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false; - "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; - "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; - "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 929; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = ""; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 929; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = ""; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 1874; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin"; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 1634; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,927,0"; - "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; - "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0"; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 1874; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Active View" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":[]}"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; - "kate/anonymous.katesession"."Open Documents"."Count" = 1; - "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; - "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentExcludeFilter" = "-1"; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentFilter" = "-1"; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExcludeFilters" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExpandSearchResults" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Filters" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."FollowSymLink" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."HiddenFiles" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."MatchCase" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Place" = 1; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Recursive" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Replaces" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Search" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeAllProjects" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeCurrentFile" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeFolder" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeOpenFiles" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeProject" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiles" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiless" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."UseRegExp" = false; - }; - }; -} From aba983b5f0548661e8b6ccc8f953e206a0939309 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:30:54 +0200 Subject: [PATCH 1987/2308] Set panels for kde plasma --- .../package-configs/plasma-desktop.nix | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 1ccfab8..9783942 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -1,6 +1,52 @@ { programs.plasma = { enable = true; + desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; + kwin.nightLight = { + enable = true; + latitude = "52.32"; + longitude = "5.44"; + mode = "location"; + night = 1400; + }; + panels = { + top = { + alignment = "left"; + floating = true; + height = 38; + location = "top"; + screen = "all"; + widgets = [ + "org.kde.plasma.appmenu" + "org.kde.plasma.panelspacer" + "org.kde.milou" + "org.kde.plasma.panelspacer" + "org.kde.plasma.colorpicker" + "org.kde.plasma.systemtray" + "org.kde.plasma.digitalclock" + "org.kde.plasma.lock_logout" + ]; + }; + bottom = { + alignment = "left"; + floating = true; + height = 44; + hiding = "autohide"; + maxLength = 1000; + minLength = 1000; + location = "bottom"; + screen = "all"; + widgets = [ + "org.kde.plasma.kickoff" + "org.kde.plasma.pager" + "org.kde.plasma.panelspacer" + "org.kde.plasma.icontasks" + "org.kde.plasma.panelspacer" + "org.kde.plasma.minimizeall" + ]; + }; + }; + shortcuts = { "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; From 4d29395bd17a383153420c069f441358bf04d648 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:32:53 +0200 Subject: [PATCH 1988/2308] kwin.nightlight.location for latitude and longitude --- home-manager/desktop/package-configs/plasma-desktop.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 9783942..527809b 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -4,8 +4,10 @@ desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; kwin.nightLight = { enable = true; - latitude = "52.32"; - longitude = "5.44"; + location = { + latitude = "52.32"; + longitude = "5.44"; + }; mode = "location"; night = 1400; }; From 7c74d8b07b16e28292fcc256872cda5790754e7e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:33:33 +0200 Subject: [PATCH 1989/2308] temperature.night instead of night as well --- home-manager/desktop/package-configs/plasma-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 527809b..5682fa0 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -9,7 +9,7 @@ longitude = "5.44"; }; mode = "location"; - night = 1400; + temperature.night = 1400; }; panels = { top = { From e921bd0132c65fae8a859a20beb13d8faec0206c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:39:38 +0200 Subject: [PATCH 1990/2308] Fix the list format --- .../package-configs/plasma-desktop.nix | 78 ++++++++++--------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 5682fa0..9cfe89e 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -11,43 +11,47 @@ mode = "location"; temperature.night = 1400; }; - panels = { - top = { - alignment = "left"; - floating = true; - height = 38; - location = "top"; - screen = "all"; - widgets = [ - "org.kde.plasma.appmenu" - "org.kde.plasma.panelspacer" - "org.kde.milou" - "org.kde.plasma.panelspacer" - "org.kde.plasma.colorpicker" - "org.kde.plasma.systemtray" - "org.kde.plasma.digitalclock" - "org.kde.plasma.lock_logout" - ]; - }; - bottom = { - alignment = "left"; - floating = true; - height = 44; - hiding = "autohide"; - maxLength = 1000; - minLength = 1000; - location = "bottom"; - screen = "all"; - widgets = [ - "org.kde.plasma.kickoff" - "org.kde.plasma.pager" - "org.kde.plasma.panelspacer" - "org.kde.plasma.icontasks" - "org.kde.plasma.panelspacer" - "org.kde.plasma.minimizeall" - ]; - }; - }; + panels = [ + { + top = { + alignment = "left"; + floating = true; + height = 38; + location = "top"; + screen = "all"; + widgets = [ + "org.kde.plasma.appmenu" + "org.kde.plasma.panelspacer" + "org.kde.milou" + "org.kde.plasma.panelspacer" + "org.kde.plasma.colorpicker" + "org.kde.plasma.systemtray" + "org.kde.plasma.digitalclock" + "org.kde.plasma.lock_logout" + ]; + }; + } + { + bottom = { + alignment = "left"; + floating = true; + height = 44; + hiding = "autohide"; + maxLength = 1000; + minLength = 1000; + location = "bottom"; + screen = "all"; + widgets = [ + "org.kde.plasma.kickoff" + "org.kde.plasma.pager" + "org.kde.plasma.panelspacer" + "org.kde.plasma.icontasks" + "org.kde.plasma.panelspacer" + "org.kde.plasma.minimizeall" + ]; + }; + } + ]; shortcuts = { "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; From 86106bdaed70c57e0e6e394eb4ecfaf5c8d88645 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:41:08 +0200 Subject: [PATCH 1991/2308] We already had night light configured oops --- home-manager/desktop/package-configs/plasma-desktop.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 9cfe89e..f785cb0 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -2,15 +2,6 @@ programs.plasma = { enable = true; desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; - kwin.nightLight = { - enable = true; - location = { - latitude = "52.32"; - longitude = "5.44"; - }; - mode = "location"; - temperature.night = 1400; - }; panels = [ { top = { From 90d86534cf98e18ba30954ccfa62f4dde56aa75c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:43:15 +0200 Subject: [PATCH 1992/2308] No names for panels --- .../package-configs/plasma-desktop.nix | 66 +++++++++---------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index f785cb0..e94d279 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -4,43 +4,39 @@ desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; panels = [ { - top = { - alignment = "left"; - floating = true; - height = 38; - location = "top"; - screen = "all"; - widgets = [ - "org.kde.plasma.appmenu" - "org.kde.plasma.panelspacer" - "org.kde.milou" - "org.kde.plasma.panelspacer" - "org.kde.plasma.colorpicker" - "org.kde.plasma.systemtray" - "org.kde.plasma.digitalclock" - "org.kde.plasma.lock_logout" - ]; - }; + alignment = "left"; + floating = true; + height = 38; + location = "top"; + screen = "all"; + widgets = [ + "org.kde.plasma.appmenu" + "org.kde.plasma.panelspacer" + "org.kde.milou" + "org.kde.plasma.panelspacer" + "org.kde.plasma.colorpicker" + "org.kde.plasma.systemtray" + "org.kde.plasma.digitalclock" + "org.kde.plasma.lock_logout" + ]; } { - bottom = { - alignment = "left"; - floating = true; - height = 44; - hiding = "autohide"; - maxLength = 1000; - minLength = 1000; - location = "bottom"; - screen = "all"; - widgets = [ - "org.kde.plasma.kickoff" - "org.kde.plasma.pager" - "org.kde.plasma.panelspacer" - "org.kde.plasma.icontasks" - "org.kde.plasma.panelspacer" - "org.kde.plasma.minimizeall" - ]; - }; + alignment = "left"; + floating = true; + height = 44; + hiding = "autohide"; + maxLength = 1000; + minLength = 1000; + location = "bottom"; + screen = "all"; + widgets = [ + "org.kde.plasma.kickoff" + "org.kde.plasma.pager" + "org.kde.plasma.panelspacer" + "org.kde.plasma.icontasks" + "org.kde.plasma.panelspacer" + "org.kde.plasma.minimizeall" + ]; } ]; From 7a9293810ce6f7d73a9d9cbcfdfdef47b7122f8f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 18:11:51 +0200 Subject: [PATCH 1993/2308] Set up the panels fully including application launcher and activities --- .../package-configs/plasma-desktop.nix | 68 ++++++++++++++++++- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index e94d279..c89665b 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -15,8 +15,50 @@ "org.kde.milou" "org.kde.plasma.panelspacer" "org.kde.plasma.colorpicker" - "org.kde.plasma.systemtray" - "org.kde.plasma.digitalclock" + { + systemTray.items = { + # We explicitly show bluetooth and battery + shown = [ + "org.kde.plasma.volume" + "org.kde.plasma.bluetooth" + "org.kde.plasma.brightness" + "org.kde.plasma.devicenotifier" + "org.kde.kscreen" + "org.kde.kdeconnect" + "org.kde.plasma.networkmanagement" + "org.kde.plasma.battery" + "org.kde.plasma.clipboard" + "org.kde.plasma.mediacontroller" + "org.kde.plasma.notifications" + "org.kde.plasma.weather" + ]; + # And explicitly hide networkmanagement and volume + hidden = [ + "Xwayland Video Bridge_pipewireToXProxy" + "org.kde.plasma.devicenotifier" + "org.kde.kscreen" + "org.kde.plasma.printmanager" + "chrome_status_icon_1" + "proton-vpn-app" + "Nitrokey App" + "qBittorrent" + "vlc" + "steam" + ]; + }; + } + { + digitalClock = { + calendar.firstDayOfWeek = "monday"; + time.format = "24h"; + date = { + enable = true; + format = "isoDate"; + position = "belowTime"; + }; + timeZone = ["Europe/Amsterdam"]; + }; + } "org.kde.plasma.lock_logout" ]; } @@ -33,7 +75,27 @@ "org.kde.plasma.kickoff" "org.kde.plasma.pager" "org.kde.plasma.panelspacer" - "org.kde.plasma.icontasks" + { + name = "org.kde.plasma.icontasks"; + config = { + General = { + launchers = [ + "applications:firefox.desktop" + "applications:systemsettings.desktop" + "applications:org.kde.dolphin.desktop" + "applications:signal-desktop.desktop" + "applications:webcord.desktop" + "applications:steam.desktop" + "applications:noisetorch.desktop" + "applications:org.kde.plasma-systemmonitor.desktop" + "applications:org.codeberg.dnkl.foot.desktop" + "applications:nitrokey-app.desktop" + "applications:codium.desktop" + "applications:freetube.desktop" + ]; + }; + }; + } "org.kde.plasma.panelspacer" "org.kde.plasma.minimizeall" ]; From aa9e9bfa3ab9613db9297137c85c750d26566ccf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 18:14:25 +0200 Subject: [PATCH 1994/2308] timezone.selected not just timezone --- home-manager/desktop/package-configs/plasma-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index c89665b..2a34492 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -56,7 +56,7 @@ format = "isoDate"; position = "belowTime"; }; - timeZone = ["Europe/Amsterdam"]; + timeZone.selected = ["Europe/Amsterdam"]; }; } "org.kde.plasma.lock_logout" From 38bd6a6e49d278b60efe089e365c74a3a31ac532 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 19:10:05 +0200 Subject: [PATCH 1995/2308] Center the bottom panel and make it a bit bigger --- home-manager/desktop/package-configs/plasma-desktop.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 2a34492..21fe5b9 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -63,12 +63,12 @@ ]; } { - alignment = "left"; + alignment = "center"; floating = true; height = 44; hiding = "autohide"; - maxLength = 1000; - minLength = 1000; + maxLength = 1920; + minLength = 1200; location = "bottom"; screen = "all"; widgets = [ From d380c932bb7a73c78de729d0eea88004cbcd99f4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 19:17:26 +0200 Subject: [PATCH 1996/2308] remove the pager --- home-manager/desktop/package-configs/plasma-desktop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 21fe5b9..8757568 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -73,7 +73,6 @@ screen = "all"; widgets = [ "org.kde.plasma.kickoff" - "org.kde.plasma.pager" "org.kde.plasma.panelspacer" { name = "org.kde.plasma.icontasks"; From 21abdc4c1f06bfb92d4e9d02b79cde6ed39c0653 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 19:26:11 +0200 Subject: [PATCH 1997/2308] Added the command to open krunner that I use by default --- .../package-configs/plasma-desktop.nix | 303 +++++++++--------- 1 file changed, 159 insertions(+), 144 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 8757568..28c5057 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -108,7 +108,7 @@ "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; @@ -116,28 +116,28 @@ "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; + "kmix"."mic_mute" = ["Microphone Mute" "" "Meta+Volume Mute\\, ,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; + "ksmserver"."Halt Without Confirmation" = []; + "ksmserver"."Lock Session" = ["Meta+L" "" "Screensaver\\, ,Meta+L" "Screensaver,Lock Session"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; - "ksmserver"."LogOut" = "none,,Log Out"; - "ksmserver"."Reboot" = "none,,Reboot"; - "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; - "ksmserver"."Shut Down" = "none,,Shut Down"; + "ksmserver"."Log Out Without Confirmation" = []; + "ksmserver"."LogOut" = []; + "ksmserver"."Reboot" = []; + "ksmserver"."Reboot Without Confirmation" = []; + "ksmserver"."Shut Down" = []; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cube" = "Meta+C,none"; + "kwin"."Cube" = "Meta+C\\, ,none"; "kwin"."Cycle Overview" = []; "kwin"."Cycle Overview Opposite" = []; - "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; + "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; + "kwin"."ExposeAll" = ["Ctrl+F10" "" "Launch (C)\\, ,Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = []; "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; + "kwin"."Increase Opacity" = []; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; @@ -147,10 +147,10 @@ "kwin"."MoveZoomRight" = []; "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; + "kwin"."Setup Window Shortcut" = []; "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8,none"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12,none"; + "kwin"."ShowDesktopGrid" = "Meta+F8\\, ,none"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12\\, ,none"; "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; @@ -160,136 +160,136 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; - "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; - "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; - "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; - "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; - "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; - "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; - "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; - "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; - "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; + "kwin"."Switch to Desktop 10" = []; + "kwin"."Switch to Desktop 11" = []; + "kwin"."Switch to Desktop 12" = []; + "kwin"."Switch to Desktop 13" = []; + "kwin"."Switch to Desktop 14" = []; + "kwin"."Switch to Desktop 15" = []; + "kwin"."Switch to Desktop 16" = []; + "kwin"."Switch to Desktop 17" = []; + "kwin"."Switch to Desktop 18" = []; + "kwin"."Switch to Desktop 19" = []; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; + "kwin"."Switch to Desktop 20" = []; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; - "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; - "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; - "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; - "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; - "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; - "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; - "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; - "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; - "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; - "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; - "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; - "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; - "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; - "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; - "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; - "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; - "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; - "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; - "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; - "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; + "kwin"."Switch to Desktop 5" = []; + "kwin"."Switch to Desktop 6" = []; + "kwin"."Switch to Desktop 7" = []; + "kwin"."Switch to Desktop 8" = []; + "kwin"."Switch to Desktop 9" = []; + "kwin"."Switch to Next Desktop" = []; + "kwin"."Switch to Next Screen" = []; + "kwin"."Switch to Previous Desktop" = []; + "kwin"."Switch to Previous Screen" = []; + "kwin"."Switch to Screen 0" = []; + "kwin"."Switch to Screen 1" = []; + "kwin"."Switch to Screen 2" = []; + "kwin"."Switch to Screen 3" = []; + "kwin"."Switch to Screen 4" = []; + "kwin"."Switch to Screen 5" = []; + "kwin"."Switch to Screen 6" = []; + "kwin"."Switch to Screen 7" = []; + "kwin"."Switch to Screen Above" = []; + "kwin"."Switch to Screen Below" = []; + "kwin"."Switch to Screen to the Left" = []; + "kwin"."Switch to Screen to the Right" = []; "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; + "kwin"."Toggle Window Raise/Lower" = []; "kwin"."Walk Through Desktop List" = []; "kwin"."Walk Through Desktop List (Reverse)" = []; "kwin"."Walk Through Desktops" = []; "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab,Alt+Shift+Tab,Walk Through Windows (Reverse)"; - "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; - "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; - "kwin"."Walk Through Windows of Current Application" = "none,Alt+`,Walk Through Windows of Current Application"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab\\, Alt+Shift+Tab\\, ,Alt+Shift+Tab,Walk Through Windows (Reverse)"; + "kwin"."Walk Through Windows Alternative" = []; + "kwin"."Walk Through Windows Alternative (Reverse)" = []; + "kwin"."Walk Through Windows of Current Application" = "\\, Alt+`\\, ,Alt+`,Walk Through Windows of Current Application"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; - "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; - "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; + "kwin"."Walk Through Windows of Current Application Alternative" = []; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; + "kwin"."Window Above Other Windows" = []; + "kwin"."Window Below Other Windows" = []; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; - "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; - "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; - "kwin"."Window Lower" = "none,,Lower Window"; + "kwin"."Window Fullscreen" = []; + "kwin"."Window Grow Horizontal" = []; + "kwin"."Window Grow Vertical" = []; + "kwin"."Window Lower" = []; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; - "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; + "kwin"."Window Maximize Horizontal" = []; + "kwin"."Window Maximize Vertical" = []; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = "none,,Move Window"; - "kwin"."Window Move Center" = "none,,Move Window to the Center"; - "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; - "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; + "kwin"."Window Move" = []; + "kwin"."Window Move Center" = []; + "kwin"."Window No Border" = []; + "kwin"."Window On All Desktops" = []; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; - "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; - "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; - "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; + "kwin"."Window One Screen Down" = []; + "kwin"."Window One Screen Up" = []; + "kwin"."Window One Screen to the Left" = []; + "kwin"."Window One Screen to the Right" = []; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = "none,,Move Window Down"; - "kwin"."Window Pack Left" = "none,,Move Window Left"; - "kwin"."Window Pack Right" = "none,,Move Window Right"; - "kwin"."Window Pack Up" = "none,,Move Window Up"; + "kwin"."Window Pack Down" = []; + "kwin"."Window Pack Left" = []; + "kwin"."Window Pack Right" = []; + "kwin"."Window Pack Up" = []; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; - "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; + "kwin"."Window Quick Tile Bottom Left" = []; + "kwin"."Window Quick Tile Bottom Right" = []; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; - "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; - "kwin"."Window Raise" = "none,,Raise Window"; - "kwin"."Window Resize" = "none,,Resize Window"; - "kwin"."Window Shade" = "none,,Shade Window"; - "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; - "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; - "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; - "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; - "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; - "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; - "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; - "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; - "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; - "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; - "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; - "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; - "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; - "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; - "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; - "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; - "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; - "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; - "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; - "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; - "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; - "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; - "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; - "kwin"."Window to Next Screen" = "none,Meta+Shift+Right,Move Window to Next Screen"; - "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; - "kwin"."Window to Previous Screen" = "none,Meta+Shift+Left,Move Window to Previous Screen"; - "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; - "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; - "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; - "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; - "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; - "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; - "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; - "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; - "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["Meta++,Meta++" "Meta+=,Zoom In"]; + "kwin"."Window Quick Tile Top Left" = []; + "kwin"."Window Quick Tile Top Right" = []; + "kwin"."Window Raise" = []; + "kwin"."Window Resize" = []; + "kwin"."Window Shade" = []; + "kwin"."Window Shrink Horizontal" = []; + "kwin"."Window Shrink Vertical" = []; + "kwin"."Window to Desktop 1" = []; + "kwin"."Window to Desktop 10" = []; + "kwin"."Window to Desktop 11" = []; + "kwin"."Window to Desktop 12" = []; + "kwin"."Window to Desktop 13" = []; + "kwin"."Window to Desktop 14" = []; + "kwin"."Window to Desktop 15" = []; + "kwin"."Window to Desktop 16" = []; + "kwin"."Window to Desktop 17" = []; + "kwin"."Window to Desktop 18" = []; + "kwin"."Window to Desktop 19" = []; + "kwin"."Window to Desktop 2" = []; + "kwin"."Window to Desktop 20" = []; + "kwin"."Window to Desktop 3" = []; + "kwin"."Window to Desktop 4" = []; + "kwin"."Window to Desktop 5" = []; + "kwin"."Window to Desktop 6" = []; + "kwin"."Window to Desktop 7" = []; + "kwin"."Window to Desktop 8" = []; + "kwin"."Window to Desktop 9" = []; + "kwin"."Window to Next Desktop" = []; + "kwin"."Window to Next Screen" = "\\, Meta+Shift+Right\\, ,Meta+Shift+Right,Move Window to Next Screen"; + "kwin"."Window to Previous Desktop" = []; + "kwin"."Window to Previous Screen" = "\\, Meta+Shift+Left\\, ,Meta+Shift+Left,Move Window to Previous Screen"; + "kwin"."Window to Screen 0" = []; + "kwin"."Window to Screen 1" = []; + "kwin"."Window to Screen 2" = []; + "kwin"."Window to Screen 3" = []; + "kwin"."Window to Screen 4" = []; + "kwin"."Window to Screen 5" = []; + "kwin"."Window to Screen 6" = []; + "kwin"."Window to Screen 7" = []; + "kwin"."view_actual_size" = ",Meta+0,Zoom to Actual Size"; + "kwin"."view_zoom_in" = ["Meta++\\, Meta++" "Meta+=\\, Zoom In,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = "none,,Media volume down"; - "mediacontrol"."mediavolumeup" = "none,,Media volume up"; + "mediacontrol"."mediavolumedown" = "\\, ,,Media volume down"; + "mediacontrol"."mediavolumeup" = []; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = "none,,Play media playback"; + "mediacontrol"."playmedia" = []; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; @@ -305,10 +305,10 @@ "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = []; - "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; - "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; + "org_kde_powerdevil"."powerProfile" = ["Battery" "" "Meta+B\\, ,Battery" "Meta+B,Switch Power Profile"]; + "plasmashell"."activate application launcher" = ["Meta" "" "Alt+F1\\, ,Meta" "Alt+F1,Activate Application Launcher"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10"; + "plasmashell"."activate task manager entry 10" = "\\, Meta+0\\, ,Meta+0,Activate Task Manager Entry 10"; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -317,23 +317,24 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = "none,,Clear Clipboard History"; + "plasmashell"."clear-history" = []; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = "none,,Next History Item"; - "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; + "plasmashell"."cycleNextAction" = []; + "plasmashell"."cyclePrevAction" = []; "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = "Meta+Tab,none,Walk through activities"; - "plasmashell"."previous activity" = "Meta+Shift+Tab,none,Walk through activities (Reverse)"; + "plasmashell"."next activity" = ",none,Walk through activities"; + "plasmashell"."previous activity" = ",none,Walk through activities (Reverse)"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = "none,,Show Barcode…"; + "plasmashell"."show-barcode" = []; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; - "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; - "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; + "plasmashell"."switch to next activity" = []; + "plasmashell"."switch to previous activity" = []; + "plasmashell"."toggle do not disturb" = []; + "services/org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Ctrl+Shift+Space" "Search"]; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; @@ -346,22 +347,22 @@ "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { @@ -373,6 +374,7 @@ "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; + "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; @@ -447,7 +449,7 @@ "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; "katerc"."KTextEditor View"."Bracket Match Preview" = false; - "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}[]'\""; + "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}\x5b\x5d'\""; "katerc"."KTextEditor View"."Default Mark Type" = 1; "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; @@ -522,6 +524,9 @@ "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; + "kdeglobals"."General"."XftAntialias" = true; + "kdeglobals"."General"."XftHintStyle" = "hintslight"; + "kdeglobals"."General"."XftSubPixel" = "rgb"; "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; "kdeglobals"."KDE"."ShowDeleteCommand" = false; "kdeglobals"."KDE"."SingleClick" = false; @@ -1116,8 +1121,9 @@ "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"layoutDirection\":\"vertical\",\"tiles\":x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d}x5d,\"width\":1}x5d}"; + "kwinrc"."Tiling/250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.4989583333333353},{\"width\":0.5010416666666646}]}"; "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}"; "kwinrc"."Tiling/98e47fc8-bbb3-5a3a-b6a8-d051b513a983"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5005208333333331},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.4994791666666665}]}"; "kwinrc"."Xwayland"."Scale" = 1; @@ -1134,6 +1140,7 @@ "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; "plasmanotifyrc"."Applications/firefox"."Seen" = true; "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; + "plasmanotifyrc"."Applications/webcord"."Seen" = true; "plasmarc"."Wallpapers"."usersWallpapers" = ""; "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; @@ -1181,6 +1188,7 @@ "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0"."2 screens: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; @@ -1232,6 +1240,7 @@ "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0 Settings"."2 screens: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; @@ -1242,11 +1251,17 @@ "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."CursorColumn" = 33; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."CursorLine" = 350; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."Dynamic Word Wrap" = true; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."JumpList" = ""; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."TextFolding" = "{\"checksum\":\"74be57c9991161c81bdaf706a15a5e808c32f8ba\",\"ranges\":[]}"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."ViMarks" = ""; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":[]}"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":\x5b\x5d}"; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; "kate/anonymous.katesession"."Open Documents"."Count" = 1; "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; From a401d6300cfd23bbe031c5ae8f59e9baccdd884a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 19:26:52 +0200 Subject: [PATCH 1998/2308] Removed the error from the autogenerated code --- home-manager/desktop/package-configs/plasma-desktop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 28c5057..8c3af51 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -373,7 +373,6 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; - "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; From 431e922ee4c76675f08543f309fd36a389c12e9d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:22:16 +0200 Subject: [PATCH 1999/2308] Add cinny desktop to desktop home manager and pin it on the taskbar --- home-manager/desktop/default.nix | 1 + home-manager/desktop/package-configs/plasma-desktop.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 8349ffb..0d7f74d 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -88,6 +88,7 @@ # Chat applications: signal-desktop webcord-vencord + cinny-desktop # Gaming: prismlauncher diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 8c3af51..a9d61e3 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -84,6 +84,7 @@ "applications:org.kde.dolphin.desktop" "applications:signal-desktop.desktop" "applications:webcord.desktop" + "applications:cinny.desktop" "applications:steam.desktop" "applications:noisetorch.desktop" "applications:org.kde.plasma-systemmonitor.desktop" From 358c76b152cfc44ed0459bbdaa25551a0fbbc34b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:25:13 +0200 Subject: [PATCH 2000/2308] Allow cinny even though libolm is insecure --- nixos/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 1138ad2..f7a4aa3 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -17,6 +17,7 @@ #TODO: remove this when unneeded for freetube nixpkgs.config.permittedInsecurePackages = [ "python3.12-youtube-dl-2021.12.17" + "cinny-4.2.1" ]; nix = { package = pkgs.lix; From d4ead53badd406e6e9f6c3e0f1252534190280fb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:27:17 +0200 Subject: [PATCH 2001/2308] Let's try and do that in home manager instead --- home-manager/desktop/default.nix | 1 + nixos/shared/default.nix | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 0d7f74d..958e3b0 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -22,6 +22,7 @@ ./package-configs/foot ]; nixpkgs = { + config.permittedInsecurePackages = ["cinny-4.2.1"]; # You can add overlays here overlays = [ # You can also add overlays exported from other flakes: diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index f7a4aa3..7964b40 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -16,8 +16,7 @@ #TODO: remove this when unneeded for freetube nixpkgs.config.permittedInsecurePackages = [ - "python3.12-youtube-dl-2021.12.17" - "cinny-4.2.1" + #"python3.12-youtube-dl-2021.12.17" ]; nix = { package = pkgs.lix; From 10da4d52a61efb04e921276d3943ed21f24e0976 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:28:22 +0200 Subject: [PATCH 2002/2308] also allow cinny-unwrapped for the same reason --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 958e3b0..7a0bf0a 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -22,7 +22,7 @@ ./package-configs/foot ]; nixpkgs = { - config.permittedInsecurePackages = ["cinny-4.2.1"]; + config.permittedInsecurePackages = ["cinny-4.2.1" "cinny-unwrapped-4.2.1"]; # You can add overlays here overlays = [ # You can also add overlays exported from other flakes: From ccf4a7a5af4e01acf610b7d31a66ab0a4863aed0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:30:42 +0200 Subject: [PATCH 2003/2308] Still need the insecure youtube-dl for freetube it seems --- nixos/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 7964b40..1138ad2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -16,7 +16,7 @@ #TODO: remove this when unneeded for freetube nixpkgs.config.permittedInsecurePackages = [ - #"python3.12-youtube-dl-2021.12.17" + "python3.12-youtube-dl-2021.12.17" ]; nix = { package = pkgs.lix; From 0ecc82d0f63a26918fda0e4bc3c7caed781db6c2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:30:55 +0200 Subject: [PATCH 2004/2308] update flake lock --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 379aed3..fe3ef12 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725762345, - "narHash": "sha256-e2He1FFN35H3uVeUYO9+2fbG7IPoOSGub9oEKc1S0eQ=", + "lastModified": 1727662698, + "narHash": "sha256-HA1EYeH7SUDF6id4g3nY6krv/vUQldJuzahb7RFRzk4=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "bc5d903fdae933fad017d370764e2ae38d58b42d", + "rev": "9f20109509c553feeb57600a8a3b5e3177b43f6d", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1727249977, - "narHash": "sha256-lAqOCDI4B6hA+t+KHSm/Go8hQF/Ob5sgXaIRtMAnMKw=", + "lastModified": 1727872461, + "narHash": "sha256-4Pw3fVhN6xey5+2gUBm9nQJAjBqivffr+a5ZsXYjzJ8=", "owner": "nix-community", "repo": "disko", - "rev": "c1c472f4cd91e4b0703e02810a8c7ed30186b6fa", + "rev": "568727a884ae7cd9f266bd19aea655def8cafd78", "type": "github" }, "original": { @@ -558,11 +558,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -764,11 +764,11 @@ ] }, "locked": { - "lastModified": 1727246346, - "narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1727071274, - "narHash": "sha256-xG83n8zvL+fMFArU1ikcUpw0bhRkrzkSTDJPpBCLlUA=", + "lastModified": 1727865565, + "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "03aa054340528d300711253a98f7dccca9378604", + "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", "type": "github" }, "original": { @@ -807,11 +807,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725379389, - "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", + "lastModified": 1727792571, + "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", + "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", "type": "github" }, "original": { @@ -936,11 +936,11 @@ ] }, "locked": { - "lastModified": 1726975622, - "narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=", + "lastModified": 1727658919, + "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417", + "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", "type": "github" }, "original": { @@ -982,11 +982,11 @@ }, "nixlib": { "locked": { - "lastModified": 1726966855, - "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", + "lastModified": 1727571693, + "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", + "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1727312535, - "narHash": "sha256-exnTgS6OBYvEa8v5x8UsLQK2ERdDFwXNFQHoT2cqycY=", + "lastModified": 1727702862, + "narHash": "sha256-4ai7yRN8b2i43gNTAXfAuOw/uIzGqMLON1IXtIRrwOM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f31447cd3f8e54674bd1675969e97e6043a309bc", + "rev": "f7eb021d9dfd61f0e0075e483f3579c6f8453bb3", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727040444, - "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "lastModified": 1727665282, + "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1727343478, - "narHash": "sha256-oswVBH+Nzbfn6Qfq52uKBgDtMiYZUyl5bLEaGrpNWqY=", + "lastModified": 1727885193, + "narHash": "sha256-900otYvwsCSQk9eiCUvdeJ5PGx+i8YhTvN1kohFDGTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dec1098ad00f65a42e06eb2affdb0ee265e88cd5", + "rev": "ce76e7aa78ace4a8cc96582f6d9d2b12eb7606a1", "type": "github" }, "original": { @@ -1176,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1727210241, - "narHash": "sha256-lufS6uzSbSrggNCSgubymMQWnQMh7PvQ+lRZ8qH9Uoc=", + "lastModified": 1727463368, + "narHash": "sha256-5glMknkwQejUrKy28iy/kCFlSMwHcVyf/whmxqD0ggk=", "owner": "pjones", "repo": "plasma-manager", - "rev": "a02fef2ece8084aff0b41700bb57d24d73574cd1", + "rev": "29ad64f0ac4ae84710dfeb1d37572d95c94cbfd8", "type": "github" }, "original": { @@ -1538,11 +1538,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1726524647, - "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", + "lastModified": 1727734513, + "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", + "rev": "3198a242e547939c5e659353551b0668ec150268", "type": "github" }, "original": { From 1fb59d8d58e20c37e2013da04d590e441fcdb542 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:11:30 +0200 Subject: [PATCH 2005/2308] Enable catppuccin in home manager too --- home-manager/shared/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 5f9116c..dd81af8 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -19,6 +19,8 @@ homeDirectory = "/home/lillian"; }; + catppuccin.enable = true; + home.packages = with pkgs; [ # System tools: vscode-langservers-extracted From 13bad8a31a0a7993f75405c4cd93efd17eb2a790 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:25:26 +0200 Subject: [PATCH 2006/2308] Seems the zellij package makes the standard config file by default now, let's just fill that with the option --- home-manager/shared/shell/zellij/default.nix | 45 +++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 540cfec..36b811f 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -90,6 +90,39 @@ in { # TODO find specific settings for vscode to avoid enable = true; enableZshIntegration = true; + settings = { + session_serialization = true; + theme = "catppuccin-macchiato"; + + themes = { + catppuccin-mocha = { + bg = "#585b70"; + fg = "#cdd6f4"; + red = "#f38ba8"; + green = "#a6e3a1"; + blue = "#89b4fa"; + yellow = "#f9e2af"; + magenta = "#f5c2e7"; + orange = "#fab387"; + cyan = "#89dceb"; + black = "#181825"; + white = "#cdd6f4"; + }; + catppuccin-macchiato = { + bg = "#5b6078"; + fg = "#cad3f5"; + red = "#ed8796"; + green = "#a6da95"; + blue = "#8aadf4"; + yellow = "#eed49f"; + magenta = "#f5bde6"; + orange = "#f5a97f"; + cyan = "#91d7e3"; + black = "#1e2030"; + white = "#cad3f5"; + }; + }; + }; }; home.file = { @@ -98,10 +131,10 @@ in { target = ".config/zellij/layouts/default.kdl"; }; }; - home.file = { - "config" = { - source = ./zellij.kdl; - target = ".config/zellij/config.kdl"; - }; - }; + #home.file = { + # "config" = { + # source = ./zellij.kdl; + # target = ".config/zellij/config.kdl"; + # }; + #}; } From 4692f9a544aeead3163e7b156349b7eaf9c6094a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:28:54 +0200 Subject: [PATCH 2007/2308] Set home manager catppuccin to macchiato --- home-manager/shared/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index dd81af8..8e548d7 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -19,7 +19,10 @@ homeDirectory = "/home/lillian"; }; - catppuccin.enable = true; + catppuccin = { + enable = true; + catppuccin.flavor = "macchiato"; + }; home.packages = with pkgs; [ # System tools: From bd6fb261ca6e2daced10a9e64f0667d79f5b4940 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:29:41 +0200 Subject: [PATCH 2008/2308] Not catppuccin.catppuccin.flavor just catppuccin.flavor --- home-manager/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 8e548d7..4a6ced0 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -21,7 +21,7 @@ catppuccin = { enable = true; - catppuccin.flavor = "macchiato"; + flavor = "macchiato"; }; home.packages = with pkgs; [ From bd8ee02f3ef1f564e8e7c57618484b6b36226e5e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:31:27 +0200 Subject: [PATCH 2009/2308] Disable manual helix theming --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 018d614..ab4b3f3 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -9,7 +9,7 @@ defaultEditor = true; settings = { - theme = "catppuccin_macchiato"; + # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us editor = { line-number = "relative"; lsp.display-messages = true; From ee581afacc4a768a179e09c7cbdad23377e2ff1c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:36:25 +0200 Subject: [PATCH 2010/2308] Add kvantum for better catppuccin integration in the desktop --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 2997f89..5a7f2b1 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -83,6 +83,7 @@ kdePackages.plasma-pa kdePackages.sddm-kcm kdePackages.dolphin-plugins + kdepackages.qtstyleplugin-kvantum libportal-qt5 libportal From 5297100d4d9f0a6f5a8191777df8a0c078e8cd51 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:36:59 +0200 Subject: [PATCH 2011/2308] Forgot the capital letter in packages --- nixos/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 5a7f2b1..4b0123a 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -83,7 +83,7 @@ kdePackages.plasma-pa kdePackages.sddm-kcm kdePackages.dolphin-plugins - kdepackages.qtstyleplugin-kvantum + kdePackages.qtstyleplugin-kvantum libportal-qt5 libportal From f64d3674e04992bb2789d3bd639ac34edd5ce878 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:49:16 +0200 Subject: [PATCH 2012/2308] Let's try enabling kvantum theming manually --- home-manager/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 4a6ced0..54396bf 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -23,6 +23,7 @@ enable = true; flavor = "macchiato"; }; + qt.style.catppuccin.enable = true; home.packages = with pkgs; [ # System tools: From d36dbeb618c297355663760ef116d439eaa1a294 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:51:55 +0200 Subject: [PATCH 2013/2308] Have it overwrite kvantum settings --- home-manager/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 54396bf..9ad9cf9 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -24,6 +24,7 @@ flavor = "macchiato"; }; qt.style.catppuccin.enable = true; + qt.style.catppuccin.apply = true; home.packages = with pkgs; [ # System tools: From 5a09545d58e400ef473f98e4671d4b2ae934ddcb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 12:17:03 +0200 Subject: [PATCH 2014/2308] Manually enable macchiato theme for freetube --- home-manager/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 9ad9cf9..7add06a 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -23,8 +23,8 @@ enable = true; flavor = "macchiato"; }; - qt.style.catppuccin.enable = true; qt.style.catppuccin.apply = true; + programs.freetube.catppuccin.flavor = "macchiato"; home.packages = with pkgs; [ # System tools: From 3d39f6198de8cf516b079157ca656307398181fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 12:18:47 +0200 Subject: [PATCH 2015/2308] Move those options from shared to desktop --- home-manager/desktop/default.nix | 2 ++ home-manager/shared/default.nix | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 7a0bf0a..4b23059 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -76,6 +76,8 @@ # Add stuff for your user as you see fit: # programs.neovim.enable = true; # home.packages = with pkgs; [ steam ]; + qt.style.catppuccin.apply = true; + programs.freetube.catppuccin.flavor = "macchiato"; home.packages = with pkgs; [ # Coding: diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 7add06a..4a6ced0 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -23,8 +23,6 @@ enable = true; flavor = "macchiato"; }; - qt.style.catppuccin.apply = true; - programs.freetube.catppuccin.flavor = "macchiato"; home.packages = with pkgs; [ # System tools: From fbf4aa343978c7e2e6c1460079ab56b65af87e71 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 13:47:14 +0200 Subject: [PATCH 2016/2308] remove black formatter from vscode --- home-manager/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 4b23059..0f2d8fe 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -156,7 +156,6 @@ mkhl.direnv ms-toolsai.jupyter ms-pyright.pyright - ms-python.black-formatter oderwat.indent-rainbow rust-lang.rust-analyzer yzhang.markdown-all-in-one From 75d88d5a28594b8629eab8a9bb4ab326b91ee8f0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 16:57:31 +0200 Subject: [PATCH 2017/2308] Let's try and replace firefox with floorp --- home-manager/desktop/default.nix | 2 - .../desktop/package-configs/firefox.nix | 341 +----------------- .../package-configs/firefox/default.nix | 29 +- 3 files changed, 17 insertions(+), 355 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 0f2d8fe..172248b 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -144,8 +144,6 @@ enable = true; package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc-icons charliermarsh.ruff diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 0da278d..43f4854 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -6,7 +6,7 @@ programs.firefox = { enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; - package = pkgs.firefox; + package = pkgs.floorp; profiles.lillian = { isDefault = true; settings = { @@ -28,345 +28,6 @@ "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "DuckDuckGo"; }; - userChrome = '' - /* - Title: Drannex42's FirefoxSidebar / Vertical Tabs - Description: Vertical tab design for Firefox with dynamic indentation:: - Sideberry and TreeStyleTabs (Legacy) themes available! - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: 12022.04.17 - */ - - :root { - --sidebar-width: 50px; - --toolbar-height: 10px; - --menubar-height: 100px; - --sidebar-padding: calc(var(--sidebar-width) + 5px); - --toolbar-start-end-padding: 5px !important; - - /* Custom Sidebar/Header Backround :: - This sets the background for the other sidebar options (bookmarks, history, in case it is transparent from a theme that is not set up properly - */ - /* --custom-sidebar-bg: Field; /* Default: Field (Disabled) */ - /* --custom-sidebar-header-bg: #000; */ - - /* ====== Extension Settings ====== */ - - /* Window Control / Client Side Display Settings === - If you are putting this on the left or right side uncomment the side - preferences below and comment the other - ========================================================================= - */ - --csd-width: 100px; - --csd-top: 8px; - - /* - CSD - Left Side === - Default: --csd-left: 50px; --csd-margin-left: 92px; - */ - - /* - --csd-left: 50px; - --csd-margin-left: 92px; - */ - - /* - CSD - Right Side === - Defaults: --csd-right: 0px; --csd-margin-right: 95px; - */ - - --csd-right: 36px; - --csd-margin-right: 130px; - - /* === END: Window Control / Client Side Display Settings === */ - - /* === END: Extension Settings === */ - - } - - - /* ========================================================================= */ - - /* - Extension (Core): Sidebar - Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: v12024.05.15 (YYYYY.MM.DD) - */ - - #main-window #TabsToolbar { - visibility: collapse; - } - - /* As of v12024.05.15 we updated to using this one by MrOtherGuy, with modifications */ - /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_sidebar.css made available under Mozilla Public License v. 2.0 */ - - /* Show sidebar only when the cursor is over it */ - /* The border controlling sidebar width will be removed so you'll need to modify these values to change width */ - - #sidebar-box { - --uc-sidebar-width: 50px; - --uc-sidebar-hover-width: 260px; - --uc-autohide-sidebar-delay: 10ms; - /* Wait 0.6s before hiding sidebar */ - --uc-autohide-transition-duration: 115ms; - --uc-autohide-transition-type: linear; - position: relative; - min-width: var(--uc-sidebar-width) !important; - width: var(--uc-sidebar-width) !important; - max-width: var(--uc-sidebar-width) !important; - z-index: 1; - margin-top: -40px; - } - - - #sidebar-box[positionend] { - direction: rtl - } - - #sidebar-box[positionend]>* { - direction: ltr - } - - #sidebar-box[positionend]:-moz-locale-dir(rtl) { - direction: ltr - } - - #sidebar-box[positionend]:-moz-locale-dir(rtl)>* { - direction: rtl - } - - #main-window[sizemode="fullscreen"] #sidebar-box { - --uc-sidebar-width: 1px; - } - - #sidebar-splitter { - display: none - } - - #sidebar-header { - overflow: hidden; - color: var(--chrome-color, inherit) !important; - padding-inline: 0 !important; - background: var(--custom-sidebar-header-bg, inherit) !important; - padding: 8px 12px !important; - padding-top: 9px !important; - border-bottom: none !Important; - } - - #sidebar-header::before, - #sidebar-header::after { - content: ""; - display: flex; - padding-left: 0px; - } - - #sidebar-header, - #sidebar { - transition: min-width var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important; - min-width: var(--uc-sidebar-width) !important; - will-change: min-width; - } - - #sidebar-box:hover>#sidebar-header, - #sidebar-box:hover>#sidebar { - min-width: var(--uc-sidebar-hover-width) !important; - width: var(--uc-sidebar-hover-width) !important; - transition-delay: 0ms !important; - } - - #sidebar-box>#sidebar-header #sidebar-title { - opacity: 0; - } - - #sidebar-box:hover>#sidebar-header #sidebar-title { - opacity: 1; - } - - .sidebar-panel { - background-color: transparent !important; - color: var(--newtab-text-primary-color) !important; - } - - .sidebar-panel #search-box { - -moz-appearance: none !important; - background-color: rgba(249, 249, 250, 0.1) !important; - color: inherit !important; - } - - /* Add sidebar divider and give it background */ - - #sidebar, - #sidebar-header { - background-color: inherit !important; - border-right: 1px solid var(--sidebar-border-color); - border-inline-width: 0px 1px; - } - - #sidebar-box:not([positionend])> :-moz-locale-dir(rtl), - #sidebar-box[positionend]>* { - border-inline-width: 1px 0px; - } - - - /* Move statuspanel to the other side when sidebar is hovered so it doesn't get covered by sidebar */ - - #sidebar-box:not([positionend]):hover~#appcontent #statuspanel { - inset-inline: auto 0px !important; - } - - #sidebar-box:not([positionend]):hover~#appcontent #statuspanel-label { - margin-inline: 0px !important; - border-left-style: solid !important; - } - - - .browser-toolbar { - padding-left: var(--sidebar-width) !important; - position: relative !important; - } - - #PersonalToolbar { - padding: 2px 5px !important; - padding-top: 0px !important; - margin-top: 0px !important; - padding-left: calc(var(--sidebar-width) + 6px) !important; - } - - - /* - Extensions :: - To enable/disable specific extensions just comment/uncomment the line below. - ========================================================================= - */ - - /* - Extension: Window Controls / Client Side Decorations (CSD) - Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Contributors: Mr-nUUb, Xanaxus, Drannex42 - Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 - */ - - /* allow the buttons to appear */ - .browser-toolbar { - position: unset !important; - } - - /* reserve space for buttons */ - #nav-bar { - padding-right: var(--csd-margin-right) !important; - margin-left: var(--csd-margin-left) !important; - } - - /* move buttons next to menu button */ - .titlebar-buttonbox-container { - visibility: visible !important; - position: fixed !important; - display: block; - z-index: 999999999; - top: var(--csd-top, inherit); - right: var(--csd-right, inherit); - left: var(--csd-left, inherit); - max-width: var(--csd-width); - } - - /* hide buttons in fullscreen mode (video player and F11) */ - #main-window[inFullscreen="true"] .titlebar-buttonbox-container, - #main-window[inDOMFullscreen="true"] .titlebar-buttonbox-container { - visibility: hidden !important; - } - - /* remove empty space when in fullscreen mode (F11) */ - #main-window[inFullscreen="true"] #nav-bar { - padding-right: 0px !important; - margin-left: 0px !important; - } - - /* END Client Side Decorations / Window Controls */ - - - - /* - Extension: Superbox Removal (and compaction) - Description: This removes the superbox and fixes some padding around the urlbar. - Repository URL: https://github.com/drannex42/FirefoxSidebar - */ - - /* --- Prevent enlargement */ - #urlbar[breakout-extend] { - /* top: calc( */ - /* (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 */ - /* ) !important; */ - /* Fix due to deprecation https://www.reddit.com/r/firefox/comments/1cs3g49/address_bar_suggestions_going_up_instead_of_down/ */ - top: calc((var(--urlbar-container-height, --urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important; - left: 0 !important; - width: 100% !important; - } - - #urlbar[breakout-extend] #urlbar-input-container { - height: var(--urlbar-height) !important; - /* padding: 0px !important; */ - padding-block: 0px !important; - padding-inline: 0px !important; - } - - .urlbarView-row { - padding: 0px 2px 0px 2px; - } - - /* END Prevent enlargement --- */ - - /*/* --- Reduce row paddings to make them more compact */ - .urlbarView-row { - padding: 2px 0px !important; - line-height: 1.2em !important; - margin: -1px; - margin-bottom: 0px; - } - - .urlbarView-row-inner { - padding-bottom: 6px !important; - } - - .urlbarView { - margin: 0px !important; - width: 100% !important; - } - - /* END Reduce row paddings to make them more compact --- */ - - /* Disable Urlbar Animation */ - #urlbar[breakout][breakout-extend][breakout-extend-animate]>#urlbar-background { - animation-name: none !important; - animation: none !important; - } - - /* END Disable Urlbar Animation */ - - /* --- More compact "Search with Google" rows */ - .urlbarView-row[dynamicType="onboardTabToSearch"]>.urlbarView-row-inner { - min-height: auto !important; - width: auto !important; - } - - .urlbarView-row[dynamicType="onboardTabToSearch"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon { - margin-bottom: -1px; - } - - /* END More compact "Search with Google" rows --- */ - - /* Remove active border on the addressbar when in focus */ - #nav-bar { - --toolbar-field-focus-border-color: #ccc; - } - - /* Remove box shadow on address bar */ - #urlbar-background, - #searchbar { - box-shadow: none !important; - } - ''; bookmarks = [ { name = "estrogen production"; diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 394788b..432111e 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -5,7 +5,7 @@ }: { programs.firefox = { enable = true; - package = pkgs.firefox; + package = pkgs.floorp; policies = { DisableTelemetry = true; DisableFirefoxStudies = true; @@ -28,16 +28,16 @@ }; ExtensionSettings = { # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below - # Catppuccin Macchiato - Lavender theme: - "{6396519b-0923-41a4-948a-3cb54a3918b3}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-lavender/latest.xpi"; + # Catppuccin Macchiato - Mauve theme: + "{55750c61-e5f3-4d9a-898d-0643b3093678}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-mauve/latest.xpi"; installation_mode = "force_installed"; }; # Sideberry: - "{3c078156-979c-498b-8990-85f7987dd929}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"; - installation_mode = "force_installed"; - }; + #"{3c078156-979c-498b-8990-85f7987dd929}" = { + # install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"; + # installation_mode = "force_installed"; + #}; # Privacy Badger: "jid1-MnnxcxisBPnSXQ@jetpack" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi"; @@ -118,10 +118,6 @@ install_url = "https://addons.mozilla.org/firefox/downloads/file/4047136/wayback_machine_new-3.2.xpi"; installation_mode = "force_installed"; }; - "frankerfacez@frankerfacez.com" = { - install_url = "https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"; - installation_mode = "force_installed"; - }; }; FirefoxHome = { Search = true; @@ -141,11 +137,18 @@ "browser.compactmode.show" = true; "browser.uidensity" = 0; # "browser.newtabpage.activity-stream.feeds.topsites" = false; - # "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.system.showSponsored" = false; "font.name.serif.x-western" = "Crimson"; "font.name.sans-serif.x-western" = "Atkinson Hyperlegible"; "font.name.monospace.x-western" = "FiraCode Nerd Font"; "font.size.variable.x-western" = 14; + "floorp.browser.sidebar.useIconProvider" = "duckduckgo"; + "floorp.browser.tabbar.settings" = 2; + "floorp.browser.tabs.verticaltab" = true; + "floorp.tabbar.style" = 2; + "floorp.browser.user.interface" = 8; "signon.rememberSignons" = true; }; # TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks From 359e192ee6499b3d621a87a608d9958f410ca8bb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 17:29:18 +0200 Subject: [PATCH 2018/2308] Replace firefox with floorp on the hotbar --- home-manager/desktop/package-configs/plasma-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index a9d61e3..8113fef 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -79,7 +79,7 @@ config = { General = { launchers = [ - "applications:firefox.desktop" + "applications:floorp.desktop" "applications:systemsettings.desktop" "applications:org.kde.dolphin.desktop" "applications:signal-desktop.desktop" From 88b5d34202e8bb01981b530c95e898e33201819b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 18:44:14 +0200 Subject: [PATCH 2019/2308] add search engine options in firefox/floorp options and have the other disk in GLaDOS auto-mount --- disko/GLaDOS/default.nix | 17 +++++++++++++++++ .../desktop/package-configs/firefox.nix | 8 ++++++++ 2 files changed, 25 insertions(+) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index b418785..a44d858 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -41,6 +41,23 @@ }; }; }; + sda2 = { + device = "/dev/sda2"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + root = { + size = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/media"; + }; + }; + }; + }; + }; }; lvm_vg = { pool = { diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 43f4854..02e9159 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -7,6 +7,14 @@ enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; package = pkgs.floorp; + search = { + default = "DuckDuckGo"; + force = true; + engines = { + "Google".metaData.hidden = true; + "Bing".metaData.hidden = true; + }; + }; profiles.lillian = { isDefault = true; settings = { From df8210bcc9c66f812aae02438693f8cb0f1b0e3d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 18:45:49 +0200 Subject: [PATCH 2020/2308] Apparently not a thing :( --- home-manager/desktop/package-configs/firefox.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 02e9159..43f4854 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -7,14 +7,6 @@ enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; package = pkgs.floorp; - search = { - default = "DuckDuckGo"; - force = true; - engines = { - "Google".metaData.hidden = true; - "Bing".metaData.hidden = true; - }; - }; profiles.lillian = { isDefault = true; settings = { From b108e8a1ac29cacabff027a12c6e20d8f67d7cdf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 18:47:04 +0200 Subject: [PATCH 2021/2308] Oops that's the wrong disk --- disko/GLaDOS/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index a44d858..89c6396 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -41,8 +41,8 @@ }; }; }; - sda2 = { - device = "/dev/sda2"; + sdc = { + device = "/dev/sdc"; type = "disk"; content = { type = "gpt"; From dba9cffb913fa1bd847e24d93787ba70c21e2f08 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 19:09:29 +0200 Subject: [PATCH 2022/2308] This disko config is not working, corrupts the system, let's just comment it out for now :) --- disko/GLaDOS/default.nix | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index 89c6396..c605347 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -41,23 +41,23 @@ }; }; }; - sdc = { - device = "/dev/sdc"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/media"; - }; - }; - }; - }; - }; + #sdc = { + #device = "/dev/disk/by-path/pci-0000:06:00.0-ata-2"; + #type = "disk"; + #content = { + #type = "gpt"; + #partitions = { + #root = { + #size = "100%"; + #content = { + #type = "filesystem"; + #format = "ext4"; + #mountpoint = "/media"; + #}; + #}; + #}; + #}; + #}; }; lvm_vg = { pool = { From fe7949cbed0d180d19c05e3b753e7d09135be60d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Oct 2024 15:10:38 +0200 Subject: [PATCH 2023/2308] update flake lock --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index fe3ef12..92d64ea 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727662698, - "narHash": "sha256-HA1EYeH7SUDF6id4g3nY6krv/vUQldJuzahb7RFRzk4=", + "lastModified": 1728096501, + "narHash": "sha256-qtF5+wGoGeq83ISH6hWgyaWn5ErhEuYuI3MFnPXCcPc=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "9f20109509c553feeb57600a8a3b5e3177b43f6d", + "rev": "3829e49167eebfb763217b464c98f075ba78a06e", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1726952185, - "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", + "lastModified": 1727910534, + "narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=", "owner": "catppuccin", "repo": "nix", - "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", + "rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1727872461, - "narHash": "sha256-4Pw3fVhN6xey5+2gUBm9nQJAjBqivffr+a5ZsXYjzJ8=", + "lastModified": 1728109432, + "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", "owner": "nix-community", "repo": "disko", - "rev": "568727a884ae7cd9f266bd19aea655def8cafd78", + "rev": "48ebb577855fb2398653f033b3b2208a9249203d", "type": "github" }, "original": { @@ -764,11 +764,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1727865565, - "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", + "lastModified": 1728017225, + "narHash": "sha256-lLV+OMkMeFqTEmoIZhpWtw6H+ebghupckhrCO+K0MdU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", + "rev": "cb63dc934ba512b2d56d89b94c5da7894f6a7809", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1727702862, - "narHash": "sha256-4ai7yRN8b2i43gNTAXfAuOw/uIzGqMLON1IXtIRrwOM=", + "lastModified": 1727917377, + "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f7eb021d9dfd61f0e0075e483f3579c6f8453bb3", + "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1727885193, - "narHash": "sha256-900otYvwsCSQk9eiCUvdeJ5PGx+i8YhTvN1kohFDGTQ=", + "lastModified": 1728133552, + "narHash": "sha256-xTDvuHN/Q682ZD8lm8pXeYeL5L4qYyBVKdEZZCetY7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce76e7aa78ace4a8cc96582f6d9d2b12eb7606a1", + "rev": "0c0a393832517a75e87d66ed5828af92a547ba26", "type": "github" }, "original": { @@ -1176,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -1224,11 +1224,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1727463368, - "narHash": "sha256-5glMknkwQejUrKy28iy/kCFlSMwHcVyf/whmxqD0ggk=", + "lastModified": 1727917089, + "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "29ad64f0ac4ae84710dfeb1d37572d95c94cbfd8", + "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", "type": "github" }, "original": { From 78e8fb1dbf0f6de6d92d162a97bdefcee34e85fa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Oct 2024 15:19:52 +0200 Subject: [PATCH 2024/2308] Enable kde connect in home manager --- home-manager/desktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 172248b..d909827 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -201,6 +201,8 @@ no-autostart = true; }; + services.kdeconnect.enable = true; + # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; } From 22ba8683484ddf15da6d13ec16abe3d0e0feef2d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Oct 2024 15:22:22 +0200 Subject: [PATCH 2025/2308] It seem to pull kde connect for QT5 by default, let's set the package and see if that fixes it --- home-manager/desktop/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index d909827..9a46c42 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -201,7 +201,10 @@ no-autostart = true; }; - services.kdeconnect.enable = true; + services.kdeconnect = { + package = pkgs.kdePackages.kdeconnect-kde; + enable = true; + }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; From 0aee85833db03a5795c1954aff1f368749716854 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 10 Oct 2024 15:22:27 +0200 Subject: [PATCH 2026/2308] update flake lock --- flake.lock | 132 ++++++++++++++++++++++++++--------------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 92d64ea..63d14af 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728096501, - "narHash": "sha256-qtF5+wGoGeq83ISH6hWgyaWn5ErhEuYuI3MFnPXCcPc=", + "lastModified": 1728525495, + "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "3829e49167eebfb763217b464c98f075ba78a06e", + "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1727910534, - "narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", "owner": "catppuccin", "repo": "nix", - "rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1726444589, - "narHash": "sha256-dWKVjS4wvyZxRjhUICTnnw8mHYwJij4SGvXIG/U5oRo=", + "lastModified": 1728182038, + "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "032b199129f8648a77bde285f755a78e9ec349a7", + "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "crane_5": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1728109432, - "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", + "lastModified": 1728334376, + "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", "owner": "nix-community", "repo": "disko", - "rev": "48ebb577855fb2398653f033b3b2208a9249203d", + "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", "type": "github" }, "original": { @@ -670,11 +670,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -764,11 +764,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1728017225, - "narHash": "sha256-lLV+OMkMeFqTEmoIZhpWtw6H+ebghupckhrCO+K0MdU=", + "lastModified": 1728410210, + "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cb63dc934ba512b2d56d89b94c5da7894f6a7809", + "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", "type": "github" }, "original": { @@ -807,11 +807,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727792571, - "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", + "lastModified": 1728199407, + "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", + "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", "type": "github" }, "original": { @@ -936,11 +936,11 @@ ] }, "locked": { - "lastModified": 1727658919, - "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", + "lastModified": 1728263287, + "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", + "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "type": "github" }, "original": { @@ -982,11 +982,11 @@ }, "nixlib": { "locked": { - "lastModified": 1727571693, - "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", + "lastModified": 1728176478, + "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", + "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1727917377, - "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=", + "lastModified": 1728522165, + "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4", + "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728133552, - "narHash": "sha256-xTDvuHN/Q682ZD8lm8pXeYeL5L4qYyBVKdEZZCetY7o=", + "lastModified": 1728565888, + "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c0a393832517a75e87d66ed5828af92a547ba26", + "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", "type": "github" }, "original": { @@ -1160,11 +1160,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -1176,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1287,11 +1287,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", + "lastModified": 1728093190, + "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", + "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", "type": "github" }, "original": { @@ -1303,11 +1303,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1726481836, - "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", "type": "github" }, "original": { @@ -1497,11 +1497,11 @@ ] }, "locked": { - "lastModified": 1726453838, - "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", + "lastModified": 1728095260, + "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", + "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", "type": "github" }, "original": { @@ -1538,11 +1538,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1727734513, - "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3198a242e547939c5e659353551b0668ec150268", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -1655,11 +1655,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1726515093, - "narHash": "sha256-Y2OHV3QfLPQj3Q4+TmrMeRXthwigU/YSBv2g8y8GWWU=", + "lastModified": 1728141581, + "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", "owner": "dj95", "repo": "zjstatus", - "rev": "d1c662c1052adec6f14f3ee8a51cecebe4a29ffa", + "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", "type": "github" }, "original": { From 9f2d428e2fc4862d11aeab04fabe89afdbca113f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 16 Oct 2024 10:52:16 +0200 Subject: [PATCH 2027/2308] Add a helix layout file to zellij --- home-manager/shared/shell/zellij/default.nix | 89 ++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 36b811f..1565979 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -54,6 +54,89 @@ } } + default_tab_template { + pane size=1 borderless=true { + plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" + + mode_locked "#[fg=magenta,bold] {name} " + mode_normal "#[fg=green,bold] {name} " + mode_resize "#[fg=orange,bold] {name} " + mode_default_to_mode "resize" + + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" + + tab_sync_indicator " " + tab_fullscreen_indicator "□ " + tab_floating_indicator "󰉈 " + + datetime "#[bg=#C9D2F5,fg=#1D1D2E,bold]{format} " + datetime_format "%Y-%m-%d %H:%M" + datetime_timezone "Europe/Amsterdam" + } + } + children + pane size=2 borderless=true { + plugin location="status-bar" + } + } + } + ''; + helix_zellij = + pkgs.writeText "helix.kdl" + '' + layout { + tab { + pane { + command "hx" + args "." + } + pane split_direction="vertical" size="20%" {} + } + swap_tiled_layout name="vertical" { + tab max_panes=5 { + pane split_direction="vertical" { + pane + pane { children; } + } + } + tab max_panes=8 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + pane { pane; pane; pane; pane; } + } + } + } + + swap_tiled_layout name="horizontal" { + tab max_panes=5 { + pane + pane + } + tab max_panes=8 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + } + default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { @@ -131,6 +214,12 @@ in { target = ".config/zellij/layouts/default.kdl"; }; }; + home.file = { + "helix_zellij" = { + source = "${helix_zellij}"; + target = ".config/zellij/layouts/helix.kdl"; + }; + }; #home.file = { # "config" = { # source = ./zellij.kdl; From a5f4745bf8e12e814cb95a819c63d6a533c926ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 16 Oct 2024 21:47:40 +0200 Subject: [PATCH 2028/2308] do the correct zsh and zellij magics --- home-manager/shared/default.nix | 2 + home-manager/shared/shell/helix/default.nix | 7 ++ home-manager/shared/shell/zellij/default.nix | 89 ++++++++++++++++++++ home-manager/shared/shell/zsh.nix | 1 + 4 files changed, 99 insertions(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 4a6ced0..9841353 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -31,5 +31,7 @@ zsh bat btop + broot + lazygit ]; } diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index ab4b3f3..0362579 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -10,6 +10,13 @@ settings = { # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us + keys.normal.backspace = { + b = ":run-shell-command zellij run -f -- just build"; + r = ":run-shell-command zellij run -f -- just run"; + t = ":run-shell-command zellij run -f -- just test"; + g = ":run-shell-command zellij run -fc -- lazygit"; + f = ":run-shell-command zellij run -fc -- broot"; + }; editor = { line-number = "relative"; lsp.display-messages = true; diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 36b811f..1565979 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -54,6 +54,89 @@ } } + default_tab_template { + pane size=1 borderless=true { + plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" + + mode_locked "#[fg=magenta,bold] {name} " + mode_normal "#[fg=green,bold] {name} " + mode_resize "#[fg=orange,bold] {name} " + mode_default_to_mode "resize" + + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" + + tab_sync_indicator " " + tab_fullscreen_indicator "□ " + tab_floating_indicator "󰉈 " + + datetime "#[bg=#C9D2F5,fg=#1D1D2E,bold]{format} " + datetime_format "%Y-%m-%d %H:%M" + datetime_timezone "Europe/Amsterdam" + } + } + children + pane size=2 borderless=true { + plugin location="status-bar" + } + } + } + ''; + helix_zellij = + pkgs.writeText "helix.kdl" + '' + layout { + tab { + pane { + command "hx" + args "." + } + pane split_direction="vertical" size="20%" {} + } + swap_tiled_layout name="vertical" { + tab max_panes=5 { + pane split_direction="vertical" { + pane + pane { children; } + } + } + tab max_panes=8 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + pane { pane; pane; pane; pane; } + } + } + } + + swap_tiled_layout name="horizontal" { + tab max_panes=5 { + pane + pane + } + tab max_panes=8 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + } + default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { @@ -131,6 +214,12 @@ in { target = ".config/zellij/layouts/default.kdl"; }; }; + home.file = { + "helix_zellij" = { + source = "${helix_zellij}"; + target = ".config/zellij/layouts/helix.kdl"; + }; + }; #home.file = { # "config" = { # source = ./zellij.kdl; diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index cc38d8f..55878f2 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -71,6 +71,7 @@ initExtra = '' eval "$(zoxide init --cmd cd zsh)" tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; } + zhx() { command zellij action new-tab --layout $HOME/.config/zellij/layouts/helix.kdl; } ''; }; } From 20ae80fb0d315ff865bd0dd36673055f016f9d1e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 16 Oct 2024 21:54:19 +0200 Subject: [PATCH 2029/2308] add just to system packages --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 307e099..ff3e59c 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -36,6 +36,7 @@ helix home-manager htop + just killall oh-my-zsh rsync From 7429a32a06e4faf74609a8259c8e43ecf1fc52b1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 16 Oct 2024 22:32:19 +0200 Subject: [PATCH 2030/2308] added direnv exec to the run and compile commands so zellij can see the direnv --- home-manager/shared/shell/helix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 0362579..1222c51 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -11,9 +11,9 @@ settings = { # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us keys.normal.backspace = { - b = ":run-shell-command zellij run -f -- just build"; - r = ":run-shell-command zellij run -f -- just run"; - t = ":run-shell-command zellij run -f -- just test"; + b = ":run-shell-command zellij run -f -- direnv exec . just build"; + r = ":run-shell-command zellij run -f -- direnv exec . just run"; + t = ":run-shell-command zellij run -f -- direnv exec . just test"; g = ":run-shell-command zellij run -fc -- lazygit"; f = ":run-shell-command zellij run -fc -- broot"; }; From c31a2f29740873197aa59a80bfab843a93eaa266 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 17 Oct 2024 15:19:49 +0200 Subject: [PATCH 2031/2308] replace webcord with vesktop --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 9a46c42..ddc43a0 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -90,7 +90,7 @@ # Chat applications: signal-desktop - webcord-vencord + vesktop cinny-desktop # Gaming: From bddd7e8a31cd22a409430717ca77b5e5b29b6e30 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 17 Oct 2024 15:27:40 +0200 Subject: [PATCH 2032/2308] added justfile and edited plasma to have vesktop instead of webcord --- .../desktop/package-configs/plasma-desktop.nix | 2 +- justfile | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 justfile diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 8113fef..f1d9252 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -83,7 +83,7 @@ "applications:systemsettings.desktop" "applications:org.kde.dolphin.desktop" "applications:signal-desktop.desktop" - "applications:webcord.desktop" + "applications:vesktop.desktop" "applications:cinny.desktop" "applications:steam.desktop" "applications:noisetorch.desktop" diff --git a/justfile b/justfile new file mode 100644 index 0000000..d454135 --- /dev/null +++ b/justfile @@ -0,0 +1,11 @@ +build: + sudo nixos-rebuild switch --flake .# + +run: + nix-repl -f flake:nixpkgs + +test: + sudo nix flake check + +update: + nix flake update From df3dbf356e22b01f88cdc768db9eeb0147cb5d4b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 17 Oct 2024 16:52:50 +0200 Subject: [PATCH 2033/2308] remove bottom pane from editor prompt --- home-manager/shared/shell/zellij/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 1565979..10a600e 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -93,7 +93,6 @@ command "hx" args "." } - pane split_direction="vertical" size="20%" {} } swap_tiled_layout name="vertical" { tab max_panes=5 { From 7b8d516b6a60da435c6618e537248caba359575a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 17 Oct 2024 17:05:30 +0200 Subject: [PATCH 2034/2308] Added and enabled navi on all systems --- home-manager/shared/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 9841353..9bac4a0 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -33,5 +33,7 @@ btop broot lazygit + navi ]; + programs.navi.enable = true; } From cb87a12ad25ee2a3e36f4ccff48d6fd2f2307cc3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 18 Oct 2024 17:43:10 +0200 Subject: [PATCH 2035/2308] added yazi as a fancy file picker to helix with a simple backspace + f command :) --- home-manager/shared/default.nix | 1 + home-manager/shared/shell/helix/default.nix | 32 +++++++++++++++++---- home-manager/shared/shell/zsh.nix | 2 +- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 9bac4a0..799caca 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -34,6 +34,7 @@ broot lazygit navi + yazi ]; programs.navi.enable = true; } diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 1222c51..76304ef 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -3,7 +3,20 @@ lib, pkgs, ... -}: { +}: let + yazi = + pkgs.writeText "open_in_helix_from_yazi.zsh" + '' + #! ~/.nix-profile/bin/zsh + files=(''${(fqq)"$( yazi --chooser-file=/dev/stdout | cat )"}) + zellij action toggle-floating-panes + zellij action write 27 # send escape-key + zellij action write-chars ":open $files" + zellij action write 13 # send enter-key + zellij action toggle-floating-panes + zellij action close-pane + ''; +in { programs.helix = { enable = true; defaultEditor = true; @@ -11,11 +24,11 @@ settings = { # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us keys.normal.backspace = { - b = ":run-shell-command zellij run -f -- direnv exec . just build"; - r = ":run-shell-command zellij run -f -- direnv exec . just run"; - t = ":run-shell-command zellij run -f -- direnv exec . just test"; - g = ":run-shell-command zellij run -fc -- lazygit"; - f = ":run-shell-command zellij run -fc -- broot"; + b = ":sh zellij run -f -n 'build code' -- direnv exec . just build"; + r = ":sh zellij run -f -n 'run code' -- direnv exec . just run"; + t = ":sh zellij run -f -n 'test code' -- direnv exec . just test"; + g = ":sh zellij run -fc -n 'lazygit' -- lazygit"; + f = ":sh zellij run --floating -n 'yazi picker' -- zsh ~/.config/helix/open_in_helix_from_yazi.zsh "; }; editor = { line-number = "relative"; @@ -165,4 +178,11 @@ target = ".config/helix/external-snippets.toml"; }; }; + + home.file = { + "yazi" = { + source = "${yazi}"; + target = ".config/helix/open_in_helix_from_yazi.zsh"; + }; + }; } diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index 55878f2..a3108ff 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -67,7 +67,7 @@ "zsh-navigation-tools" ]; }; - # stuff for zoxide & tre + # Extra commands that take more complex forms initExtra = '' eval "$(zoxide init --cmd cd zsh)" tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; } From d1447a650de7ff1a38da4737989e9a3b63a2cf99 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 15:07:13 +0200 Subject: [PATCH 2036/2308] update cinny and nextcloud package versions and update flake lock --- flake.lock | 180 +++++++++--------- home-manager/desktop/default.nix | 2 +- .../package-configs/nextcloud/default.nix | 2 +- 3 files changed, 89 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index 92d64ea..0af5b3e 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728096501, - "narHash": "sha256-qtF5+wGoGeq83ISH6hWgyaWn5ErhEuYuI3MFnPXCcPc=", + "lastModified": 1728768056, + "narHash": "sha256-nDz1+eO5ziimxiyqtKVT3Gj9OZfk3WVhC4czo6EGec8=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "3829e49167eebfb763217b464c98f075ba78a06e", + "rev": "4f9293b045cf32dfc629ce300180d311aba8f53a", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1727910534, - "narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", "owner": "catppuccin", "repo": "nix", - "rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1726444589, - "narHash": "sha256-dWKVjS4wvyZxRjhUICTnnw8mHYwJij4SGvXIG/U5oRo=", + "lastModified": 1728182038, + "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "032b199129f8648a77bde285f755a78e9ec349a7", + "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", "type": "github" }, "original": { @@ -247,18 +247,12 @@ } }, "crane_4": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1728776144, + "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "f876e3d905b922502f031aeec1a84490122254b7", "type": "github" }, "original": { @@ -269,11 +263,11 @@ }, "crane_5": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "type": "github" }, "original": { @@ -358,11 +352,11 @@ ] }, "locked": { - "lastModified": 1728109432, - "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", + "lastModified": 1729281548, + "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", "owner": "nix-community", "repo": "disko", - "rev": "48ebb577855fb2398653f033b3b2208a9249203d", + "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", "type": "github" }, "original": { @@ -579,11 +573,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -670,11 +664,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -764,11 +758,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1729321331, + "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", "type": "github" }, "original": { @@ -784,11 +778,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1728017225, - "narHash": "sha256-lLV+OMkMeFqTEmoIZhpWtw6H+ebghupckhrCO+K0MdU=", + "lastModified": 1729177642, + "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cb63dc934ba512b2d56d89b94c5da7894f6a7809", + "rev": "bb69165ff372ddbd3228a03513922acd783040e8", "type": "github" }, "original": { @@ -807,11 +801,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727792571, - "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", + "lastModified": 1729064530, + "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", + "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", "type": "github" }, "original": { @@ -936,11 +930,11 @@ ] }, "locked": { - "lastModified": 1727658919, - "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", + "lastModified": 1728790083, + "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", + "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", "type": "github" }, "original": { @@ -982,11 +976,11 @@ }, "nixlib": { "locked": { - "lastModified": 1727571693, - "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", + "lastModified": 1728781282, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", + "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b", "type": "github" }, "original": { @@ -1003,11 +997,11 @@ ] }, "locked": { - "lastModified": 1727917377, - "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=", + "lastModified": 1729127034, + "narHash": "sha256-42AMGl+dh4I2wGgICSeDI1mqYaDEJhwqquHJ1vA0QiQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4", + "rev": "dd28a0806e7124fe392c33c9ccaa12f21970401f", "type": "github" }, "original": { @@ -1018,11 +1012,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1729333370, + "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", "type": "github" }, "original": { @@ -1065,11 +1059,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728133552, - "narHash": "sha256-xTDvuHN/Q682ZD8lm8pXeYeL5L4qYyBVKdEZZCetY7o=", + "lastModified": 1729342391, + "narHash": "sha256-T89yRYGbO4/8gDn7ttuaX9Mxi71D4Q9h8danhqm4CiY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c0a393832517a75e87d66ed5828af92a547ba26", + "rev": "0708033e05433075a518c60245207c9eeea0c628", "type": "github" }, "original": { @@ -1160,11 +1154,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -1176,11 +1170,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -1224,11 +1218,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -1240,11 +1234,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", + "lastModified": 1728897630, + "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "c9f0b4a395289ce18727e2a8e43cae6796693ccc", "type": "github" }, "original": { @@ -1256,11 +1250,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -1287,11 +1281,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", + "lastModified": 1728093190, + "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", + "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", "type": "github" }, "original": { @@ -1303,11 +1297,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1726481836, - "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", "type": "github" }, "original": { @@ -1327,11 +1321,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1729243807, + "narHash": "sha256-YxS3wU1cdhK/aYaj9ODukmg451uMCdCVlOhjtFh9YJc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "30d186abf38f8dd248ed9046c45b422ed21bdbb0", "type": "github" }, "original": { @@ -1381,11 +1375,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -1476,11 +1470,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1728959392, + "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", "type": "github" }, "original": { @@ -1497,11 +1491,11 @@ ] }, "locked": { - "lastModified": 1726453838, - "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", + "lastModified": 1728095260, + "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", + "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", "type": "github" }, "original": { @@ -1538,11 +1532,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1727734513, - "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3198a242e547939c5e659353551b0668ec150268", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -1655,11 +1649,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1726515093, - "narHash": "sha256-Y2OHV3QfLPQj3Q4+TmrMeRXthwigU/YSBv2g8y8GWWU=", + "lastModified": 1728141581, + "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", "owner": "dj95", "repo": "zjstatus", - "rev": "d1c662c1052adec6f14f3ee8a51cecebe4a29ffa", + "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", "type": "github" }, "original": { diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index ddc43a0..3d59b2c 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -22,7 +22,7 @@ ./package-configs/foot ]; nixpkgs = { - config.permittedInsecurePackages = ["cinny-4.2.1" "cinny-unwrapped-4.2.1"]; + config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2"]; # You can add overlays here overlays = [ # You can also add overlays exported from other flakes: diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 483401b..a3ed25a 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -49,7 +49,7 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; # Use HTTPS for links https = true; From c42c7a684a87d7277b3bc56bad788e6aef1c7136 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 18:47:20 +0200 Subject: [PATCH 2037/2308] added show trace to the justfile commands --- justfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index d454135..b0aad0e 100644 --- a/justfile +++ b/justfile @@ -1,11 +1,11 @@ build: - sudo nixos-rebuild switch --flake .# + sudo nixos-rebuild switch --flake .# --show-trace run: nix-repl -f flake:nixpkgs test: - sudo nix flake check + sudo nix flake check --show-trace update: nix flake update From f7bc2a5635b788b1572e856ce7dad416ce4f934c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 19:17:40 +0200 Subject: [PATCH 2038/2308] replace webcord with vesktop in shodan too, and update plasma manager file --- .../package-configs/plasma-desktop.nix | 356 +++++++++--------- home-manager/hosts/shodan/lillian.nix | 2 +- 2 files changed, 169 insertions(+), 189 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index f1d9252..a0c23f2 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -103,55 +103,52 @@ ]; shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."decrease_volume_small" = "Shift+Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "" "Meta+Volume Mute\\, ,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = []; - "ksmserver"."Lock Session" = ["Meta+L" "" "Screensaver\\, ,Meta+L" "Screensaver,Lock Session"]; + "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = []; - "ksmserver"."LogOut" = []; - "ksmserver"."Reboot" = []; - "ksmserver"."Reboot Without Confirmation" = []; - "ksmserver"."Shut Down" = []; + "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; + "ksmserver"."LogOut" = "none,,Log Out"; + "ksmserver"."Reboot" = "none,,Reboot"; + "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; + "ksmserver"."Shut Down" = "none,,Shut Down"; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cube" = "Meta+C\\, ,none"; - "kwin"."Cycle Overview" = []; - "kwin"."Cycle Overview Opposite" = []; - "kwin"."Decrease Opacity" = []; + "kwin"."Cycle Overview" = [ ]; + "kwin"."Cycle Overview Opposite" = [ ]; + "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "" "Launch (C)\\, ,Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."ExposeClassCurrentDesktop" = [ ]; "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = []; + "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = []; + "kwin"."Move Tablet to Next Output" = [ ]; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = []; - "kwin"."MoveZoomLeft" = []; - "kwin"."MoveZoomRight" = []; - "kwin"."MoveZoomUp" = []; + "kwin"."MoveZoomDown" = [ ]; + "kwin"."MoveZoomLeft" = [ ]; + "kwin"."MoveZoomRight" = [ ]; + "kwin"."MoveZoomUp" = [ ]; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = []; + "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8\\, ,none"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12\\, ,none"; "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; @@ -161,136 +158,136 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = []; - "kwin"."Switch to Desktop 11" = []; - "kwin"."Switch to Desktop 12" = []; - "kwin"."Switch to Desktop 13" = []; - "kwin"."Switch to Desktop 14" = []; - "kwin"."Switch to Desktop 15" = []; - "kwin"."Switch to Desktop 16" = []; - "kwin"."Switch to Desktop 17" = []; - "kwin"."Switch to Desktop 18" = []; - "kwin"."Switch to Desktop 19" = []; + "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; + "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; + "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; + "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; + "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; + "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; + "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; + "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; + "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; + "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = []; + "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = []; - "kwin"."Switch to Desktop 6" = []; - "kwin"."Switch to Desktop 7" = []; - "kwin"."Switch to Desktop 8" = []; - "kwin"."Switch to Desktop 9" = []; - "kwin"."Switch to Next Desktop" = []; - "kwin"."Switch to Next Screen" = []; - "kwin"."Switch to Previous Desktop" = []; - "kwin"."Switch to Previous Screen" = []; - "kwin"."Switch to Screen 0" = []; - "kwin"."Switch to Screen 1" = []; - "kwin"."Switch to Screen 2" = []; - "kwin"."Switch to Screen 3" = []; - "kwin"."Switch to Screen 4" = []; - "kwin"."Switch to Screen 5" = []; - "kwin"."Switch to Screen 6" = []; - "kwin"."Switch to Screen 7" = []; - "kwin"."Switch to Screen Above" = []; - "kwin"."Switch to Screen Below" = []; - "kwin"."Switch to Screen to the Left" = []; - "kwin"."Switch to Screen to the Right" = []; - "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = []; - "kwin"."Walk Through Desktop List" = []; - "kwin"."Walk Through Desktop List (Reverse)" = []; - "kwin"."Walk Through Desktops" = []; - "kwin"."Walk Through Desktops (Reverse)" = []; + "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; + "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; + "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; + "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; + "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; + "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; + "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; + "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; + "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; + "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; + "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; + "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; + "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; + "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; + "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; + "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; + "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; + "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; + "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; + "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; + "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; + "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; + "kwin"."Walk Through Desktop List" = [ ]; + "kwin"."Walk Through Desktop List (Reverse)" = [ ]; + "kwin"."Walk Through Desktops" = [ ]; + "kwin"."Walk Through Desktops (Reverse)" = [ ]; "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab\\, Alt+Shift+Tab\\, ,Alt+Shift+Tab,Walk Through Windows (Reverse)"; - "kwin"."Walk Through Windows Alternative" = []; - "kwin"."Walk Through Windows Alternative (Reverse)" = []; - "kwin"."Walk Through Windows of Current Application" = "\\, Alt+`\\, ,Alt+`,Walk Through Windows of Current Application"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Tab"; + "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; + "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = []; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; - "kwin"."Window Above Other Windows" = []; - "kwin"."Window Below Other Windows" = []; + "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; + "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; + "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = []; - "kwin"."Window Grow Horizontal" = []; - "kwin"."Window Grow Vertical" = []; - "kwin"."Window Lower" = []; + "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; + "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; + "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; + "kwin"."Window Lower" = "none,,Lower Window"; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = []; - "kwin"."Window Maximize Vertical" = []; + "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; + "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = []; - "kwin"."Window Move Center" = []; - "kwin"."Window No Border" = []; - "kwin"."Window On All Desktops" = []; + "kwin"."Window Move" = "none,,Move Window"; + "kwin"."Window Move Center" = "none,,Move Window to the Center"; + "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; + "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = []; - "kwin"."Window One Screen Up" = []; - "kwin"."Window One Screen to the Left" = []; - "kwin"."Window One Screen to the Right" = []; + "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; + "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; + "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; + "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = []; - "kwin"."Window Pack Left" = []; - "kwin"."Window Pack Right" = []; - "kwin"."Window Pack Up" = []; + "kwin"."Window Pack Down" = "none,,Move Window Down"; + "kwin"."Window Pack Left" = "none,,Move Window Left"; + "kwin"."Window Pack Right" = "none,,Move Window Right"; + "kwin"."Window Pack Up" = "none,,Move Window Up"; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = []; - "kwin"."Window Quick Tile Bottom Right" = []; + "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; + "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = []; - "kwin"."Window Quick Tile Top Right" = []; - "kwin"."Window Raise" = []; - "kwin"."Window Resize" = []; - "kwin"."Window Shade" = []; - "kwin"."Window Shrink Horizontal" = []; - "kwin"."Window Shrink Vertical" = []; - "kwin"."Window to Desktop 1" = []; - "kwin"."Window to Desktop 10" = []; - "kwin"."Window to Desktop 11" = []; - "kwin"."Window to Desktop 12" = []; - "kwin"."Window to Desktop 13" = []; - "kwin"."Window to Desktop 14" = []; - "kwin"."Window to Desktop 15" = []; - "kwin"."Window to Desktop 16" = []; - "kwin"."Window to Desktop 17" = []; - "kwin"."Window to Desktop 18" = []; - "kwin"."Window to Desktop 19" = []; - "kwin"."Window to Desktop 2" = []; - "kwin"."Window to Desktop 20" = []; - "kwin"."Window to Desktop 3" = []; - "kwin"."Window to Desktop 4" = []; - "kwin"."Window to Desktop 5" = []; - "kwin"."Window to Desktop 6" = []; - "kwin"."Window to Desktop 7" = []; - "kwin"."Window to Desktop 8" = []; - "kwin"."Window to Desktop 9" = []; - "kwin"."Window to Next Desktop" = []; - "kwin"."Window to Next Screen" = "\\, Meta+Shift+Right\\, ,Meta+Shift+Right,Move Window to Next Screen"; - "kwin"."Window to Previous Desktop" = []; - "kwin"."Window to Previous Screen" = "\\, Meta+Shift+Left\\, ,Meta+Shift+Left,Move Window to Previous Screen"; - "kwin"."Window to Screen 0" = []; - "kwin"."Window to Screen 1" = []; - "kwin"."Window to Screen 2" = []; - "kwin"."Window to Screen 3" = []; - "kwin"."Window to Screen 4" = []; - "kwin"."Window to Screen 5" = []; - "kwin"."Window to Screen 6" = []; - "kwin"."Window to Screen 7" = []; - "kwin"."view_actual_size" = ",Meta+0,Zoom to Actual Size"; - "kwin"."view_zoom_in" = ["Meta++\\, Meta++" "Meta+=\\, Zoom In,Meta++" "Meta+=,Zoom In"]; + "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; + "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; + "kwin"."Window Raise" = "none,,Raise Window"; + "kwin"."Window Resize" = "none,,Resize Window"; + "kwin"."Window Shade" = "none,,Shade Window"; + "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; + "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; + "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; + "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; + "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; + "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; + "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; + "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; + "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; + "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; + "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; + "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; + "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; + "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; + "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; + "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; + "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; + "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; + "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; + "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; + "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; + "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; + "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; + "kwin"."Window to Next Screen" = "Meta+Shift+Right"; + "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; + "kwin"."Window to Previous Screen" = "Meta+Shift+Left"; + "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; + "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; + "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; + "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; + "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; + "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; + "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; + "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; + "kwin"."view_actual_size" = "\\, Meta+0\\, ,Meta+0,Zoom to Actual Size"; + "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = "\\, ,,Media volume down"; - "mediacontrol"."mediavolumeup" = []; + "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumeup" = "none,,Media volume up"; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = []; + "mediacontrol"."playmedia" = "none,,Play media playback"; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; @@ -305,11 +302,11 @@ "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = []; - "org_kde_powerdevil"."powerProfile" = ["Battery" "" "Meta+B\\, ,Battery" "Meta+B,Switch Power Profile"]; - "plasmashell"."activate application launcher" = ["Meta" "" "Alt+F1\\, ,Meta" "Alt+F1,Activate Application Launcher"]; + "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; + "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = "\\, Meta+0\\, ,Meta+0,Activate Task Manager Entry 10"; + "plasmashell"."activate task manager entry 10" = ",Meta+0,Activate Task Manager Entry 10"; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -318,32 +315,32 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = []; + "plasmashell"."clear-history" = "none,,Clear Clipboard History"; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = []; - "plasmashell"."cyclePrevAction" = []; - "plasmashell"."edit_clipboard" = []; + "plasmashell"."cycleNextAction" = "none,,Next History Item"; + "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; + "plasmashell"."edit_clipboard" = [ ]; "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = ",none,Walk through activities"; + "plasmashell"."next activity" = "\\, \\, ,none,Walk through activities"; "plasmashell"."previous activity" = ",none,Walk through activities (Reverse)"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = []; + "plasmashell"."show-barcode" = "none,,Show Barcode…"; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = []; - "plasmashell"."switch to previous activity" = []; - "plasmashell"."toggle do not disturb" = []; + "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; + "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; + "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; "services/org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Ctrl+Shift+Space" "Search"]; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/org.kde.spectacle.desktop"."RecordRegion" = []; - "services/org.kde.spectacle.desktop"."RecordScreen" = []; - "services/org.kde.spectacle.desktop"."RecordWindow" = []; + "services/org.kde.spectacle.desktop"."RecordRegion" = [ ]; + "services/org.kde.spectacle.desktop"."RecordScreen" = [ ]; + "services/org.kde.spectacle.desktop"."RecordWindow" = [ ]; "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; @@ -352,7 +349,7 @@ "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services/services.org.kde.spectacle.desktop"."RecordWindow" = [ ]; "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; @@ -361,7 +358,7 @@ "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = [ ]; "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; @@ -374,6 +371,7 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; + "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; @@ -449,7 +447,7 @@ "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; "katerc"."KTextEditor View"."Bracket Match Preview" = false; - "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}\x5b\x5d'\""; + "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}x5bx5d'\""; "katerc"."KTextEditor View"."Default Mark Type" = 1; "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; @@ -524,6 +522,8 @@ "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; + "kdeglobals"."General"."TerminalApplication" = "foot"; + "kdeglobals"."General"."TerminalService" = "org.codeberg.dnkl.foot.desktop"; "kdeglobals"."General"."XftAntialias" = true; "kdeglobals"."General"."XftHintStyle" = "hintslight"; "kdeglobals"."General"."XftSubPixel" = "rgb"; @@ -1139,23 +1139,19 @@ "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; "plasmanotifyrc"."Applications/firefox"."Seen" = true; + "plasmanotifyrc"."Applications/floorp"."Seen" = true; "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; + "plasmanotifyrc"."Applications/vesktop"."Seen" = true; "plasmanotifyrc"."Applications/webcord"."Seen" = true; "plasmarc"."Wallpapers"."usersWallpapers" = ""; + "spectaclerc"."Annotations"."annotationToolType" = 9; + "spectaclerc"."ImageSave"."lastImageSaveLocation" = "file:///home/lillian/Pictures/Screenshots/Screenshot_20241017_154815.png"; "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; }; dataFile = { "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true; - "kate/anonymous.katesession"."Document 0"."Bookmarks" = ""; - "kate/anonymous.katesession"."Document 0"."Encoding" = "UTF-8"; - "kate/anonymous.katesession"."Document 0"."Highlighting" = "None"; - "kate/anonymous.katesession"."Document 0"."Highlighting Set By User" = false; - "kate/anonymous.katesession"."Document 0"."Indentation Mode" = "normal"; - "kate/anonymous.katesession"."Document 0"."Mode" = "Normal"; - "kate/anonymous.katesession"."Document 0"."Mode Set By User" = false; - "kate/anonymous.katesession"."Document 0"."URL" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false; "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false; "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false; @@ -1187,26 +1183,25 @@ "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false; "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; - "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0"."2 screens: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,2514,0"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 1287; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = ""; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 1287; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = ""; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 1874; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 2514; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 1634; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 2560; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3; @@ -1236,34 +1231,19 @@ "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,927,0"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,1285,0"; "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0 Settings"."2 screens: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0"; "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 1874; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Active View" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."CursorColumn" = 33; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."CursorLine" = 350; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."Dynamic Word Wrap" = true; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."JumpList" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."TextFolding" = "{\"checksum\":\"74be57c9991161c81bdaf706a15a5e808c32f8ba\",\"ranges\":[]}"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."ViMarks" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":\x5b\x5d}"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; - "kate/anonymous.katesession"."Open Documents"."Count" = 1; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 2514; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = ""; + "kate/anonymous.katesession"."Open Documents"."Count" = 0; "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = ""; "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false; diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index f0a5c0d..232f5d7 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -52,7 +52,7 @@ home.packages = with pkgs; [ #Chat: - webcord-vencord + vesktop #Gaming: prismlauncher From ff1ea30d3538698f15efc47008f07b9deafc9c1e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 19:23:24 +0200 Subject: [PATCH 2039/2308] remove the double option --- .../package-configs/plasma-desktop.nix | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index a0c23f2..5b52ea1 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -103,14 +103,14 @@ ]; shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."decrease_volume_small" = "Shift+Volume Down"; @@ -128,24 +128,24 @@ "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; "ksmserver"."Shut Down" = "none,,Shut Down"; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cycle Overview" = [ ]; - "kwin"."Cycle Overview Opposite" = [ ]; + "kwin"."Cycle Overview" = []; + "kwin"."Cycle Overview Opposite" = []; "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = [ ]; + "kwin"."ExposeClassCurrentDesktop" = []; "kwin"."Grid View" = "Meta+G"; "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = [ ]; - "kwin"."MoveZoomLeft" = [ ]; - "kwin"."MoveZoomRight" = [ ]; - "kwin"."MoveZoomUp" = [ ]; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; "kwin"."Show Desktop" = "Meta+D"; @@ -193,12 +193,12 @@ "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; - "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Night Color" = []; "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; - "kwin"."Walk Through Desktop List" = [ ]; - "kwin"."Walk Through Desktop List (Reverse)" = [ ]; - "kwin"."Walk Through Desktops" = [ ]; - "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Tab"; "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; @@ -283,7 +283,7 @@ "kwin"."view_actual_size" = "\\, Meta+0\\, ,Meta+0,Zoom to Actual Size"; "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumedown" = []; "mediacontrol"."mediavolumeup" = "none,,Media volume up"; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; @@ -302,7 +302,7 @@ "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."Turn Off Screen" = []; "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; @@ -320,7 +320,7 @@ "plasmashell"."cycle-panels" = "Meta+Alt+P"; "plasmashell"."cycleNextAction" = "none,,Next History Item"; "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; - "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; "plasmashell"."next activity" = "\\, \\, ,none,Walk through activities"; "plasmashell"."previous activity" = ",none,Walk through activities (Reverse)"; @@ -338,9 +338,9 @@ "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/org.kde.spectacle.desktop"."RecordRegion" = [ ]; - "services/org.kde.spectacle.desktop"."RecordScreen" = [ ]; - "services/org.kde.spectacle.desktop"."RecordWindow" = [ ]; + "services/org.kde.spectacle.desktop"."RecordRegion" = []; + "services/org.kde.spectacle.desktop"."RecordScreen" = []; + "services/org.kde.spectacle.desktop"."RecordWindow" = []; "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; @@ -349,7 +349,7 @@ "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.org.kde.spectacle.desktop"."RecordWindow" = [ ]; + "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; @@ -358,7 +358,7 @@ "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = [ ]; + "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; @@ -373,7 +373,6 @@ "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; - "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; "dolphinrc"."IconsMode"."PreviewSize" = 80; From 05695869294ebd90b9ef7c6711ff3de8fabe84b2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 19:25:27 +0200 Subject: [PATCH 2040/2308] and this one too --- home-manager/desktop/package-configs/plasma-desktop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 5b52ea1..b1f5c6a 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -371,7 +371,6 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; - "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; "dolphinrc"."General"."RememberOpenedTabs" = false; "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; From 7dc88f7d179a0366b7568aea3fa09032634f79fc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 20:22:51 +0200 Subject: [PATCH 2041/2308] added binary cache for conduwuit --- nixos/shared/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 1138ad2..a845b75 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -43,12 +43,14 @@ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" "https://0uptime.cachix.org" + "https://attic.kennel.juneis.dog/conduit" ]; trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" + "conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=" ]; }; }; From 6bb1eacee5a1a0d4d3c18372bf1cd96ecfa1ec46 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 20:24:20 +0200 Subject: [PATCH 2042/2308] get conduwuit from nixpkgs instead of the flake to see if that helps --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 95a8488..ad54e13 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - conduwuit = { - url = "github:girlbossceo/conduwuit"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # conduwuit = { + # url = "github:girlbossceo/conduwuit"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; From 740a5569ed3a56d807ece99aef8da04022cf2fe7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 20:32:10 +0200 Subject: [PATCH 2043/2308] that wasn't the issue, the module is just broken for conduwuit --- flake.lock | 82 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 0af5b3e..3a35b0a 100644 --- a/flake.lock +++ b/flake.lock @@ -168,23 +168,19 @@ "flake-utils": "flake-utils_3", "liburing": "liburing", "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_4", "rocksdb": "rocksdb" }, "locked": { "lastModified": 1728182038, "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", - "owner": "girlbossceo", - "repo": "conduwuit", + "path": "/nix/store/csa59jjycsli8iv9yzf9fcch9dyqza4f-source", "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", - "type": "github" + "type": "path" }, "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" + "id": "conduwuit", + "type": "indirect" } }, "crane": { @@ -775,7 +771,7 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1729177642, @@ -796,7 +792,7 @@ "crane": "crane_4", "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -1184,6 +1180,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1692808169, @@ -1217,6 +1229,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1728888510, "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", @@ -1232,7 +1260,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1728897630, "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", @@ -1248,7 +1276,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1729256560, "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", @@ -1264,7 +1292,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1279,7 +1307,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1728093190, "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", @@ -1295,22 +1323,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1419,7 +1431,7 @@ "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1508,7 +1520,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1528,7 +1540,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { @@ -1645,7 +1657,7 @@ "inputs": { "crane": "crane_5", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { From 3cac203b34ed7f080ae9a19a63201292bf1060f4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 20:36:26 +0200 Subject: [PATCH 2044/2308] Wait what was that last commit? Strange, this is the uncommenting of using the main brainch of conduwuit --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index ad54e13..95a8488 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - # conduwuit = { - # url = "github:girlbossceo/conduwuit"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + conduwuit = { + url = "github:girlbossceo/conduwuit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; From 2d049fc3380eba096df67874199a8525662d65c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 22:22:38 +0200 Subject: [PATCH 2045/2308] add fira code nerdfonts --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index ff3e59c..da14be4 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -67,6 +67,7 @@ twemoji-color-font font-awesome atkinson-hyperlegible + fira-code-nerdfont ]; enableDefaultPackages = false; }; From fadac90c9e57febe3dc2cc720bf5fa48f8f12036 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 22:25:06 +0200 Subject: [PATCH 2046/2308] update flake lock for conduwuit --- flake.lock | 88 +++++++++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 3a35b0a..4e6720b 100644 --- a/flake.lock +++ b/flake.lock @@ -168,19 +168,23 @@ "flake-utils": "flake-utils_3", "liburing": "liburing", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1728182038, - "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", - "path": "/nix/store/csa59jjycsli8iv9yzf9fcch9dyqza4f-source", - "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", - "type": "path" + "lastModified": 1729355720, + "narHash": "sha256-WRUhmmQznBwm2pcD5uHgmwcExLX04zY5kf3cPL8VWA8=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "8428e7cdf739fc1ce2dd34b96b6ff95b22d0d4b7", + "type": "github" }, "original": { - "id": "conduwuit", - "type": "indirect" + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" } }, "crane": { @@ -771,7 +775,7 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1729177642, @@ -792,7 +796,7 @@ "crane": "crane_4", "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -1180,22 +1184,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1692808169, @@ -1229,22 +1217,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1728888510, "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", @@ -1260,7 +1232,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1728897630, "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", @@ -1276,7 +1248,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1729256560, "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", @@ -1292,7 +1264,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1307,7 +1279,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1728093190, "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", @@ -1323,6 +1295,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1431,7 +1419,7 @@ "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1520,7 +1508,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1540,7 +1528,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { @@ -1657,7 +1645,7 @@ "inputs": { "crane": "crane_5", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "rust-overlay": "rust-overlay_2" }, "locked": { From bb12b48232d701cf628c122c859122dee459d7cf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 20 Oct 2024 18:56:59 +0200 Subject: [PATCH 2047/2308] add colour emoji --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index da14be4..6f28f40 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -54,6 +54,7 @@ fonts = { packages = with pkgs; [ + noto-fonts-emoji-blob-bin cantarell-fonts dejavu_fonts fira-code From 35aa76ffd5d3b07c757c88dcb9c99055316b52b4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 20 Oct 2024 19:30:10 +0200 Subject: [PATCH 2048/2308] enable waydroid by default on glados --- nixos/hosts/GLaDOS/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 9b79122..998fdde 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -84,6 +84,7 @@ }; }; + virtualisation.waydroid.enable = true; networking.hostName = "GLaDOS"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From 3fd49033d8040a864bc6ee8fa0e86b3a9be35962 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 22 Oct 2024 14:00:31 +0200 Subject: [PATCH 2049/2308] disable global mangohud to not crash nms --- home-manager/hosts/GLaDOS/lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index c71456a..ce503f7 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -29,7 +29,7 @@ programs.mangohud = { enable = true; - enableSessionWide = true; + # enableSessionWide = true; }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From eda608dac0d6af2b9a57de72b0d5de8a6a3a336b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 13:58:45 +0200 Subject: [PATCH 2050/2308] This probably doesn't work as I don't pass stdin through just, but as a draft, run jupyter in helix! --- home-manager/shared/shell/helix/default.nix | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 76304ef..444f72b 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -16,6 +16,31 @@ zellij action toggle-floating-panes zellij action close-pane ''; + jupyter = + pkgs.writeText "run_jupyter_from_helix.zsh" + '' + #! ~/.nix-profile/bin/zsh + function new() { + new=true; + touch /tmp/rjh; + cat /tmp/rjh | while read line + do + if $(pwd) = line; then + new=false; + fi + done + echo new; + } + + function send_to_jupyter() { + if $(new); then + zellij run -f -n "jupyter console" jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' + pwd >> /tmp/rjh + fi + zellij write 29 25 # send ctr + w + just send + } + ''; in { programs.helix = { enable = true; @@ -29,6 +54,7 @@ in { t = ":sh zellij run -f -n 'test code' -- direnv exec . just test"; g = ":sh zellij run -fc -n 'lazygit' -- lazygit"; f = ":sh zellij run --floating -n 'yazi picker' -- zsh ~/.config/helix/open_in_helix_from_yazi.zsh "; + j = ":pipe-to just jupyter"; }; editor = { line-number = "relative"; From adbeee4fd22f7a9da37ddf0b6429991f99ac4675 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:07:47 +0200 Subject: [PATCH 2051/2308] This might work to pipe through stdin --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 444f72b..a68728a 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -38,7 +38,7 @@ pwd >> /tmp/rjh fi zellij write 29 25 # send ctr + w - just send + cat | just send } ''; in { From 85a08aba596e20b247699cdedc4fb980594767d2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:11:21 +0200 Subject: [PATCH 2052/2308] Update flake lock --- flake.lock | 144 +++++++++++++++++++++++++---------------------------- 1 file changed, 69 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index 63d14af..0d571b2 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728525495, - "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", + "lastModified": 1728768056, + "narHash": "sha256-nDz1+eO5ziimxiyqtKVT3Gj9OZfk3WVhC4czo6EGec8=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", + "rev": "4f9293b045cf32dfc629ce300180d311aba8f53a", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1728182038, - "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", + "lastModified": 1729355720, + "narHash": "sha256-WRUhmmQznBwm2pcD5uHgmwcExLX04zY5kf3cPL8VWA8=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", + "rev": "8428e7cdf739fc1ce2dd34b96b6ff95b22d0d4b7", "type": "github" }, "original": { @@ -247,18 +247,12 @@ } }, "crane_4": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1728776144, + "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "f876e3d905b922502f031aeec1a84490122254b7", "type": "github" }, "original": { @@ -358,11 +352,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1729588208, + "narHash": "sha256-PNONdMd+sG7JWzNIDerX7oVZXL8FTVlSAZ1BmUo2HjE=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "4be2aadf13b67ffbb993deb73adff77c46b728fc", "type": "github" }, "original": { @@ -579,11 +573,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -764,11 +758,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1729551526, + "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", "type": "github" }, "original": { @@ -784,11 +778,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1729492135, + "narHash": "sha256-yXmCZaw0Pe4H9Xv3BDSoQdSulevJMH34XrtQD3v7aoY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "82bdda12079fbbe40cd1e26d3cbbf5093ea052c0", "type": "github" }, "original": { @@ -807,11 +801,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1729064530, + "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", "type": "github" }, "original": { @@ -936,11 +930,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1729394935, + "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", "type": "github" }, "original": { @@ -982,11 +976,11 @@ }, "nixlib": { "locked": { - "lastModified": 1728176478, - "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -1003,11 +997,11 @@ ] }, "locked": { - "lastModified": 1728522165, - "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -1018,11 +1012,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1729624485, + "narHash": "sha256-iEffyT68tEU5kHQuyP05QRH+JhWNNLAwHfgZAzXFS7o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "22e8de2729f40d29a445c8baeaf22740b8b25daf", "type": "github" }, "original": { @@ -1065,11 +1059,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728565888, - "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", + "lastModified": 1729684406, + "narHash": "sha256-ogE0sFjMltcKiuLnP/yBhRfQhw00LE69E1ARgAV18Kg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", + "rev": "148aa178a9ab4c98b55b85d2935f3e1722130c51", "type": "github" }, "original": { @@ -1160,11 +1154,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729357638, + "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", "type": "github" }, "original": { @@ -1176,11 +1170,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1224,11 +1218,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -1240,11 +1234,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", + "lastModified": 1728897630, + "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "c9f0b4a395289ce18727e2a8e43cae6796693ccc", "type": "github" }, "original": { @@ -1256,11 +1250,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1287,11 +1281,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { @@ -1327,11 +1321,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1729372184, + "narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1", "type": "github" }, "original": { @@ -1381,11 +1375,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -1476,11 +1470,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1728959392, + "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", "type": "github" }, "original": { @@ -1538,11 +1532,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729669122, + "narHash": "sha256-SpS3rSwYcskdOpx+jeCv1lcZDdkT/K5qT8dlenCBQ8c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "a4c33bfecb93458d90f9eb26f1cf695b47285243", "type": "github" }, "original": { From 872aefb0ad25e156c0391176d7db1598b07ded90 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:16:49 +0200 Subject: [PATCH 2053/2308] downgrade flake.lock --- flake.lock | 144 ++++++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 0d571b2..63d14af 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728768056, - "narHash": "sha256-nDz1+eO5ziimxiyqtKVT3Gj9OZfk3WVhC4czo6EGec8=", + "lastModified": 1728525495, + "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "4f9293b045cf32dfc629ce300180d311aba8f53a", + "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1729355720, - "narHash": "sha256-WRUhmmQznBwm2pcD5uHgmwcExLX04zY5kf3cPL8VWA8=", + "lastModified": 1728182038, + "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "8428e7cdf739fc1ce2dd34b96b6ff95b22d0d4b7", + "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", "type": "github" }, "original": { @@ -247,12 +247,18 @@ } }, "crane_4": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1728776144, - "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", + "lastModified": 1721842668, + "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", "owner": "ipetkov", "repo": "crane", - "rev": "f876e3d905b922502f031aeec1a84490122254b7", + "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", "type": "github" }, "original": { @@ -352,11 +358,11 @@ ] }, "locked": { - "lastModified": 1729588208, - "narHash": "sha256-PNONdMd+sG7JWzNIDerX7oVZXL8FTVlSAZ1BmUo2HjE=", + "lastModified": 1728334376, + "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", "owner": "nix-community", "repo": "disko", - "rev": "4be2aadf13b67ffbb993deb73adff77c46b728fc", + "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", "type": "github" }, "original": { @@ -573,11 +579,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -758,11 +764,11 @@ ] }, "locked": { - "lastModified": 1729551526, - "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -778,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1729492135, - "narHash": "sha256-yXmCZaw0Pe4H9Xv3BDSoQdSulevJMH34XrtQD3v7aoY=", + "lastModified": 1728410210, + "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "82bdda12079fbbe40cd1e26d3cbbf5093ea052c0", + "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", "type": "github" }, "original": { @@ -801,11 +807,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1729064530, - "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", + "lastModified": 1728199407, + "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", + "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", "type": "github" }, "original": { @@ -930,11 +936,11 @@ ] }, "locked": { - "lastModified": 1729394935, - "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", + "lastModified": 1728263287, + "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", + "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "type": "github" }, "original": { @@ -976,11 +982,11 @@ }, "nixlib": { "locked": { - "lastModified": 1729386149, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1728176478, + "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", + "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "type": "github" }, "original": { @@ -997,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1729472750, - "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", + "lastModified": 1728522165, + "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", + "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", "type": "github" }, "original": { @@ -1012,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729624485, - "narHash": "sha256-iEffyT68tEU5kHQuyP05QRH+JhWNNLAwHfgZAzXFS7o=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "22e8de2729f40d29a445c8baeaf22740b8b25daf", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { @@ -1059,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1729684406, - "narHash": "sha256-ogE0sFjMltcKiuLnP/yBhRfQhw00LE69E1ARgAV18Kg=", + "lastModified": 1728565888, + "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "148aa178a9ab4c98b55b85d2935f3e1722130c51", + "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", "type": "github" }, "original": { @@ -1154,11 +1160,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1729357638, - "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -1170,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1218,11 +1224,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -1234,11 +1240,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1728897630, - "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", + "lastModified": 1722264024, + "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9f0b4a395289ce18727e2a8e43cae6796693ccc", + "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", "type": "github" }, "original": { @@ -1250,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1281,11 +1287,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "lastModified": 1728093190, + "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", "type": "github" }, "original": { @@ -1321,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1729372184, - "narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=", + "lastModified": 1727917089, + "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1", + "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", "type": "github" }, "original": { @@ -1375,11 +1381,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -1470,11 +1476,11 @@ ] }, "locked": { - "lastModified": 1728959392, - "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", + "lastModified": 1722219664, + "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", + "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", "type": "github" }, "original": { @@ -1532,11 +1538,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1729669122, - "narHash": "sha256-SpS3rSwYcskdOpx+jeCv1lcZDdkT/K5qT8dlenCBQ8c=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a4c33bfecb93458d90f9eb26f1cf695b47285243", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { From 8a84837169ce0ff1cc94153b7593a1e814203472 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:19:04 +0200 Subject: [PATCH 2054/2308] Add the old cinny to allowed insecure packages as well --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 3d59b2c..947d6dd 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -22,7 +22,7 @@ ./package-configs/foot ]; nixpkgs = { - config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2"]; + config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2" "cinny-4.2.1" "cinny-unwrapped-4.2.1"]; # You can add overlays here overlays = [ # You can also add overlays exported from other flakes: From c85e43022936e621aa6ede2388ed8f96df634133 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:24:05 +0200 Subject: [PATCH 2055/2308] maybe write the zsh file too haha --- home-manager/shared/shell/helix/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index a68728a..40f6f00 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -211,4 +211,10 @@ in { target = ".config/helix/open_in_helix_from_yazi.zsh"; }; }; + home.file = { + "jupyter" = { + source = "${jupyter}"; + target = ".config/helix/run_jupyter_from_helix.zsh"; + }; + }; } From 91a3bab42a895601ddeb956929e0601d55ae3f64 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:35:05 +0200 Subject: [PATCH 2056/2308] make it into a basic bash file --- home-manager/shared/shell/helix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 40f6f00..62f6ad5 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -17,7 +17,7 @@ zellij action close-pane ''; jupyter = - pkgs.writeText "run_jupyter_from_helix.zsh" + pkgs.writeText "run_jupyter_from_helix.sh" '' #! ~/.nix-profile/bin/zsh function new() { @@ -214,7 +214,7 @@ in { home.file = { "jupyter" = { source = "${jupyter}"; - target = ".config/helix/run_jupyter_from_helix.zsh"; + target = ".config/helix/run_jupyter_from_helix.sh"; }; }; } From c71d150b9bbe6e7e6c262c5d77680d81664e623b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:39:05 +0200 Subject: [PATCH 2057/2308] maybe add a function call to at least run the damn thing --- home-manager/shared/shell/helix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 62f6ad5..6ee0596 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -40,6 +40,7 @@ zellij write 29 25 # send ctr + w cat | just send } + send_to_jupyter ''; in { programs.helix = { From c3717a09912282ea62c7b4977f3dcb4871935c2d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:42:22 +0200 Subject: [PATCH 2058/2308] the sh zsh thing was a red herring undo that --- home-manager/shared/shell/helix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 6ee0596..a5b274f 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -17,7 +17,7 @@ zellij action close-pane ''; jupyter = - pkgs.writeText "run_jupyter_from_helix.sh" + pkgs.writeText "run_jupyter_from_helix.zsh" '' #! ~/.nix-profile/bin/zsh function new() { @@ -215,7 +215,7 @@ in { home.file = { "jupyter" = { source = "${jupyter}"; - target = ".config/helix/run_jupyter_from_helix.sh"; + target = ".config/helix/run_jupyter_from_helix.zsh"; }; }; } From b65674b143a7dda5aaa6bdb78ab9d250abf3415f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:59:54 +0200 Subject: [PATCH 2059/2308] the jupyter command was wrong oopsie --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index a5b274f..6b8d06d 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -34,7 +34,7 @@ function send_to_jupyter() { if $(new); then - zellij run -f -n "jupyter console" jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' + zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' pwd >> /tmp/rjh fi zellij write 29 25 # send ctr + w From 990596e7672098c1e339f7493794eff2d8691c16 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 17:42:51 +0200 Subject: [PATCH 2060/2308] change the / in the pwd for the json file to - --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 6b8d06d..eebddc4 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -34,7 +34,7 @@ function send_to_jupyter() { if $(new); then - zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' + zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr\"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' pwd >> /tmp/rjh fi zellij write 29 25 # send ctr + w From 418e6d7b0161e7eb474a87844b7b82a65f7366d4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 17:45:15 +0200 Subject: [PATCH 2061/2308] needs a space there --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index eebddc4..8d539d4 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -34,7 +34,7 @@ function send_to_jupyter() { if $(new); then - zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr\"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' + zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' pwd >> /tmp/rjh fi zellij write 29 25 # send ctr + w From 9fa6c2e95a38c3ccbe5f56a29b4cc592303712f2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 17:48:11 +0200 Subject: [PATCH 2062/2308] maybe the names conflict --- home-manager/shared/shell/helix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 8d539d4..55e0684 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -20,7 +20,7 @@ pkgs.writeText "run_jupyter_from_helix.zsh" '' #! ~/.nix-profile/bin/zsh - function new() { + function is_new() { new=true; touch /tmp/rjh; cat /tmp/rjh | while read line @@ -33,7 +33,7 @@ } function send_to_jupyter() { - if $(new); then + if $(is_new); then zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' pwd >> /tmp/rjh fi From 6bf5b9dd086aea982e3a3c10fd488af590e4dc32 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 17:51:22 +0200 Subject: [PATCH 2063/2308] this might need braces actually --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 55e0684..5e13503 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -25,7 +25,7 @@ touch /tmp/rjh; cat /tmp/rjh | while read line do - if $(pwd) = line; then + if [$(pwd) = line]; then new=false; fi done From 8d04d9c64963065940ebfbc9e68a365de317522f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 19:13:18 +0200 Subject: [PATCH 2064/2308] Gotta commit before battery runs out, almost finished! --- home-manager/shared/shell/helix/default.nix | 25 +++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 5e13503..32a2672 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -20,24 +20,21 @@ pkgs.writeText "run_jupyter_from_helix.zsh" '' #! ~/.nix-profile/bin/zsh - function is_new() { - new=true; + is_new() { + new=1; touch /tmp/rjh; - cat /tmp/rjh | while read line - do - if [$(pwd) = line]; then - new=false; + while IFS="" read -r p || [ -n "$p" ]; do + if [ $(pwd) = $p ]; then + new=0; fi - done - echo new; + done < /tmp/rjh + return $new } - function send_to_jupyter() { - if $(is_new); then - zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' - pwd >> /tmp/rjh - fi - zellij write 29 25 # send ctr + w + send_to_jupyter() { + is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 + pwd >> /tmp/rjh + zellij action write 29 25 cat | just send } send_to_jupyter From 13dce0eae81b1cf42b3314a99912144d1d446dec Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 25 Oct 2024 13:20:35 +0200 Subject: [PATCH 2065/2308] add clean command to just --- justfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/justfile b/justfile index b0aad0e..f349229 100644 --- a/justfile +++ b/justfile @@ -9,3 +9,6 @@ test: update: nix flake update + +clean: + sudo nix-collect-garbage From 5d3515f9a5fa99947d07cded14f0aa54e8d79bcc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 25 Oct 2024 13:21:02 +0200 Subject: [PATCH 2066/2308] still not working but some updates to the helix jupyter script --- home-manager/shared/shell/helix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 32a2672..a50bfd2 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -32,9 +32,10 @@ } send_to_jupyter() { - is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 + is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 && zellij action write 17 pwd >> /tmp/rjh zellij action write 29 25 + zellij action write 17 cat | just send } send_to_jupyter From 810547052063429d7649fc9967b1e780070a09c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 25 Oct 2024 13:23:48 +0200 Subject: [PATCH 2067/2308] add optimise to the clean command --- justfile | 1 + 1 file changed, 1 insertion(+) diff --git a/justfile b/justfile index f349229..a6da660 100644 --- a/justfile +++ b/justfile @@ -12,3 +12,4 @@ update: clean: sudo nix-collect-garbage + sudo nix-store --optimise From 654e81ed02ae2defb4f00fbe4d75c0ae115a5406 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 27 Oct 2024 19:05:36 +0100 Subject: [PATCH 2068/2308] Remove and disable waydroid, it's too laggy and weird --- nixos/desktop/default.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 4b0123a..d5e185f 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -61,7 +61,7 @@ tpm2-tss virtualgl vulkan-tools - waydroid + # waydroid waypipe wayland-utils xwaylandvideobridge diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 998fdde..5128343 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -84,7 +84,7 @@ }; }; - virtualisation.waydroid.enable = true; + # virtualisation.waydroid.enable = false; networking.hostName = "GLaDOS"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From 441a7dcb60a4fc8aaa7f53fb671c918f2ee3d7fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 27 Oct 2024 23:52:40 +0100 Subject: [PATCH 2069/2308] add nil (nix language server) to shared home manager --- home-manager/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 799caca..f21747d 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -35,6 +35,7 @@ lazygit navi yazi + nil ]; programs.navi.enable = true; } From 415903451f90a69b1cf9a0875e94bfdf2d6832f7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 28 Oct 2024 00:17:05 +0100 Subject: [PATCH 2070/2308] remove all unecessary imports for cleaner code :) --- home-manager/desktop/package-configs/firefox.nix | 6 +----- home-manager/desktop/package-configs/foot/default.nix | 7 +------ home-manager/desktop/package-configs/konsole/default.nix | 7 +------ home-manager/hosts/EDI/default.nix | 9 +-------- home-manager/hosts/EDI/lillian.nix | 9 +-------- home-manager/hosts/GLaDOS/default.nix | 9 +-------- home-manager/hosts/GLaDOS/lillian.nix | 9 +-------- home-manager/hosts/iso/default.nix | 9 +-------- home-manager/hosts/iso/lillian.nix | 9 +-------- home-manager/hosts/iso_server/default.nix | 9 +-------- home-manager/hosts/iso_server/lillian.nix | 9 +-------- home-manager/hosts/queen/default.nix | 9 +-------- home-manager/hosts/queen/lillian.nix | 9 +-------- home-manager/hosts/shodan/default.nix | 9 +-------- home-manager/hosts/shodan/lillian.nix | 9 +-------- home-manager/hosts/wheatley/default.nix | 9 +-------- home-manager/hosts/wheatley/lillian.nix | 9 +-------- home-manager/shared/default.nix | 9 +-------- home-manager/shared/shell/bat.nix | 6 +----- home-manager/shared/shell/eza.nix | 2 +- home-manager/shared/shell/helix/default.nix | 7 +------ home-manager/shared/shell/hyfetch.nix | 7 +------ home-manager/shared/shell/zellij/default.nix | 1 - home-manager/shared/shell/zsh.nix | 9 +-------- nixos/board/package-configs/pi-hole/default.nix | 9 +-------- nixos/desktop/default.nix | 1 - nixos/desktop/package-configs/default.nix | 9 +-------- nixos/hosts/EDI/configuration.nix | 1 - nixos/hosts/EDI/hardware-configuration.nix | 1 - nixos/hosts/GLaDOS/configuration.nix | 2 -- nixos/hosts/GLaDOS/hardware-configuration.nix | 1 - nixos/hosts/iso/configuration.nix | 2 -- nixos/hosts/iso_server/configuration.nix | 2 -- nixos/hosts/queen/configuration.nix | 2 -- nixos/hosts/queen/hardware-configuration.nix | 2 -- nixos/hosts/shodan/auto-mount.nix | 9 +-------- nixos/hosts/shodan/configuration.nix | 1 - nixos/hosts/shodan/hardware-configuration.nix | 1 - nixos/hosts/wheatley/armv7l.nix | 6 +----- nixos/hosts/wheatley/hardware-configuration.nix | 2 -- nixos/server/default.nix | 9 +-------- nixos/server/package-configs/akkoma/default.nix | 3 --- nixos/server/package-configs/aria2/container.nix | 6 +----- nixos/server/package-configs/aria2/default.nix | 8 +------- nixos/server/package-configs/cinny/default.nix | 8 +------- nixos/server/package-configs/conduit/default.nix | 1 - nixos/server/package-configs/coturn/default.nix | 6 +----- nixos/server/package-configs/dashboard/default.nix | 9 +-------- .../server/package-configs/dashboard/grafana/default.nix | 6 +----- nixos/server/package-configs/dashboard/loki/default.nix | 6 +----- .../package-configs/dashboard/prometheus/default.nix | 6 +----- .../package-configs/dashboard/telegraf/default.nix | 9 +-------- nixos/server/package-configs/default.nix | 9 +-------- nixos/server/package-configs/forgejo/default.nix | 9 +-------- nixos/server/package-configs/gotosocial/default.nix | 9 +-------- nixos/server/package-configs/jellyfin/default.nix | 9 +-------- nixos/server/package-configs/mail-server/default.nix | 9 +-------- nixos/server/package-configs/ombi/default.nix | 6 +----- nixos/server/package-configs/phanpy/default.nix | 8 +------- nixos/server/package-configs/postgres/default.nix | 6 +----- nixos/server/package-configs/roundcube/default.nix | 1 - nixos/shared/default.nix | 2 -- nixos/shared/locale/default.nix | 9 +-------- nixos/shared/packages/default.nix | 3 --- pkgs/auto-mount/default.nix | 5 ----- pkgs/dvd/default.nix | 2 -- pkgs/dvt/default.nix | 2 -- pkgs/install-nix-no-inhibit/default.nix | 2 -- pkgs/install-nix/default.nix | 6 +----- pkgs/rebuild-no-inhibit/default.nix | 6 +----- pkgs/rebuild/default.nix | 6 +----- pkgs/restart/default.nix | 6 +----- pkgs/update/default.nix | 6 +----- pkgs/upgrade/default.nix | 6 +----- 74 files changed, 52 insertions(+), 390 deletions(-) diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 43f4854..16ad709 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { programs.firefox = { enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; diff --git a/home-manager/desktop/package-configs/foot/default.nix b/home-manager/desktop/package-configs/foot/default.nix index 464925f..f1839dc 100644 --- a/home-manager/desktop/package-configs/foot/default.nix +++ b/home-manager/desktop/package-configs/foot/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - inputs, - ... -}: { +{...}: { programs.foot = { enable = true; catppuccin.enable = true; diff --git a/home-manager/desktop/package-configs/konsole/default.nix b/home-manager/desktop/package-configs/konsole/default.nix index a704737..e8d5f29 100644 --- a/home-manager/desktop/package-configs/konsole/default.nix +++ b/home-manager/desktop/package-configs/konsole/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - inputs, - ... -}: { +{...}: { home.file = { "profile" = { source = ./Catppuccin.profile; diff --git a/home-manager/hosts/EDI/default.nix b/home-manager/hosts/EDI/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/EDI/default.nix +++ b/home-manager/hosts/EDI/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 351470d..f0cd853 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/GLaDOS/default.nix b/home-manager/hosts/GLaDOS/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/GLaDOS/default.nix +++ b/home-manager/hosts/GLaDOS/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index ce503f7..0841ff3 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/iso/default.nix b/home-manager/hosts/iso/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/iso/default.nix +++ b/home-manager/hosts/iso/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix index 351470d..f0cd853 100644 --- a/home-manager/hosts/iso/lillian.nix +++ b/home-manager/hosts/iso/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/iso_server/default.nix b/home-manager/hosts/iso_server/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/iso_server/default.nix +++ b/home-manager/hosts/iso_server/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/iso_server/lillian.nix b/home-manager/hosts/iso_server/lillian.nix index 9acd9c2..278806e 100644 --- a/home-manager/hosts/iso_server/lillian.nix +++ b/home-manager/hosts/iso_server/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/queen/default.nix b/home-manager/hosts/queen/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/queen/default.nix +++ b/home-manager/hosts/queen/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index 680ef4e..5acc4b0 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/shodan/default.nix b/home-manager/hosts/shodan/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/shodan/default.nix +++ b/home-manager/hosts/shodan/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 232f5d7..52f1d3d 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/wheatley/default.nix b/home-manager/hosts/wheatley/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/wheatley/default.nix +++ b/home-manager/hosts/wheatley/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/wheatley/lillian.nix b/home-manager/hosts/wheatley/lillian.nix index c3778c3..afb1b42 100644 --- a/home-manager/hosts/wheatley/lillian.nix +++ b/home-manager/hosts/wheatley/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index f21747d..07f7fde 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { imports = [ ./shell/helix ./shell/zellij diff --git a/home-manager/shared/shell/bat.nix b/home-manager/shared/shell/bat.nix index 21acc30..2afdce3 100644 --- a/home-manager/shared/shell/bat.nix +++ b/home-manager/shared/shell/bat.nix @@ -1,8 +1,4 @@ -{ - lib, - pkgs, - ... -}: { +{pkgs, ...}: { programs.bat = { enable = true; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch]; diff --git a/home-manager/shared/shell/eza.nix b/home-manager/shared/shell/eza.nix index b0c72f2..df2968b 100644 --- a/home-manager/shared/shell/eza.nix +++ b/home-manager/shared/shell/eza.nix @@ -1,4 +1,4 @@ -{lib, ...}: { +{...}: { programs.eza = { enable = true; enableZshIntegration = true; diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index a50bfd2..bba04a9 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: let +{pkgs, ...}: let yazi = pkgs.writeText "open_in_helix_from_yazi.zsh" '' diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix index 0945e59..774a3d7 100644 --- a/home-manager/shared/shell/hyfetch.nix +++ b/home-manager/shared/shell/hyfetch.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +{...}: { programs.hyfetch = { enable = true; settings = { diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 1565979..6e154ec 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -1,5 +1,4 @@ { - lib, pkgs, inputs, ... diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index a3108ff..3c814c1 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { programs.zoxide = { enable = true; }; diff --git a/nixos/board/package-configs/pi-hole/default.nix b/nixos/board/package-configs/pi-hole/default.nix index 7ce2716..0596d3b 100644 --- a/nixos/board/package-configs/pi-hole/default.nix +++ b/nixos/board/package-configs/pi-hole/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { services.pihole = { enable = true; hostConfig = { diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index d5e185f..44e3892 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -1,7 +1,6 @@ # This is your system's configuration file. # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { - inputs, outputs, lib, config, diff --git a/nixos/desktop/package-configs/default.nix b/nixos/desktop/package-configs/default.nix index 95564cd..372d666 100644 --- a/nixos/desktop/package-configs/default.nix +++ b/nixos/desktop/package-configs/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { imports = [ ./firefox ]; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 78ee9f7..a71f2fb 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -4,7 +4,6 @@ inputs, outputs, lib, - config, pkgs, ... }: { diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 081b9c8..40ca9e0 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 5128343..f4e7041 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -3,8 +3,6 @@ { inputs, outputs, - lib, - config, pkgs, ... }: { diff --git a/nixos/hosts/GLaDOS/hardware-configuration.nix b/nixos/hosts/GLaDOS/hardware-configuration.nix index c4ee5ec..7c7fcbd 100644 --- a/nixos/hosts/GLaDOS/hardware-configuration.nix +++ b/nixos/hosts/GLaDOS/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index becff32..1c45890 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -2,9 +2,7 @@ inputs, outputs, lib, - config, pkgs, - nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/iso_server/configuration.nix b/nixos/hosts/iso_server/configuration.nix index a38c7d0..9f0cd35 100644 --- a/nixos/hosts/iso_server/configuration.nix +++ b/nixos/hosts/iso_server/configuration.nix @@ -2,9 +2,7 @@ inputs, outputs, lib, - config, pkgs, - nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 9c9ba8b..8ba1916 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -2,9 +2,7 @@ inputs, outputs, lib, - config, pkgs, - nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/queen/hardware-configuration.nix b/nixos/hosts/queen/hardware-configuration.nix index 3357ba6..cf6fbc9 100644 --- a/nixos/hosts/queen/hardware-configuration.nix +++ b/nixos/hosts/queen/hardware-configuration.nix @@ -1,7 +1,5 @@ { - config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 1c4a376..2924824 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { services.udev.extraRules = '' KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f7e0c3e..6120091 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -2,7 +2,6 @@ inputs, outputs, lib, - config, pkgs, ... }: { diff --git a/nixos/hosts/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix index fdfefac..fb0baa3 100644 --- a/nixos/hosts/shodan/hardware-configuration.nix +++ b/nixos/hosts/shodan/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/wheatley/armv7l.nix b/nixos/hosts/wheatley/armv7l.nix index e6a9f37..d908a24 100644 --- a/nixos/hosts/wheatley/armv7l.nix +++ b/nixos/hosts/wheatley/armv7l.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { boot.kernelPatches = [ rec { name = "compat_uts_machine"; diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index f7ea389..efbc691 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -2,9 +2,7 @@ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. { - config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/server/default.nix b/nixos/server/default.nix index 75e56d1..99a5736 100644 --- a/nixos/server/default.nix +++ b/nixos/server/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./package-configs diff --git a/nixos/server/package-configs/akkoma/default.nix b/nixos/server/package-configs/akkoma/default.nix index bd68ba9..d0495bf 100644 --- a/nixos/server/package-configs/akkoma/default.nix +++ b/nixos/server/package-configs/akkoma/default.nix @@ -1,7 +1,4 @@ { - inputs, - outputs, - lib, config, pkgs, ... diff --git a/nixos/server/package-configs/aria2/container.nix b/nixos/server/package-configs/aria2/container.nix index 6d2fc82..c76c97c 100644 --- a/nixos/server/package-configs/aria2/container.nix +++ b/nixos/server/package-configs/aria2/container.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { users.users.aria2.group = "aria2"; users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; diff --git a/nixos/server/package-configs/aria2/default.nix b/nixos/server/package-configs/aria2/default.nix index f2a075c..e7d15bd 100644 --- a/nixos/server/package-configs/aria2/default.nix +++ b/nixos/server/package-configs/aria2/default.nix @@ -1,10 +1,4 @@ -{ - inputs, - outputs, - config, - pkgs, - ... -}: { +{config, ...}: { users.users.aria2.group = "aria2"; users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index 6079856..63891b4 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -1,10 +1,4 @@ -{ - config, - pkgs, - inputs, - lib, - ... -}: { +{pkgs, ...}: { services.nginx = { enable = true; virtualHosts = { diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 2ea9053..b9debce 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -2,7 +2,6 @@ config, pkgs, inputs, - lib, ... }: let # You'll need to edit these values diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix index 4539247..5bae63e 100644 --- a/nixos/server/package-configs/coturn/default.nix +++ b/nixos/server/package-configs/coturn/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { sops.secrets."coturn-auth-secret".mode = "0440"; sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name; users.users.nginx.extraGroups = ["turnserver"]; diff --git a/nixos/server/package-configs/dashboard/default.nix b/nixos/server/package-configs/dashboard/default.nix index 6cb610e..7bbb7fc 100644 --- a/nixos/server/package-configs/dashboard/default.nix +++ b/nixos/server/package-configs/dashboard/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { imports = [ ./grafana #./loki diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix index 5589873..2ea84c6 100644 --- a/nixos/server/package-configs/dashboard/grafana/default.nix +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { # grafana configuration services.grafana = { enable = true; diff --git a/nixos/server/package-configs/dashboard/loki/default.nix b/nixos/server/package-configs/dashboard/loki/default.nix index 6e68716..e83159b 100644 --- a/nixos/server/package-configs/dashboard/loki/default.nix +++ b/nixos/server/package-configs/dashboard/loki/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{...}: { services.loki = { enable = true; configFile = ./loki.yaml; diff --git a/nixos/server/package-configs/dashboard/prometheus/default.nix b/nixos/server/package-configs/dashboard/prometheus/default.nix index 5ea9535..36710a1 100644 --- a/nixos/server/package-configs/dashboard/prometheus/default.nix +++ b/nixos/server/package-configs/dashboard/prometheus/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{...}: { services.prometheus = { enable = true; port = 9001; diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index 0c6e6ba..591e279 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - lib, - config, - pkgs, - user, - ... -}: { +{config, ...}: { sops.secrets."grafana-telegraf-key".mode = "0440"; sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name; services.telegraf = { diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 6384555..4dd970f 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { imports = [ ./conduit ./forgejo diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index da7b467..b4efc44 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { imports = []; #sops.secrets."mailpassunhash".mode = "0440"; diff --git a/nixos/server/package-configs/gotosocial/default.nix b/nixos/server/package-configs/gotosocial/default.nix index 9e3afdf..3740c15 100644 --- a/nixos/server/package-configs/gotosocial/default.nix +++ b/nixos/server/package-configs/gotosocial/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { users.users.gotosocial.extraGroups = ["virtualMail"]; services.nginx = { diff --git a/nixos/server/package-configs/jellyfin/default.nix b/nixos/server/package-configs/jellyfin/default.nix index f61461e..cc492d4 100644 --- a/nixos/server/package-configs/jellyfin/default.nix +++ b/nixos/server/package-configs/jellyfin/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { users.users.jellyfin.extraGroups = ["nextcloud" "aria2"]; services.nginx = { diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix index e43a5c6..878be36 100644 --- a/nixos/server/package-configs/mail-server/default.nix +++ b/nixos/server/package-configs/mail-server/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{config, ...}: { sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; diff --git a/nixos/server/package-configs/ombi/default.nix b/nixos/server/package-configs/ombi/default.nix index 7065ae5..c82156c 100644 --- a/nixos/server/package-configs/ombi/default.nix +++ b/nixos/server/package-configs/ombi/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{...}: { users.users = { ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"]; }; diff --git a/nixos/server/package-configs/phanpy/default.nix b/nixos/server/package-configs/phanpy/default.nix index 216412e..362f8f7 100644 --- a/nixos/server/package-configs/phanpy/default.nix +++ b/nixos/server/package-configs/phanpy/default.nix @@ -1,10 +1,4 @@ -{ - config, - pkgs, - inputs, - lib, - ... -}: { +{pkgs, ...}: { services.nginx = { enable = true; virtualHosts = { diff --git a/nixos/server/package-configs/postgres/default.nix b/nixos/server/package-configs/postgres/default.nix index 92b9478..0a3e4f6 100644 --- a/nixos/server/package-configs/postgres/default.nix +++ b/nixos/server/package-configs/postgres/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql package = pkgs.postgresql_16; diff --git a/nixos/server/package-configs/roundcube/default.nix b/nixos/server/package-configs/roundcube/default.nix index d33c621..59ee43d 100644 --- a/nixos/server/package-configs/roundcube/default.nix +++ b/nixos/server/package-configs/roundcube/default.nix @@ -1,7 +1,6 @@ { config, pkgs, - lib, ... }: { # TODO: Figure out how to create packages for some plugins for roundcube! diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index a845b75..b664165 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -1,10 +1,8 @@ { inputs, - outputs, lib, config, pkgs, - pkgs-edge, ... }: { imports = [ diff --git a/nixos/shared/locale/default.nix b/nixos/shared/locale/default.nix index 2444204..ea9e4e8 100644 --- a/nixos/shared/locale/default.nix +++ b/nixos/shared/locale/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 6f28f40..b59dcc2 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -1,8 +1,5 @@ { - inputs, outputs, - lib, - config, pkgs, pkgs-edge, ... diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 3a27c32..b7a8a26 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -1,10 +1,5 @@ { - lib, - stdenv, - system, pkgs, - util-linux, - jq, writeShellApplication, }: writeShellApplication diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index 7c6f81f..0973487 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -1,6 +1,4 @@ { - lib, - stdenv, direnv, writeShellApplication, }: diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index eabc160..7a9424c 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -1,6 +1,4 @@ { - lib, - stdenv, direnv, writeShellApplication, }: diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index f9365fe..622170a 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -1,6 +1,4 @@ { - lib, - stdenv, git, gum, writeShellApplication, diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index bfcf17e..51bd530 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "install-nix"; diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix index 4503fcc..e4bd280 100644 --- a/pkgs/rebuild-no-inhibit/default.nix +++ b/pkgs/rebuild-no-inhibit/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "rebuild-no-inhibit"; diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 8b59258..8c61e66 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "rebuild"; diff --git a/pkgs/restart/default.nix b/pkgs/restart/default.nix index c3fe9c1..2405faa 100644 --- a/pkgs/restart/default.nix +++ b/pkgs/restart/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "restart"; diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix index a965b8c..7f1b3e4 100644 --- a/pkgs/update/default.nix +++ b/pkgs/update/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "update"; diff --git a/pkgs/upgrade/default.nix b/pkgs/upgrade/default.nix index d72c480..7ab662b 100644 --- a/pkgs/upgrade/default.nix +++ b/pkgs/upgrade/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "upgrade"; From 02ae4f69a68c6db3e92873bd9d3f4ae184b723b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 30 Oct 2024 10:16:13 +0100 Subject: [PATCH 2071/2308] Remove the binary cache for conduwuit for now as it seems to be down --- nixos/shared/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index a845b75..1138ad2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -43,14 +43,12 @@ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" "https://0uptime.cachix.org" - "https://attic.kennel.juneis.dog/conduit" ]; trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" - "conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=" ]; }; }; From 3236096a8173bc4dc99145aa33d9babebefa9edb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 30 Oct 2024 10:26:47 +0100 Subject: [PATCH 2072/2308] Let's try disabling all this conduwuit stuff? It's still querying the binary cache for some reason --- flake.lock | 1006 ++--------------- flake.nix | 10 +- pkgs/simple-completion-language-server/result | 1 - 3 files changed, 110 insertions(+), 907 deletions(-) delete mode 120000 pkgs/simple-completion-language-server/result diff --git a/flake.lock b/flake.lock index 63d14af..408d326 100644 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1725300620, - "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -38,11 +14,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728525495, - "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", + "lastModified": 1730060100, + "narHash": "sha256-wTO5qAjMopgEv5GSuFfY432SOCiIHE12n6OPgADLF8U=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", + "rev": "511a714ed34e89a9957b657c38c39ff182fe9da7", "type": "github" }, "original": { @@ -67,71 +43,13 @@ "type": "gitlab" } }, - "cachix": { - "inputs": { - "devenv": "devenv", - "flake-compat": "flake-compat_4", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1724232775, - "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", - "owner": "cachix", - "repo": "cachix", - "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "master", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": "devenv_2", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1712055811, - "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", - "owner": "cachix", - "repo": "cachix", - "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, "catppuccin": { "locked": { - "lastModified": 1728407414, - "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "lastModified": 1730036420, + "narHash": "sha256-rv2bz7J6Wo7AenPiu4+ptCB1AFyaMcS77y89zbRAtI8=", "owner": "catppuccin", "repo": "nix", - "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", + "rev": "0b7bf04628414a402d255924f65e9a0d1a53d92b", "type": "github" }, "original": { @@ -140,53 +58,6 @@ "type": "github" } }, - "complement": { - "flake": false, - "locked": { - "lastModified": 1724347376, - "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", - "owner": "matrix-org", - "repo": "complement", - "rev": "39733c1b2f8314800776748cc7164f9a34650686", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "conduwuit": { - "inputs": { - "attic": "attic", - "cachix": "cachix", - "complement": "complement", - "crane": "crane_3", - "fenix": "fenix_2", - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_3", - "liburing": "liburing", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ], - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1728182038, - "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -209,19 +80,12 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -231,43 +95,6 @@ } }, "crane_3": { - "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_5": { "locked": { "lastModified": 1727974419, "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", @@ -282,75 +109,6 @@ "type": "github" } }, - "devenv": { - "inputs": { - "cachix": "cachix_2", - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "nix": "nix_2", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1723156315, - "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", - "owner": "cachix", - "repo": "devenv", - "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_2": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix", - "nixpkgs": "nixpkgs_2", - "poetry2nix": "poetry2nix", - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1708704632, - "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", - "owner": "cachix", - "repo": "devenv", - "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "python-rewrite", - "repo": "devenv", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -358,11 +116,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1730190761, + "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "3979285062d6781525cded0f6c4ff92e71376b55", "type": "github" }, "original": { @@ -393,29 +151,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1725690497, - "narHash": "sha256-5fT+96rV7Hx29HG+4/oBbr3V+yExKuLN2vcBcPbVBlU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "4b8d964df93d1f918ee6c4f003b3548c432cc866", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -449,71 +184,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "master", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -530,28 +200,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -571,7 +219,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -579,11 +227,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -597,11 +245,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -614,43 +262,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -665,77 +276,7 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -764,11 +305,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -780,15 +321,15 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_4" + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1730248099, + "narHash": "sha256-Fl7BSdpLk0uTXF6ol/MR0q1EB4XQ8tn0ftig0pyYh5Y=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "c11bab124fc55a37cbd854ed28ea121ed609231f", "type": "github" }, "original": { @@ -799,19 +340,19 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1730107060, + "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", "type": "github" }, "original": { @@ -820,94 +361,7 @@ "type": "github" } }, - "liburing": { - "flake": false, - "locked": { - "lastModified": 1725659644, - "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", - "owner": "axboe", - "repo": "liburing", - "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", - "type": "github" - }, - "original": { - "owner": "axboe", - "ref": "master", - "repo": "liburing", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -915,11 +369,11 @@ ] }, "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", "owner": "zhaofengli", "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { @@ -936,11 +390,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -949,44 +403,13 @@ "type": "github" } }, - "nix_2": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { - "lastModified": 1728176478, - "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -1003,11 +426,11 @@ ] }, "locked": { - "lastModified": 1728522165, - "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -1018,11 +441,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1730161780, + "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", "type": "github" }, "original": { @@ -1034,16 +457,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724999960, - "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1065,11 +488,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728565888, - "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", + "lastModified": 1730280180, + "narHash": "sha256-/nJhORYGNnwU4zcBpV6szxceBbqsVerHacFuboij2Iw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", + "rev": "a053f605262f05827024bc7603ee5040788fb3ba", "type": "github" }, "original": { @@ -1078,45 +501,13 @@ "type": "indirect" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { @@ -1128,43 +519,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -1176,11 +535,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1192,59 +551,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1692808169, - "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "lastModified": 1730025694, + "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", "type": "github" }, "original": { @@ -1254,13 +565,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_3": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1270,7 +581,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_4": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1285,13 +596,13 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_5": { "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", + "lastModified": 1729951556, + "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", + "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", "type": "github" }, "original": { @@ -1301,7 +612,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_6": { "locked": { "lastModified": 1728061008, "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", @@ -1327,11 +638,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1729710171, + "narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "247a8e677b51f053ca89dcf67059e24f85e47391", "type": "github" }, "original": { @@ -1340,52 +651,25 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1692876271, - "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -1394,38 +678,20 @@ "type": "github" } }, - "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1725811807, - "narHash": "sha256-k6aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "347d50e212b24d98b5ad9841404ff80c1bb873f0", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.6.1", - "repo": "rocksdb", - "type": "github" - } - }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", - "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_4", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_3", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1451,23 +717,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1725630423, - "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1476,11 +725,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1729996302, + "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", "type": "github" }, "original": { @@ -1513,8 +762,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_7", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1534,15 +783,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -1581,51 +830,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1649,17 +853,17 @@ }, "zjstatus": { "inputs": { - "crane": "crane_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_9", + "crane": "crane_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1728141581, - "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", + "lastModified": 1729787428, + "narHash": "sha256-kGSM7b4+X5LObd6AdgQZABU241ZzHGm24xaiy33kwBI=", "owner": "dj95", "repo": "zjstatus", - "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", + "rev": "c74e310c35fb7ec6b59a1c73720db4d6d8e236a1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95a8488..3864b50 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - conduwuit = { - url = "github:girlbossceo/conduwuit"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # conduwuit = { + # url = "github:girlbossceo/conduwuit"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; @@ -97,7 +97,7 @@ jovian, nixos-hardware, nix-index-database, - conduwuit, + # conduwuit, ... } @ inputs: let inherit (self) outputs; diff --git a/pkgs/simple-completion-language-server/result b/pkgs/simple-completion-language-server/result deleted file mode 120000 index 5a7c687..0000000 --- a/pkgs/simple-completion-language-server/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/3l0wgxsvf5sz2q9sgyj0blc1ivzg808b-simple-completion-language-server-ff9f90bc96c347f284571bc6310bc31f95508d55 \ No newline at end of file From 1650e5a8a1e4b0bc10b37fcf62b40c564164b3e2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Nov 2024 13:01:25 +0100 Subject: [PATCH 2073/2308] update flake lock and change foot's desktop shortcut since the name changed --- flake.lock | 589 ++++++++++++------ .../package-configs/plasma-desktop.nix | 2 +- 2 files changed, 412 insertions(+), 179 deletions(-) diff --git a/flake.lock b/flake.lock index 63d14af..99c7539 100644 --- a/flake.lock +++ b/flake.lock @@ -5,16 +5,15 @@ "crane": "crane_2", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1725300620, - "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", + "lastModified": 1729116596, + "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", "owner": "zhaofengli", "repo": "attic", - "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", + "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", "type": "github" }, "original": { @@ -38,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728525495, - "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", + "lastModified": 1730060100, + "narHash": "sha256-wTO5qAjMopgEv5GSuFfY432SOCiIHE12n6OPgADLF8U=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", + "rev": "511a714ed34e89a9957b657c38c39ff182fe9da7", "type": "github" }, "original": { @@ -72,14 +71,14 @@ "devenv": "devenv", "flake-compat": "flake-compat_4", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1724232775, - "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", "owner": "cachix", "repo": "cachix", - "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", "type": "github" }, "original": { @@ -98,16 +97,58 @@ "devenv", "flake-compat" ], + "git-hooks": [ + "conduwuit", + "cachix", + "devenv", + "pre-commit-hooks" + ], "nixpkgs": [ "conduwuit", "cachix", "devenv", "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726520618, + "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", + "owner": "cachix", + "repo": "cachix", + "rev": "695525f9086542dfb09fde0871dbf4174abbf634", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, + "cachix_3": { + "inputs": { + "devenv": "devenv_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" ], "pre-commit-hooks": [ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "pre-commit-hooks" ] }, @@ -127,11 +168,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1728407414, - "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "lastModified": 1730458408, + "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", "owner": "catppuccin", "repo": "nix", - "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", + "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", "type": "github" }, "original": { @@ -174,11 +215,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1728182038, - "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", + "lastModified": 1729828262, + "narHash": "sha256-tFA1obQW6AVHEdPG0YbOtccRcmo3Qg8ncFs9unVgGmY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", + "rev": "16014e15946132160a40fa057387aadbea1550e4", "type": "github" }, "original": { @@ -232,11 +273,11 @@ }, "crane_3": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1729741221, + "narHash": "sha256-8AHZZXs1lFkERfBY0C8cZGElSo33D/et7NKEpLRmvzo=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "f235b656ee5b2bfd6d94c3bfd67896a575d4a6ed", "type": "github" }, "original": { @@ -247,18 +288,12 @@ } }, "crane_4": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -290,7 +325,7 @@ "cachix", "flake-compat" ], - "nix": "nix_2", + "nix": "nix_3", "nixpkgs": [ "conduwuit", "cachix", @@ -302,6 +337,46 @@ "git-hooks" ] }, + "locked": { + "lastModified": 1727963652, + "narHash": "sha256-os0EDjn7QVXL6RtHNb9TrZLXVm2Tc5/nZKk3KpbTzd8=", + "owner": "cachix", + "repo": "devenv", + "rev": "cb0052e25dbcc8267b3026160dc73cddaac7d5fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "cachix": "cachix_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "git-hooks" + ] + }, "locked": { "lastModified": 1723156315, "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", @@ -316,13 +391,15 @@ "type": "github" } }, - "devenv_2": { + "devenv_3": { "inputs": { "flake-compat": [ "conduwuit", "cachix", "devenv", "cachix", + "devenv", + "cachix", "flake-compat" ], "nix": "nix", @@ -333,6 +410,8 @@ "cachix", "devenv", "cachix", + "devenv", + "cachix", "pre-commit-hooks" ] }, @@ -358,11 +437,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1730190761, + "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "3979285062d6781525cded0f6c4ff92e71376b55", "type": "github" }, "original": { @@ -402,11 +481,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1725690497, - "narHash": "sha256-5fT+96rV7Hx29HG+4/oBbr3V+yExKuLN2vcBcPbVBlU=", + "lastModified": 1729751566, + "narHash": "sha256-99u/hrgBdi8bxSXZc9ZbNkR5EL1htrkbd3lsbKzS60g=", "owner": "nix-community", "repo": "fenix", - "rev": "4b8d964df93d1f918ee6c4f003b3548c432cc866", + "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64", "type": "github" }, "original": { @@ -552,6 +631,30 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -571,7 +674,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -579,11 +682,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -596,24 +699,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1689068808, "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", @@ -628,9 +713,24 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -649,7 +749,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1726560853, @@ -667,7 +767,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -699,11 +799,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1727854478, + "narHash": "sha256-/odH2nUMAwkMgOS2nG2z0exLQNJS4S2LfMW0teqU7co=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", "type": "github" }, "original": { @@ -764,11 +864,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1730450782, + "narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "8ca921e5a806b5b6171add542defe7bdac79d189", "type": "github" }, "original": { @@ -781,14 +881,14 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1730441026, + "narHash": "sha256-xmZQFGeIm2TzXv4jGaQ3nfBoUbt4gKbIv/SHVWw93ag=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "bd1da5657b8903b293a0ff51eb896a91a544ebed", "type": "github" }, "original": { @@ -801,17 +901,17 @@ "inputs": { "crane": "crane_4", "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1730107060, + "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", "type": "github" }, "original": { @@ -820,6 +920,22 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, "liburing": { "flake": false, "locked": { @@ -846,6 +962,8 @@ "devenv", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression" @@ -889,6 +1007,8 @@ "devenv", "cachix", "devenv", + "cachix", + "devenv", "poetry2nix", "nixpkgs" ] @@ -915,11 +1035,11 @@ ] }, "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", "owner": "zhaofengli", "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { @@ -936,11 +1056,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -955,12 +1075,16 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "flake-compat" ], "nixpkgs": [ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression_2" @@ -980,13 +1104,43 @@ "type": "github" } }, + "nix_3": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression_3", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nixlib": { "locked": { - "lastModified": 1728176478, - "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -1003,11 +1157,11 @@ ] }, "locked": { - "lastModified": 1728522165, - "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -1018,11 +1172,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1730368399, + "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", "type": "github" }, "original": { @@ -1034,11 +1188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724999960, - "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", + "lastModified": 1726042813, + "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", + "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", "type": "github" }, "original": { @@ -1048,6 +1202,22 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-24_05": { "locked": { "lastModified": 1717144377, @@ -1065,11 +1235,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728565888, - "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", + "lastModified": 1730462280, + "narHash": "sha256-Qnn3hlqkbwZcjxhlKYXk1e28ngb00blknRHgVp/ETAk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", + "rev": "dea4abb8ba764920453cec83ef5d8e188f4c6a21", "type": "github" }, "original": { @@ -1110,6 +1280,22 @@ "type": "github" } }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1724316499, @@ -1160,11 +1346,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -1176,11 +1362,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -1190,6 +1376,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1692808169, @@ -1208,16 +1410,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } @@ -1240,11 +1442,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1730025694, + "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", "type": "github" }, "original": { @@ -1254,13 +1472,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -1270,7 +1488,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1285,29 +1503,13 @@ "type": "indirect" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "lastModified": 1729951556, + "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", "type": "github" }, "original": { @@ -1327,11 +1529,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1730366788, + "narHash": "sha256-0Ezvv4KkyFdLAblPBFDgZbiMLlJZtpHruT2i4KC2wIY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "f634d5f6ee9be365b2ca08b2d00e0e3b0c240b9e", "type": "github" }, "original": { @@ -1342,7 +1544,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "conduwuit", @@ -1350,6 +1552,8 @@ "devenv", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ] }, @@ -1367,6 +1571,50 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "flake-utils": "flake-utils_2", + "gitignore": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1381,11 +1629,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -1397,16 +1645,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1725811807, - "narHash": "sha256-k6aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk=", + "lastModified": 1729712930, + "narHash": "sha256-jlp4kPkRTpoJaUdobEoHd8rCGAQNBy4ZHZ6y5zL/ibw=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "347d50e212b24d98b5ad9841404ff80c1bb873f0", + "rev": "871eda6953c3f399aae39808dcfccdd014885beb", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.6.1", + "ref": "v9.7.3", "repo": "rocksdb", "type": "github" } @@ -1417,7 +1665,7 @@ "catppuccin": "catppuccin", "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", @@ -1425,7 +1673,7 @@ "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1454,11 +1702,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1725630423, - "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=", + "lastModified": 1729715509, + "narHash": "sha256-jUDN4e1kObbksb4sc+57NEeujBEDRdLCOu9wiE3RZdM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d", + "rev": "40492e15d49b89cf409e2c5536444131fac49429", "type": "github" }, "original": { @@ -1476,11 +1724,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1729996302, + "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", "type": "github" }, "original": { @@ -1514,7 +1762,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1534,15 +1782,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -1611,21 +1859,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1651,15 +1884,15 @@ "inputs": { "crane": "crane_5", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1728141581, - "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", + "lastModified": 1729787428, + "narHash": "sha256-kGSM7b4+X5LObd6AdgQZABU241ZzHGm24xaiy33kwBI=", "owner": "dj95", "repo": "zjstatus", - "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", + "rev": "c74e310c35fb7ec6b59a1c73720db4d6d8e236a1", "type": "github" }, "original": { diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index b1f5c6a..d823fdb 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -88,7 +88,7 @@ "applications:steam.desktop" "applications:noisetorch.desktop" "applications:org.kde.plasma-systemmonitor.desktop" - "applications:org.codeberg.dnkl.foot.desktop" + "applications:foot.desktop" "applications:nitrokey-app.desktop" "applications:codium.desktop" "applications:freetube.desktop" From 39136e1877633a9dd2081402b24f3eb7101d624b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Nov 2024 13:03:44 +0100 Subject: [PATCH 2074/2308] update flake lock --- flake.lock | 1133 +++------------------------------------------------- 1 file changed, 52 insertions(+), 1081 deletions(-) diff --git a/flake.lock b/flake.lock index 99c7539..2ef2641 100644 --- a/flake.lock +++ b/flake.lock @@ -1,28 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1729116596, - "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -66,106 +43,6 @@ "type": "gitlab" } }, - "cachix": { - "inputs": { - "devenv": "devenv", - "flake-compat": "flake-compat_4", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1728672398, - "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", - "owner": "cachix", - "repo": "cachix", - "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "master", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": "devenv_2", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "git-hooks": [ - "conduwuit", - "cachix", - "devenv", - "pre-commit-hooks" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726520618, - "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", - "owner": "cachix", - "repo": "cachix", - "rev": "695525f9086542dfb09fde0871dbf4174abbf634", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, - "cachix_3": { - "inputs": { - "devenv": "devenv_3", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1712055811, - "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", - "owner": "cachix", - "repo": "cachix", - "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, "catppuccin": { "locked": { "lastModified": 1730458408, @@ -181,53 +58,6 @@ "type": "github" } }, - "complement": { - "flake": false, - "locked": { - "lastModified": 1724347376, - "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", - "owner": "matrix-org", - "repo": "complement", - "rev": "39733c1b2f8314800776748cc7164f9a34650686", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "conduwuit": { - "inputs": { - "attic": "attic", - "cachix": "cachix", - "complement": "complement", - "crane": "crane_3", - "fenix": "fenix_2", - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_3", - "liburing": "liburing", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ], - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1729828262, - "narHash": "sha256-tFA1obQW6AVHEdPG0YbOtccRcmo3Qg8ncFs9unVgGmY=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "16014e15946132160a40fa057387aadbea1550e4", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -250,44 +80,6 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", - "owner": "ipetkov", - "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "locked": { - "lastModified": 1729741221, - "narHash": "sha256-8AHZZXs1lFkERfBY0C8cZGElSo33D/et7NKEpLRmvzo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "f235b656ee5b2bfd6d94c3bfd67896a575d4a6ed", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { "locked": { "lastModified": 1730060262, "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", @@ -302,7 +94,7 @@ "type": "github" } }, - "crane_5": { + "crane_3": { "locked": { "lastModified": 1727974419, "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", @@ -317,119 +109,6 @@ "type": "github" } }, - "devenv": { - "inputs": { - "cachix": "cachix_2", - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "nix": "nix_3", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1727963652, - "narHash": "sha256-os0EDjn7QVXL6RtHNb9TrZLXVm2Tc5/nZKk3KpbTzd8=", - "owner": "cachix", - "repo": "devenv", - "rev": "cb0052e25dbcc8267b3026160dc73cddaac7d5fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_2": { - "inputs": { - "cachix": "cachix_3", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix_2", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1723156315, - "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", - "owner": "cachix", - "repo": "devenv", - "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_3": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix", - "nixpkgs": "nixpkgs_2", - "poetry2nix": "poetry2nix", - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1708704632, - "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", - "owner": "cachix", - "repo": "devenv", - "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "python-rewrite", - "repo": "devenv", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -472,29 +151,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1729751566, - "narHash": "sha256-99u/hrgBdi8bxSXZc9ZbNkR5EL1htrkbd3lsbKzS60g=", - "owner": "nix-community", - "repo": "fenix", - "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -528,71 +184,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "master", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -609,52 +200,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "cachix", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -674,7 +219,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -700,11 +245,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -714,43 +259,9 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -765,77 +276,7 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1727854478, - "narHash": "sha256-/odH2nUMAwkMgOS2nG2z0exLQNJS4S2LfMW0teqU7co=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -880,8 +321,8 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_5" + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1730441026, @@ -899,10 +340,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_6", + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -920,114 +361,7 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, - "liburing": { - "flake": false, - "locked": { - "lastModified": 1725659644, - "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", - "owner": "axboe", - "repo": "liburing", - "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", - "type": "github" - }, - "original": { - "owner": "axboe", - "ref": "master", - "repo": "liburing", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -1069,71 +403,6 @@ "type": "github" } }, - "nix_2": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix_3": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "flake-parts": "flake-parts_2", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_3", - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_3", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", - "owner": "domenkozar", - "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1729386149, @@ -1188,36 +457,20 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726042813, - "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-23-11": { - "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - } - }, "nixpkgs-24_05": { "locked": { "lastModified": 1717144377, @@ -1235,11 +488,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730462280, - "narHash": "sha256-Qnn3hlqkbwZcjxhlKYXk1e28ngb00blknRHgVp/ETAk=", + "lastModified": 1730462463, + "narHash": "sha256-zEvTgoadqkInPhlBXR1hQrK3PJO+pxnH+H4OtNP8uWQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dea4abb8ba764920453cec83ef5d8e188f4c6a21", + "rev": "c034a96848b941fd334d33d5b1c58c8b611adc3a", "type": "github" }, "original": { @@ -1248,61 +501,13 @@ "type": "indirect" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_3": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { @@ -1313,38 +518,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { "locked": { "lastModified": 1729973466, "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", @@ -1376,87 +549,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1692808169, - "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1717432640, - "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1730025694, "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", @@ -1472,7 +565,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_3": { "locked": { "lastModified": 1730200266, "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", @@ -1488,7 +581,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_4": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1503,7 +596,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_5": { "locked": { "lastModified": 1729951556, "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", @@ -1519,6 +612,22 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1542,91 +651,18 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1692876271, - "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "nix" - ], - "flake-utils": "flake-utils_2", - "gitignore": [ - "conduwuit", - "cachix", - "devenv", - "nix" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "conduwuit", - "cachix", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1729104314, @@ -1642,38 +678,20 @@ "type": "github" } }, - "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1729712930, - "narHash": "sha256-jlp4kPkRTpoJaUdobEoHd8rCGAQNBy4ZHZ6y5zL/ibw=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "871eda6953c3f399aae39808dcfccdd014885beb", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.7.3", - "repo": "rocksdb", - "type": "github" - } - }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", - "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts_3", - "flake-utils": "flake-utils_4", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_3", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1699,23 +717,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1729715509, - "narHash": "sha256-jUDN4e1kObbksb4sc+57NEeujBEDRdLCOu9wiE3RZdM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "40492e15d49b89cf409e2c5536444131fac49429", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1761,8 +762,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_8", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1782,8 +783,8 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9", - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1729999681, @@ -1829,36 +830,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1882,9 +853,9 @@ }, "zjstatus": { "inputs": { - "crane": "crane_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "crane": "crane_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_2" }, "locked": { From 0c0c841b270f5e24bca56a5560b59a111ff890c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Nov 2024 13:46:18 +0100 Subject: [PATCH 2075/2308] add ryujinx and re-add conduwuit --- flake.nix | 10 +++++----- home-manager/hosts/GLaDOS/lillian.nix | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 3864b50..95a8488 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - # conduwuit = { - # url = "github:girlbossceo/conduwuit"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + conduwuit = { + url = "github:girlbossceo/conduwuit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; @@ -97,7 +97,7 @@ jovian, nixos-hardware, nix-index-database, - # conduwuit, + conduwuit, ... } @ inputs: let inherit (self) outputs; diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 0841ff3..572d11a 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -18,6 +18,7 @@ home.packages = with pkgs; [ heroic r2modman + ryujinx ]; programs.mangohud = { From e8f1325d13917b76805cedcb24c5f02f1beac5da Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Nov 2024 13:49:03 +0100 Subject: [PATCH 2076/2308] update flake lock --- flake.lock | 1193 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 1111 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index 2ef2641..1c52611 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "attic": { + "inputs": { + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1729116596, + "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", + "type": "github" + } + }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -43,6 +66,106 @@ "type": "gitlab" } }, + "cachix": { + "inputs": { + "devenv": "devenv", + "flake-compat": "flake-compat_4", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", + "owner": "cachix", + "repo": "cachix", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "master", + "repo": "cachix", + "type": "github" + } + }, + "cachix_2": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "git-hooks": [ + "conduwuit", + "cachix", + "devenv", + "pre-commit-hooks" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726520618, + "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", + "owner": "cachix", + "repo": "cachix", + "rev": "695525f9086542dfb09fde0871dbf4174abbf634", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, + "cachix_3": { + "inputs": { + "devenv": "devenv_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "catppuccin": { "locked": { "lastModified": 1730458408, @@ -58,6 +181,53 @@ "type": "github" } }, + "complement": { + "flake": false, + "locked": { + "lastModified": 1724347376, + "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", + "owner": "matrix-org", + "repo": "complement", + "rev": "39733c1b2f8314800776748cc7164f9a34650686", + "type": "github" + }, + "original": { + "owner": "matrix-org", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, + "conduwuit": { + "inputs": { + "attic": "attic", + "cachix": "cachix", + "complement": "complement", + "crane": "crane_3", + "fenix": "fenix_2", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_3", + "liburing": "liburing", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nixpkgs" + ], + "rocksdb": "rocksdb" + }, + "locked": { + "lastModified": 1729828262, + "narHash": "sha256-tFA1obQW6AVHEdPG0YbOtccRcmo3Qg8ncFs9unVgGmY=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "16014e15946132160a40fa057387aadbea1550e4", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -80,6 +250,44 @@ } }, "crane_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "owner": "ipetkov", + "repo": "crane", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { + "locked": { + "lastModified": 1729741221, + "narHash": "sha256-8AHZZXs1lFkERfBY0C8cZGElSo33D/et7NKEpLRmvzo=", + "owner": "ipetkov", + "repo": "crane", + "rev": "f235b656ee5b2bfd6d94c3bfd67896a575d4a6ed", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "crane_4": { "locked": { "lastModified": 1730060262, "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", @@ -94,7 +302,7 @@ "type": "github" } }, - "crane_3": { + "crane_5": { "locked": { "lastModified": 1727974419, "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", @@ -109,6 +317,119 @@ "type": "github" } }, + "devenv": { + "inputs": { + "cachix": "cachix_2", + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "nix": "nix_3", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "git-hooks" + ] + }, + "locked": { + "lastModified": 1727963652, + "narHash": "sha256-os0EDjn7QVXL6RtHNb9TrZLXVm2Tc5/nZKk3KpbTzd8=", + "owner": "cachix", + "repo": "devenv", + "rev": "cb0052e25dbcc8267b3026160dc73cddaac7d5fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "cachix": "cachix_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "git-hooks" + ] + }, + "locked": { + "lastModified": 1723156315, + "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", + "owner": "cachix", + "repo": "devenv", + "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_3": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix", + "nixpkgs": "nixpkgs_2", + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "owner": "cachix", + "repo": "devenv", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "python-rewrite", + "repo": "devenv", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -151,6 +472,29 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1729751566, + "narHash": "sha256-99u/hrgBdi8bxSXZc9ZbNkR5EL1htrkbd3lsbKzS60g=", + "owner": "nix-community", + "repo": "fenix", + "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -184,6 +528,71 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -202,15 +611,17 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "conduwuit", + "attic", "nixpkgs" ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -220,6 +631,50 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -245,11 +700,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -259,9 +714,43 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -276,7 +765,77 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1727854478, + "narHash": "sha256-/odH2nUMAwkMgOS2nG2z0exLQNJS4S2LfMW0teqU7co=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -305,11 +864,11 @@ ] }, "locked": { - "lastModified": 1730450782, - "narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=", + "lastModified": 1730633670, + "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "8ca921e5a806b5b6171add542defe7bdac79d189", + "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "type": "github" }, "original": { @@ -321,15 +880,15 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs" + "nix-github-actions": "nix-github-actions_2", + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730441026, - "narHash": "sha256-xmZQFGeIm2TzXv4jGaQ3nfBoUbt4gKbIv/SHVWw93ag=", + "lastModified": 1730625581, + "narHash": "sha256-vFxtzNCxtUIrmv8tluquZHjNTwMkCGtT0NCoVuwlqd4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bd1da5657b8903b293a0ff51eb896a91a544ebed", + "rev": "e6195c6bfc037617e20d6d7d4d6c9cdeee6aba6d", "type": "github" }, "original": { @@ -340,10 +899,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2", + "crane": "crane_4", + "flake-compat": "flake-compat_6", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -361,7 +920,114 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1725659644, + "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", + "owner": "axboe", + "repo": "liburing", + "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": "flake-compat_3", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "nix-filter", + "type": "github" + } + }, "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -390,11 +1056,11 @@ ] }, "locked": { - "lastModified": 1729999765, - "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", + "lastModified": 1730604744, + "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", + "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", "type": "github" }, "original": { @@ -403,6 +1069,71 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression_3", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1729386149, @@ -441,11 +1172,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730368399, - "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", + "lastModified": 1730537918, + "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", + "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", "type": "github" }, "original": { @@ -457,20 +1188,36 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1726042813, + "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-24_05": { "locked": { "lastModified": 1717144377, @@ -488,11 +1235,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730462463, - "narHash": "sha256-zEvTgoadqkInPhlBXR1hQrK3PJO+pxnH+H4OtNP8uWQ=", + "lastModified": 1730637267, + "narHash": "sha256-EBOSv3aJ88WitFtEb5XaIC0fNK/PJk1WoQvuAZGa1/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c034a96848b941fd334d33d5b1c58c8b611adc3a", + "rev": "b4cca74d1b67f45b3dadf0f7e9a868645615251d", "type": "github" }, "original": { @@ -501,7 +1248,71 @@ "type": "indirect" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { + "locked": { + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -517,13 +1328,29 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1730602179, + "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", "type": "github" }, "original": { @@ -535,11 +1362,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -549,7 +1376,87 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1730025694, "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", @@ -565,13 +1472,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_7": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -581,7 +1488,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_8": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -596,29 +1503,13 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_9": { "locked": { - "lastModified": 1729951556, - "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -638,11 +1529,11 @@ ] }, "locked": { - "lastModified": 1730366788, - "narHash": "sha256-0Ezvv4KkyFdLAblPBFDgZbiMLlJZtpHruT2i4KC2wIY=", + "lastModified": 1730635861, + "narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "f634d5f6ee9be365b2ca08b2d00e0e3b0c240b9e", + "rev": "293668587937daae1df085ee36d2b2d0792b7a0f", "type": "github" }, "original": { @@ -651,18 +1542,91 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "flake-utils": "flake-utils_2", + "gitignore": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1729104314, @@ -678,20 +1642,38 @@ "type": "github" } }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1729712930, + "narHash": "sha256-jlp4kPkRTpoJaUdobEoHd8rCGAQNBy4ZHZ6y5zL/ibw=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "871eda6953c3f399aae39808dcfccdd014885beb", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "v9.7.3", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", + "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-parts": "flake-parts_3", + "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_7", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -717,6 +1699,23 @@ "type": "github" } }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1729715509, + "narHash": "sha256-jUDN4e1kObbksb4sc+57NEeujBEDRdLCOu9wiE3RZdM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "40492e15d49b89cf409e2c5536444131fac49429", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -762,8 +1761,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_4", + "flake-compat": "flake-compat_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -783,15 +1782,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_9", + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1729999681, - "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", + "lastModified": 1730605784, + "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", + "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760", "type": "github" }, "original": { @@ -830,6 +1829,36 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -853,9 +1882,9 @@ }, "zjstatus": { "inputs": { - "crane": "crane_3", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6", + "crane": "crane_5", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { From d61288b8c10a16c5f65a050ac261eabf32bf6729 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Nov 2024 14:04:32 +0100 Subject: [PATCH 2077/2308] fix yazi bug with 7zz --- home-manager/shared/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 07f7fde..1555a1e 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -27,8 +27,13 @@ broot lazygit navi - yazi nil ]; programs.navi.enable = true; + programs.yazi = { + enable = true; + package = pkgs.yazi.override { + _7zz = pkgs._7zz.override {useUasm = true;}; + }; + }; } From 382913f15ddab72ee155f0c20bac2a5c5a2f9dbd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Nov 2024 14:05:41 +0100 Subject: [PATCH 2078/2308] Update flake lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1c52611..869b56a 100644 --- a/flake.lock +++ b/flake.lock @@ -437,11 +437,11 @@ ] }, "locked": { - "lastModified": 1730190761, - "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", + "lastModified": 1730675461, + "narHash": "sha256-Mhqz3p/HEiI/zxBJWO57LYQf6gGlJB0tci6fiVXLjd8=", "owner": "nix-community", "repo": "disko", - "rev": "3979285062d6781525cded0f6c4ff92e71376b55", + "rev": "380847d94ff0fedee8b50ee4baddb162c06678df", "type": "github" }, "original": { @@ -884,11 +884,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730625581, - "narHash": "sha256-vFxtzNCxtUIrmv8tluquZHjNTwMkCGtT0NCoVuwlqd4=", + "lastModified": 1730652030, + "narHash": "sha256-uTToUpFphR9ywc+DQUD/8hmboOMFV1lBVFf/ztzdn6A=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e6195c6bfc037617e20d6d7d4d6c9cdeee6aba6d", + "rev": "e74e57a37de55ecfdc62f49fe5a7463b2a52499a", "type": "github" }, "original": { @@ -1235,11 +1235,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730637267, - "narHash": "sha256-EBOSv3aJ88WitFtEb5XaIC0fNK/PJk1WoQvuAZGa1/U=", + "lastModified": 1730725329, + "narHash": "sha256-5TEPO7ifLaEC3eUXYQqhI85eREgV7fbgEXflN1jpGGc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4cca74d1b67f45b3dadf0f7e9a868645615251d", + "rev": "2f45b7ffd7297dd721a747e8d8399abb84ccf1ab", "type": "github" }, "original": { From 99cd42ce60494db91cfc4f081f4b262b3e3ae80e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 9 Nov 2024 18:00:23 +0100 Subject: [PATCH 2079/2308] change the theming to stylix, set a background image, and set cursors automagically --- flake.lock | 395 +++++++++++++++--- flake.nix | 7 + home-manager/desktop/default.nix | 5 +- .../desktop/package-configs/foot/default.nix | 3 +- home-manager/shared/default.nix | 35 +- home-manager/shared/shell/bat.nix | 2 +- home-manager/shared/shell/zellij/default.nix | 2 +- nixos/shared/background.jpg | Bin 0 -> 161326 bytes nixos/shared/default.nix | 56 ++- nixos/shared/packages/default.nix | 40 +- 10 files changed, 447 insertions(+), 98 deletions(-) create mode 100644 nixos/shared/background.jpg diff --git a/flake.lock b/flake.lock index 869b56a..acc408a 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,72 @@ "type": "github" } }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "665b3c6748534eb766c777298721cece9453fdae", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "type": "github" + } + }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -37,11 +103,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730060100, - "narHash": "sha256-wTO5qAjMopgEv5GSuFfY432SOCiIHE12n6OPgADLF8U=", + "lastModified": 1730928062, + "narHash": "sha256-fXwp5vmq313QEu180EsPr0YT0OqVDlcebNYxxZ7mMLw=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "511a714ed34e89a9957b657c38c39ff182fe9da7", + "rev": "d4932bf0e32375451e7cfd4b776bb5c470e9afb8", "type": "github" }, "original": { @@ -168,11 +234,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1730458408, - "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", + "lastModified": 1731088327, + "narHash": "sha256-Oizjf0wXBTqALipX4fQdGjq9IBSCXz8wwcfCGRK73bI=", "owner": "catppuccin", "repo": "nix", - "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", + "rev": "7bebd062df3239c005c0d600f5dfd8514f5915f8", "type": "github" }, "original": { @@ -289,11 +355,11 @@ }, "crane_4": { "locked": { - "lastModified": 1730060262, - "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -304,11 +370,11 @@ }, "crane_5": { "locked": { - "lastModified": 1727974419, - "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -437,11 +503,11 @@ ] }, "locked": { - "lastModified": 1730675461, - "narHash": "sha256-Mhqz3p/HEiI/zxBJWO57LYQf6gGlJB0tci6fiVXLjd8=", + "lastModified": 1731060864, + "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=", "owner": "nix-community", "repo": "disko", - "rev": "380847d94ff0fedee8b50ee4baddb162c06678df", + "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f", "type": "github" }, "original": { @@ -608,6 +674,22 @@ "type": "github" } }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -682,11 +764,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -767,7 +849,28 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_5" }, "locked": { "lastModified": 1726560853, @@ -783,6 +886,22 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -857,6 +976,23 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -864,11 +1000,11 @@ ] }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -878,17 +1014,38 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730652030, - "narHash": "sha256-uTToUpFphR9ywc+DQUD/8hmboOMFV1lBVFf/ztzdn6A=", + "lastModified": 1730962714, + "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e74e57a37de55ecfdc62f49fe5a7463b2a52499a", + "rev": "93b525229c99fec0016db72a174f43b9d6237714", "type": "github" }, "original": { @@ -907,11 +1064,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730107060, - "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", + "lastModified": 1730739295, + "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", + "rev": "cef39a78679c266300874e7a7000b4da066228d4", "type": "github" }, "original": { @@ -1172,11 +1329,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730537918, - "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -1235,11 +1392,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730725329, - "narHash": "sha256-5TEPO7ifLaEC3eUXYQqhI85eREgV7fbgEXflN1jpGGc=", + "lastModified": 1731095917, + "narHash": "sha256-KMP/SvOmQsX1SQqi3BsOaCwrR2YofAPld5iuOA+ZTLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f45b7ffd7297dd721a747e8d8399abb84ccf1ab", + "rev": "bdac466cb9b2ff77f7459a3d68de9045a562bc28", "type": "github" }, "original": { @@ -1362,11 +1519,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -1378,11 +1535,27 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -1458,11 +1631,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1730025694, - "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", + "lastModified": 1730642263, + "narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", + "rev": "650fe87347086b30a6dbcc32b55987ce5a23c6ae", "type": "github" }, "original": { @@ -1474,11 +1647,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -1629,11 +1802,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "type": "github" }, "original": { @@ -1679,6 +1852,7 @@ "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", + "stylix": "stylix", "zjstatus": "zjstatus" } }, @@ -1724,11 +1898,11 @@ ] }, "locked": { - "lastModified": 1729996302, - "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", + "lastModified": 1730601085, + "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", + "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", "type": "github" }, "original": { @@ -1745,11 +1919,11 @@ ] }, "locked": { - "lastModified": 1728095260, - "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", + "lastModified": 1730687492, + "narHash": "sha256-xQVadjquBA/tFxDt5A55LJ1D1AvkVWsnrKC2o+pr8F4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", + "rev": "41814763a2c597755b0755dbe3e721367a5e420f", "type": "github" }, "original": { @@ -1786,11 +1960,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1730605784, - "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=", + "lastModified": 1731047660, + "narHash": "sha256-iyp51lPWEQz4c5VH9bVbAuBcFP4crETU2QJYh5V0NYA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760", + "rev": "60e1bce1999f126e3b16ef45f89f72f0c3f8d16f", "type": "github" }, "original": { @@ -1799,6 +1973,36 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_5", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_10", + "systems": "systems_4", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" + }, + "locked": { + "lastModified": 1731090365, + "narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=", + "owner": "danth", + "repo": "stylix", + "rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1859,6 +2063,71 @@ "type": "github" } }, + "systems_5": { + "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": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1883,16 +2152,16 @@ "zjstatus": { "inputs": { "crane": "crane_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1729787428, - "narHash": "sha256-kGSM7b4+X5LObd6AdgQZABU241ZzHGm24xaiy33kwBI=", + "lastModified": 1730748983, + "narHash": "sha256-72uoWm/34SU5aHgvUJgKqYMhvt4Y9X39bFhcDwVS+P0=", "owner": "dj95", "repo": "zjstatus", - "rev": "c74e310c35fb7ec6b59a1c73720db4d6d8e236a1", + "rev": "d5794fbec93860ead015b0beee70489f50cd87b1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95a8488..c25d052 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,8 @@ # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; + # Stylix theming engine + stylix.url = "github:danth/stylix"; }; outputs = { @@ -98,6 +100,7 @@ nixos-hardware, nix-index-database, conduwuit, + stylix, ... } @ inputs: let inherit (self) outputs; @@ -155,6 +158,7 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -177,6 +181,7 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -197,6 +202,7 @@ disko.nixosModules.disko simple-nixos-mailserver.nixosModule catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -218,6 +224,7 @@ jovian.nixosModules.jovian home-manager.nixosModules.home-manager catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 947d6dd..3cbb99c 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -1,9 +1,6 @@ { - inputs, - outputs, - lib, - config, pkgs, + lib, ... }: { # You can import other home-manager modules here diff --git a/home-manager/desktop/package-configs/foot/default.nix b/home-manager/desktop/package-configs/foot/default.nix index f1839dc..aada26e 100644 --- a/home-manager/desktop/package-configs/foot/default.nix +++ b/home-manager/desktop/package-configs/foot/default.nix @@ -1,10 +1,9 @@ {...}: { programs.foot = { enable = true; - catppuccin.enable = true; + # catppuccin.enable = true; settings = { main = { - font = "Fira Code:size=11"; }; mouse = { diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 1555a1e..239a06a 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -12,10 +12,10 @@ homeDirectory = "/home/lillian"; }; - catppuccin = { - enable = true; - flavor = "macchiato"; - }; + # catppuccin = { + # enable = true; + # flavor = "macchiato"; + # }; home.packages = with pkgs; [ # System tools: @@ -36,4 +36,31 @@ _7zz = pkgs._7zz.override {useUasm = true;}; }; }; + # stylix = { + # enable = true; + # autoEnable = true; + # base16Scheme = { + # scheme = "Catppuccin Macchiato"; + # author = "https://github.com/catppuccin/catppuccin"; + # base00 = "24273a"; + # base01 = "1e2030"; + # base02 = "363a4f"; + # base03 = "494d64"; + # base04 = "5b6078"; + # base05 = "cad3f5"; + # base06 = "f4dbd6"; + # base07 = "b7bdf8"; + # base08 = "ed8796"; + # base09 = "f5a97f"; + # base0A = "eed49f"; + # base0B = "a6da95"; + # base0C = "8bd5ca"; + # base0D = "8aadf4"; + # base0E = "c6a0f6"; + # base0F = "f0c6c6"; + # }; + # image = ./background.jpg; + # cursor.package = pkgs.catppuccin-cursors; + # cursor.name = "macchiatoMauve"; + # }; } diff --git a/home-manager/shared/shell/bat.nix b/home-manager/shared/shell/bat.nix index 2afdce3..8658a54 100644 --- a/home-manager/shared/shell/bat.nix +++ b/home-manager/shared/shell/bat.nix @@ -2,6 +2,6 @@ programs.bat = { enable = true; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch]; - catppuccin.enable = true; + # catppuccin.enable = true; }; } diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 6e154ec..5ad5e0e 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -174,7 +174,7 @@ in { enableZshIntegration = true; settings = { session_serialization = true; - theme = "catppuccin-macchiato"; + # theme = "catppuccin-macchiato"; themes = { catppuccin-mocha = { diff --git a/nixos/shared/background.jpg b/nixos/shared/background.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2ad658c36b07fc29fa67c0b790f30fa0db2541ae GIT binary patch literal 161326 zcmex=oIr{vToxnIsfL#yc`{tY*b(=T60s{JU{S`>thSrTjM|wic@$N?(4|_e#NC+w-z^m*!8evN1Z|zXYfCSS4(~pPsE5 zz2)@#o*sv@{Vs8DM z^X|&>Z9X62c57Re)mhm+bCOpz&fER^ZSj4pmvipEGhaV<_mcDRhL&HxZ1#Hdxj&B6 z0n;ShB4*j&kKES#yypG0pL42D#l?R0yr`G;c)_E(#up!J&gc7HPF{X~g$^?`F!m8<=&aFq8o~v&wQ_a z-nZxV(@U>8>{z+SjV~YU>-q52Dr;}V z`#F`>uhl;7T(oWHuIE<&q-%D)vp-+?^+@^xBzwM}UAF9O0!SdW!}fDgjML@(%d^^F z*6{7T&Sy6>HdSQbzAEX;kE>$i9k^R|dp0~j-krKm+UCB^yhk&gZtu#Ta(H#|>$ABNms{^zIr&`Va^d!seV*9` z8`|g1+VgQPa%sf4nV*68)~>gopP7F96O<|Oih&{ZaZ&cM65;!citgqwKW=@#;LDG! zH>=icyk_&qEPMXEJsbO~rk}~q{k%#>N9*UeSB6)2Z=W~odYa|cmT}X>+>aE&ofqzTwgY2S%rcIA^$<-S^Cb;ym-Ame9`tzub($Y=J);lT=#X#oL^7t z`NH$0jBfWHd+{&F-^^|0teNH~*?P7WAKUq>?D3j=MJ1lAE}yfTU&ETZB<2;zanw2> zwSU>^s@|$IKa4kc)a4wvI-o;%l&WYW3KYf3F&h(77t}^~(H5ATz+;+C_Uld}U`RnCZ3B`yy`^wG{TvtbDVjMO>$BazFt4 z@&-wXh7-x}X9ow)dcdsMVfIid^o(a!m`{64#wj<;Xr6Qj2KLPfztjGh{_uZiSAD1K z(~W|?)7e)VZ|Th47xA3kZjMUs_p`}B*_bt0A@aOCYB4d?-ebK4icY<|3&t54NbDD3CC1=@(kC$H8)_cGF_+i`U zz2|mj_o${<{hhnIW^I(w%j0LByxC;Gd(X}_D_@#CUN0!V>+zm{cT^IEt#7jH6kb&3 z+-|M@bNlvrpZeU+etJ^!?N0jqn`^$y+8%Q`t#Y%-xA=4YjOWW|eM^=rvH9+~r#SAn zzI5y6$l`+=ZEjnsEpeP%t!A^^_V%j75sN>4o0QEsH|q8J(~(n!kL)(QzvT0svSU`8 zB)0v^OmE;~;E!Au`_$e0)klv`E%kc2>P;WMpRe565qL*Zf@){(kBrbLTa|mAS2F@(t$(vHdi8`#kOKgEz%*RdGP1o zjq8kG1U0$bdRx3{`}1FMdu-e7)PAOVC)!*8TvPYD^;50B>g&sM?*yOQe$C|I?zPvn z48DciU99r9l>M{EJiPYQ&2uMT{`?m^EAi>PnWxrzU%2uxagAeoT2S`Rm9zFQJDq!` z;`f&HMBTT>vF9pI-3=%_EpzRTPR@FdBfU>%ynZl+KmEYwo!z&8C%^hwSZ$?y(y%S| z&yMu-C6(9KeEc5ySvT72=)5)WEq;WbmiODcr&b_4C+7FXWzNrUpV{*%GJLA7dA_}- z*sIm^b1TlY&wf8Cc^+|9G0(P_n>TF>o83K2cH1;@6S1o|ulbpw{^Dk#?fdly`A^H3pVpo6bYI5q z57T?5UjKc14`1=7t7~e`r(f3ISygGhUfJ7j@}fsiueM27{3^d&{P(_}@W1R*ha}4? zwXEB6&-0?pq?3Pc+Hn7w#!dOcHp^GjWjq((?RfX-?yo)3rf)v)?|0fae}3KO6m7ma zh1YkVo>Q7V)5Lb?ah{jYHr$NNKD{^2SRuXO#V^0=_SO6~)91~4dhK?$sbucuxyFZ{ zDjYt4^mHU~nUnEd^l!<1LE({~-zL{C4c{*P*wi=c{z}R0FHzBRV*zrqBMRUtG@7s3W@)Fz6rskBN#WCXkEi*pb?7gOC`R{R^)s@Q1XPX_cZ_OBkB*9{xr?MZLA{3Xur?3SXBdsgQqeXYE&xZE<_!06U=xBIrfABqlbOJ9ED zdj#*Q_u9GJmEWJ%eUuXUJEvPLWwwU)uReCE*K0JYcpnSjI();^{N=g5IVw2^6N5^l zHt$QG^GjUve5hQ+(X-d>w)sxV&U?vkWmjH1qjK#mqDB7 zZ*^b4WNp%RYoC72KVNm$Xs2&4EVWL8}=S!*;oY~{VRq4xftw`+H9c>O_tUk$zqjc`0!wvs50OEffB*GkZFdiL_p9UD)RRw(QHE_w}u-RgMjt#n+YX zc4o2eee>#|fc*B>hqntiX@33$!)Av7K7P_zNvCkd8uI;9+$4aH&>jjx#+R>Js zllkjg6`%N$r_$>tOZh&QAXo!3=PgK|xPpO!fj{iiM^w|*NvCHdY)Il=&Y^8@AtiKliN3C zoOaDU`+PU=wNq)cOA|MIzHh8qa%$2s!L)<6$*fj3rbqIp@0q>o)A3AGvt`$m)@i+! zTJ&_6*X?8bOt0|-Wt{rjSG;(#;J!nyscXJm{do7}hw|vZ*R7_1x*R z##I&B?}~o@I_LLls@1KVF_*r~)fEr4E}kp5T0_XmO%Lt89I$8REC>JoDC6Tv>5FodOIvGuuG&RUH$2-WHnp>= z`<=k+n;(m{Bu`83^(wrZBiDO5tzUS}P19(x`(ag5w>O{hjZ0A7t0%d^aP9Vwc9Fub zM5dp0zjgLo+39P1GiS_X{d`x#SU-kaNoKBuz{KSn?Ne%^^R9NT<9#Y@zCk7F+PU~O z7tU3G{JO*7Sw?bAq&0`-<d)zIz-aE6V_3ELT<7=jhecrTYde2?|=;L`i zUnj&ow$56yZ>7i06Z2+&yeWC9e^yw$LR@*tretp;!Sv`$1p&{q@0Byph+Hm|Z1b?l7b?jUliy|d z&bV|udC5(_=$b!zyM%>SY|GPC{@q-l_p&(cdhZ)opR-m%HhSHYcD!2RGTZ9+xi7!E zc6*&&bL!_i)9Vd!;0_H_is2VKr_Cp~Rm9!7_|r(K0@I6_B5Y@q>IC;pnfj7b$+m&< z{WR%it6Wd;Y`T`Z*?-CWq+i>DKdznCe)0EJbBk|PkHYU<+4<^w*t44IiQ7)8_nyAK zxa$4!`yu@b>krp0)3NQ;-J|{1#$%GHn{Q>-joE1_S+cqJmK;jWZ!I~UBRpk#s$i$o z-bvR^Y}#h}ggffVbhT9%m!|#GJil}Dr}uhxvsZV&SoZO{wd!4Sw_{h!uCBDsvonp4 zzUYu-C%$y${Y_eqb61>sm9sW%(JRk2X4SH*_Nm_xKPEl{>L)$TgZsh30OjMRgciNI zX7*~zW|dbH&EwfVXBB%(oH>4;wSn<{1M_`bGw;h<*`clG9@l*nKimB)pS?cu+VSu4YwO0DGzG&aM9(>2|r~Ag|L8aGE@8a&8{!BLA;MnwiaduBzF29^} zH%<8B1&?P{o;hDKx0HV8`oZoh#=7bGYMpB`$JnHn9-UmG`A@W97uV@IJ5sctUC}qd z?LkZ#CZFO149sa8r$rriU9@`J+{)9@7QHXlzcM*}F!B0@d!{Qlt~1@1mXSJf?e3&w zH&c^!ye+2d?RryMZ53S|Zn<}7C1-8_=4-XCXC`jk^BwcM1)nYPP-)58FWNk0TcvRqY8}F{r;Z*BD~d1>|f01 zThA};%yGJP=8w(U6*nq3&JF)s?)$v7uXx|IH{nh(C3E}dnNHuRDpA!ldDgadK?RpK zyncFa$4%u~7j@5-l)c<-ld|>f>)C9dKA)YcbKqiM__QB0eH2<4cy~O#ake^8y?VW( zdfevUBCl$Io1^c(L>Jt~?WqKYQ+{7JoYTFz3aS@HMl$ zESDb5yRG)n_t?(V^ysAdR-5*&+@tk!x1HhHX~uern-4HBm?b{Y$$7SO>(ty6cs!0G z#W=6Z`M#}9Y6s)?!~Dfp^0qDh7S|mrmK)_XH*e38ykmyG&wUNosV~{wvMnllxliHs z9asAzg}y$CF=NZ|UX~+m&i(8*n_bGk&5SJDw8)}&7M8(x8@~oXTG~- zTgP{vrR}a4KTn?!v#T!oX0_!N;kdp!J?lGGoHb$B*8P0Hupmu(@z2U-ZU=6!Fwfkw zI?~?t=k!{uo1d@jTDt4$(${+y$6fTY>M%&LQg@jXb@th_T{mxpEqiPF;@-96v${B^ z#*}_8`StL=x_0l)c^PpLzT>OfI;%d-o~$Hu>|>*yQTj7! zHXWajcNeTWoo6on=Wx-DoYnKqtEbjn_nC23=wV2#<-wINOe6VD$q29Pe7AD%ov$LR zkDce8A-VTx<=xG?F+U^4LU^99)jF{{YqLOu?FY%e^K;j}Snky^>F>_g2PcG-e{c94 zS0Ogv=Vy7O^<&SAg*m_HyI6{dOZhg8W zX#M=@^Yt40mu5Zqy32dLzOar1`|<|HY0CE{XQ(-2PX=hBLL9FKcz!#hwpFC+L(Z%x&8VzJM-3WPP=?lFg+@AYT$cqj(eHDf4?(c z-j%;>L&u&UdmI>8_qus&hcz+S@_e0lrgg*Xm#cSmUZ4AF$A5-}I`gV-&zWo0EkEs! zdVHW&^m6Uz@vm*#Y5^)8Q056N%Hne(b(>x?^e8$&CeCavzqikwlQvwV0_?f9!*YB(D>@B&w^33BaN7LsXi&w2I`Ez8pT4lAg z2aogVuq`v+ZF+y5`N;hR8+ZFJom)O*1;I`R$YwBRE}Pr(;-g!U5@+$scJJs2v*@5_ zwL&2|KDn!M!^7uIlACMPIdRka*jYti^|rpf5c=X~qw&_~%OWp>_8{bv#Un8&k z)NcRhOY`?VNRj<#Gyj73o~_R6KbLuiE(;N=$+*jT{*!&+k3_z29VKOV%sy|v>Z`GG z{mY++Bez_C`ZZC2fq{*vW*^v(3=B+HR+W5z&Ux)d;qz3_6MU=JJ+U(K>)qJ(a%1|u z@H)z|YQ-}AjR{Ft^cZoqKd#`y0Qy3d@O?YM<2WDjf$-7f5 zzZrJjzBOy{s`by>cc#}BM}FHUGVf@g=jFFE%S)#O?JH5tW zjchhe`=qj2C8zfl=aLuq9@LcQmNrILdOl!aRu%wz0!pYI60=&^w|wLCUrM&_7qa`b zYuj6RcO+Fh)}NcTBp}DCbIv~Z;KiD*E`0r+CJYSbk-=|Fn~sTXfNCd1u?79^U2d+o zXuY-}Up?wgWKXwEsAan(_ek$d39rrG zow>Q}g|)%yArUvPpHQiE-_w{nZ&GN@9{w(~YzFg8X@h(2)jHih|F%3)^hXIz#=Bpq zl({=UiEOc)QI&N}?vcLq7r%m^LEk!<%iYgr+ch4~xRSuq0ZXQYJix%fz`Lt~fq^M+ zE<=uKqmZ^%hM%4Tv4q3@=LYdSY^xI;E8v$4|tuAbDKZw zulBQ6)9rdfi~71YF>JWlzie;ikBG2_GY72$CGAi&7?YRBov%M32w!WO>xZ&ciu|@=K})+)UZuleG9hs$psH@`^DP`T{1LFMU%x0e6H z_x)6yB7J&t>(=``m*p-=u0QL1dzYcU+kSteT`P?H7#L!GEn9mFV20qPd2f|Vfh&8- z2Mm%Aq)X@NBuafcZm7PhC8yDNzHY`w*_d@@nyZ&Sw^DXBFZJ=-|KQ>L;1~O9zX;3M z9{9BO=WJQ(TWgm;QxlWgHo@f16;TF;P3y4C665v@ z0|SHf+m7#7uBPr)7V?i?^{2CNapK|6+fCIN;x9yrRbKdO^Q`dcM(ZfOM~P?4=WGu! zzPzNhbaCS5vvtw}pHyn@zpUYW`jquy;psb{j+?HxcAj_j;^zk5U2PFf=l1=0{w?dC z_ug$=?Sl0eJojH&)BMI>!4T>g;eVTtp0cvMGw1U1i6_6P{hexZJU0AvLf+?Tzc?37 z%e$bv}`-b*9T_Lh79?!qTCsy(&^Je`=9edhb@ z7g^`zcl`XOI^X<4v09*Nl+2@;rj760{z`w5uDzQR=Dh#8&#rU9Z&W-dS{Q|fRdvs+ z-v4vwG-wTYTH5%P;m&%$ZIc!+P&&Km%l&0Ohj{KzZP#7I;&j`^?#{F2cN}zftmd=n zZxAY<`aoAn5T($7h7&GID4Bt0BS@0BZOe;i^Q(3nH@vLs-n4#Ix5DS}nKO=^PE>YT zo5HE_}~ z&Xf}4$9Lzbmd%BFLfX1^Z{rz{y+>wF@lBa4w9@zARZr6od+RmAZj{)(WM1`XlU?)j znO~-#O)YY4)l<;%dUiHhCq*t}$A=YONBSm9fLurlKAk4iX}$WZ*j#-Rl_NJzUgod- zCA7_@hePbnlTR<723l>dw<@c+7Bw^R*&)3@W%7ETU&UNJ`Il{fr2Uh*+eMsqHGg?L z=Xv@?{ zh(7}ZgNi#TJ_D(hcUk(zYp02ABT*S2^Bffj_h8G34oVpfxdi{2thi5w?9ATju1|E0mH`LmXaikDhbxwC|Bw>$7}+ zxLzr-TJ=%O;`UBfe&;h~sn1pO56q8yQrVjx$Q^6gpdJy>*F6{HWYX}~+g>^bndVOK zEuD7d_;j!S7rxW#tiAp(POZ3=DG@hQl9_HFcDuWg*Ie`$*X@q5BmI(cmGj&7ala5< zenR=~_4yeO@=NDi9kOq~T*0jsbS&kCEAM&xFHDafpOct+{I|sR1v9^FezterZs(`> zd^?gD7@~e(lJH=k*DJg%E&K42D`8RIcfvgGpA-BRQj)g!*A~g->8(E6bqgMEkNtDx zW#zv9!oyi}A2KkAePv)^VEF;6L`m_V?kii{yK+Y^X4>bxyixcgPa&}6&SmpinR>#@ zZblcpy!vM0$=$nt`JT)-pMEQP)d#iIvp(LZ{oIb`Z(O2#s?Vrsi@o!+o6mk*tqN1m ze5pIvu6qBADeje@E9d-{3%`?L+j%8$YP4#p_l4LGo5aKwm$^P)edf!u4V)_3otu_D zOO5PIpTli>_;gm-uIMbT$2+b&?p%FUVEdDjjCAW=IYE!5YE#Q*1kCw2Z}Hblx0cVl zb%gJD>#Vur_ROI(e(jmo`F>jL`Dbs#CSLnI>8QB2*2PM>^(7`}4knwu1`T(R5Dcju z)mMUQ?MfG{+5D+w(TcYft4~{0em!%sRAygpSq+!sm)G+1zZqXNl3Bs)e7RJx(_m|g z%jWePHLa?&O*fuCA8T+~O=ap#_sNwHqcc3Bw;xpVTk}Hd$uG-U*W-jXWcvjvs&CM< z5Hok1-ujsR-tcM<{(}RxBeA8Ugy<+ov`{&_G z8@67TD!bnsdUD;WOOe7iub!UUHuu%VeOB+UZWo?6ah_fr<06-)y0g-E3l5iUHs5$s zuFCMqt{XX5WAZ*ceW$y1iRF$b*Ju8UmCQM+z2RH2^~Z}l_mmx8 z8`enVpX{)U$ljbMP%4>wTj6v1tY=Fcd)Xd|Xj`@O-c`5WSRJ!!;kmDpua5ovCFOmi zZ~CX5ua5nW`W5Nz%$K7+Cp8UP!h`)o1i^MTxxVnsskvq)HsXGF*6CaFxL%lWY^J#M z?M9{9EECgXE3SsTOS?L6)!xVJ?j&b=OUEUvzS1;4yYhR)Z>!(yZMob2R;tb2U8KEn zv!L_GSp1O1AaczrN*S9-b-}rsY_CRaB~ z`h3{jqvZP5H9i-mRa&>pNZdJn^!lP>rtXu)QrZlsrS<+4*|>JqdyCTYuV)<3vmUEp z;52NjV7QSTkvUCc1Ah$>zC%(XcGWiIdh`+hr?TmH?%zCHb6W3NY0dr(=i7^4|Ma-I z@v`s4Vq1ChHUS@9abB+W`5tyRde+7LCst~omA3qoViw9XXRe~brrkW_Vu2AZd5+?{n@RbfDa~0{V&R*2A*ONqjugMn z^@k3b&7Ji7+0uDG_~T~$e!!R*uN3h!X>-nsr7yA{yqxxG-{q|9F%egHdF*)jK77sH zcweipF``S2rE*vP-LrdD_o>Qz>(0-cU0EswyceGfm*4r|xZ)mvTvFCy&dzBSDVJxz z47XuNhoPia5`AnXtND z&*$D1$zOPU)z0UO?zp6xK6P38zV@)o*Q|+CUFLm?&DULLn-i~QzPw)jqUzMzDVh7i zF0sr$E_u&w*8I%FW!&3ie08G_Uk^=r`D@XUS1&%jnK;GXcjk-x{54-|zspPypWV4W zeX)Mg$%5xr89pC&>#WM3ck6SX>D9}RFPR=ozLc5PSRHmI?Trqoy+WivFqEAZn9p2v zrazG_+ADS=@28Sier>1b39onDKkHX?;kS>mQ(n%?+PQ4!rJR1xONA?AuNB@^eVV*D zHs_9oojzaJuI*RvYwf!nvd#;N=znrwIKoqcA1eqJl9H~*#b-L>|*md=j6 z&#G4!<*`YZ=4zRLzFOX2$~Nh0Wov8glbdVi8qb<&l`gz&O5y2MWh%!Hg}QPO>u3yh zIoFJiD+^yvzhYONZuQ;n>Mj4EeTOz$L|oR^@4L3TWYgsZ&)42v{p4@v+j*%`q*jKD%(AdsMf! z_u9$nJ5D~|T=(;tn_c=^iydNH!%t0?Opgx?Of;9WPj(6IZmZy%ce-t|RYdUD-_tuI z!{h2muIHg1W1Lvap8Dpc=koN3{r266S{J@~%E*r8>yXK|V{+06zPFHm|fQKZY?j@S~e&iDa!`(iMw!bXru0Q|# z^|^iYI&1FYp9|)P7W(+K_be;B8S*xJ)9GpZ<}UgaYn%JrSIf?P zdb<6Tm+6ZZ&w69I+@k3-v*iTt_cL>R6&P4%99}c~u-9DOm%C+s3zI$)?FEEF#%Xr* zj1MrJS6m_cpMmlIxw)K=udcHbkl1naWRBnDDK9cFFS;!hy{u~6gN+YkD&|{#-f`;V zqhHahcJ45pe&ObV!}}NRd_GNdP31I8$M@~ayZa(?HnE(jesb~MOwYx^+NSvzRQFCd zjn%H1wer=EGmF;rqd|cO9OEaWlTlxEJ4U{Zjir{#>`zsb*P|#9fzV&A09bYm{iurAP!}(*vDl4ANTP$t%Y?vveS?!7tMnsJ)aXBTe0IbW{FUr75R{Il-^Rwpf;8Jf-(X)3(((t4%&G~B%z4^Iz_v7Rf-|x(fu=wS0t~M_$|DsmuS#6zS@c3{# zDPt^9mqRGo!`>WrY$?cz8?O7fg7M1nodGLbM7w2a6&uzIo@5H9vm3vPIJx|H4 zNH6~SraLXD^o@VQ=}TM9zQ~GMxv#&!=2_J{r*Qf3!1yya?p*(3b39*PknP&){^bYf zzWp3`KH=nC_Wp%BrI+A1aeSSt|YG2l+Woest?bb=# zBh#yfr^{_Q0jL9IG?=!H@P2GB~XG`9-vaskYUK`eJQ-}(Wh&l30{QT~|dl^%Ie|s%v zwDs}z_St)Gr_U6(`5OCIfBx;${rbCH_v+sF3;FaY;p6i&O+mgJ1S^3!6 zYp!0M3=68$!#2OL3pnxRN3QlWkDWhXm(5qdz{ zyOojQdWaVGZC}M_9W`0;^K`1`ZjUXi&&*d2Tl+ZoFYB_OKAZdZZ=W0zY5cnKy`Nq6 z^VV3|=i<-4JAL?ET~;#Z=(V5M?p^r0>$phu>HVOTy=~QP*cuc&IjIpx~V^5>nE__5W-{(=R+`h^dLUw)^D zn>~~5Evyj&xq0KdQ^$-GoqQ6wHmtv$`ftsHFOOqeX587$)SxnPw&?=hX}@y5_7}X^ z`SeJ-gL$Uv5?ihhUJT>`_I=U@=UG1JMKlQQ;;Ucy`uW$sSc_BppFaKaG}&r$-Ny7c zoV%V!ety58U|#&fB?X{SA_fKqv+SE`e<$RBomab=C;PwxzYQy02Iz0U5TRWVsKggYJwtFTgZF-7}K`2M_ z?e}wYl0mTmQAIK7)zz>bJYE3lEKzJ8%mAJbcP1_HAa&~F>o+4GBC0- z{eAr_{pD{h(<@q%EBLLZw@o;<_YX1aF!zp} zUkN+{DQ@pRND9ur^=qa^$NN91f3^0*KM(!fiR%oX z_0RuZqP^~LkjXLaXptpN&e{^|j(*cSyfJNKOcs|V)46FzraCtscFvZyI$9o)7q!Yv zKaTV1%Hk6v| zR&$;;>G@LI%eKxhF2n@6)6WCoi95UgvY}{(bgD|Hzicvg^0+PuWowBM`LF z?V{Uci*z+-L)M^$G0E#bT$^$E-ygrpcAK9rzQVTXR?XUV>(UMqoCt zTPxKbr^%sb?u1O6ZMyc%Li|qj-2mV*O+2Sw&)&7h z(o1`NrdCOD&PuOW{DD^uZrZ%Lw}tQV&rdvjOST@eul>@}b1q(Kw%@%GuL+K z1uT8=z_&y+^@!8!r8)H>d`iwc{5SN>nOn9d&AI20!+w!7nNMd-{LipR^_22TUQuFr$68I#zAT6rPV^Z+un!0rCcaEkx5YB#(OtMDi+v=dFxlJ33#`GT>=hM9^j5G&_-NVP{h|ABm2Y zl645Mb$Z^Z_bA9%PV2gV*Z!M5Sz*q}&c085)4qRM>R={dFy-33ng1Ewd+)C7bag*ZrFYRaH#Q2cId)_2 zXTz7fW7W_8s{0rmoTEEibyKjR&&?>EkFM+PFK4XC5mq=Q>ULT0ib%xn%0v5&&TiUz zqUA@CR_ux$!byKO262_n|B(>w(Op=-VCSt2OZL!hp|R)YPM781eAA@2bLADuM^+P> z-xTW+ zCChrw2P{8u=yJ@&V-^by_c5(?-V$X5`UdI*~e0O3uv< z(eb?{7?ZpH@D84x`Wmy-D_e5EZD8Nxw$tvCZ?p5fN7XJKOPhAYcE>3gF`TJ?buwGF z^Nh`x+wPxtEw&BLyjq}VwTNTVy_rtW+fIk=@mQ;{@T}py=FhCg^I8R#9usuv-Q>9^ z+hFqL7rh;?M47gH@94F!DLH2IvD?S%N!g@B{*4ye42J|YL>DZdSeToxH(fh>(M(?l z7gf`hZ)Te+G$m_aX=9!p=Qgz=#&*uShDkk>W}c9o@twI+Hzz^V~{i(P@8Y*7EV)`c?Pk%Po%1 zO5?W36WNxxB^8XP?OmNb|M<;$ zcfNGQ$Wija7ILnT$cHEj#IL~ z?bbWTlV2KaKi;qLGg@4>WX++s@=M(<*XiDwcI$!COr^JmYkV@|h5s`M$7?W38gOv9 zdDXqu`X{wNbAG|RorYhl|1Gsnj?iiSc(nhF+n%4VcOBxMpqwDNR5F)QyFXh(sN%)1 zcdMSbXLQc{VAcQbMBHkVk58s}Bt%TzJN5NfhHKgWew76R$DaE&Oi*)ko4fpy;^}#} zw^)2R&KPy-WEIzu;sw1M?3}(m6cPWkZtCW?uVq`SCY^q>=9|IuBi0&PO4&E1nOi@0 z_2=|0eUkp*k=lm+JgcNsg*FGikI(#Z`*p-Ny)4%4(d!y5gkS zs>npYHu)20de$$W(%ZhfqoZza$F1|4e3$++OmJ2w*$kPf_-Wx z6Ta~4pJCs+`GehodFtItA?kT4UMCML-FW)lZ7N^dwkM}_HMk~R&TI8_IJ{7BnzonC z=9l)nre_H)v*^s?W)D@=_MBsuXuMdOnYnbC=&kh0%Col#O1xy+wz8d>i*c&nlx3O_ zYiG*s$n8jG4nFj?@r&H82Z`=i56PYqZ4yp+l>LNfnos6z0j*@t$?D3}X8CAp&WT;w z(R_!~-)Pn%&*v|HZ{aMM6Cb=`!^gLs{}#PHxlvnn$M+(6b)|>F#%(WWu6Vz4f6LCT z8F{z38WK)vPm%GASd(FOUAc9#P1&-mZ9k^T<#(R6lw_XEvqflf&z(rSxetpCzp1I& z-@0vh%Y1^K+S=LEe&$@i6fd}=iADOG)8%U_ms8$r%-Eigv?_)1p_*~g8IN0APOjP< z)j2^zl~vH#P@etvlXWhy18jBbilmQ($?~3@t2nLJ@8FE@(I=C{PSr_mE@8$@7=az4JTE=a9r%+qQASuN9Bnb6n297r(8(TB&5>TvZ*@>0e$4OZg-% z6<9ZEt#Hk9-{bsu5+?o0#m|C8JB<(T47ix}u=$wD@s*C|qLDqE z9rusFIhOm5ab51rSx>(z?D3Hh?(J5UueB~Y5g7TZPasS)<(a^V>FF^MNPw_4?nbfcFuS!xK1SZ_W_neOFgpLOg37*Z4`Vf zyv`$=$*QbaT%docSWl9Xwe_c>mF}XOI@7`xdA2YwUsjbl(aJ~Q&EFeL)`3yJwR(r*Jd(r=eDE0ZAGC-~my}ON+)Q zFLypXeYjjeS)c91u_c#cw;VIM+bT2juUp7^hID^_zyA!&6BSzzW=^y;7Kpc8R+Ex@ z`O9wxp_EBnEX$dX)$th_)!EEBxby15rOUZ)HJW}a+psBFa+2f0Ctv6NPS1aLqEm-e z+W2tC^G=Rt;gaIbvG;m)7e?Q@A?U;L_P|%=Z|D4vMuJj!~D$&}PX7co`TRmGixFhYzflu>}+*Fw1wYKf;%pDciq&F;6D_(v}@wm>E z8*!`NhiTJ3jxzw#9D)T?JS01mwsQtt+#?3ZpdfmIGiKouRHzqpDT#w65Xw+G-;6!1c zS*rcq^zx2-F_%@gojK#aWr}grPL3vpiD`>}m2J*)JaVzrYw8}GsVb+pADP;e-}JRqnj?<FO!>*BU7U9`Bi88Pg6hDva-+RE3M3Sye|()*z|z!WdGZb%7P3;d+ zoyim(RcYJUONwt_E=lQ#ozwr*O=P#>h`anR&M zO4_cUv6pZDeI3Nd)-PSH-`&9;GkM}s|22I(oR_gbGMYG9R*743R)*md24$_1W2=sA zcl2mjcIYnKjib{Z&b(|}(wp!&CUWLabDrL1%tjuOVea|a^;7RU@0}LPD7ilOUhkhZ zcLMBpUS|4mBc}J|5$1<(3?&^~e_lP9-oEVL#nfu;dEc^|?Y^?_GJkjWR=P#;6TiJ{ zW+=JL@{QkByLq;|azMt!k8fm^O1py>96feq;o?jKJGnz=wwo;TNt0reUU-yC{D%7U zNqbiWeOgg8X?sCk=O01gb^Pm$%O{n;JH6_eQ&oUlDZ7o)>?>a)AAgiwGf$^{WAEzY zNq3h_FJ0!NlxFhCxv-e?Y<{KApojdvRoUeWx?RO=|`o-^^wr1Ah zY6I?mc`Y5;$v3l~DD|pq{?j#`vFgOp7B`Q5vUV!Pvn-O1M8C4gxbt#GPpRt8MRSc) zGB+t*^nC2l(B^YUSkg*Bm*waO^HLM9psVjSesXpmvRHN8LSVI-*J+yr2ElH#9vS>+ zVA`+GSJLsNF=ukkwwy>K&v?g(k2;ojZ-pDS2Zza)U7w_DyzJCY?o4y0Rm;U9PF(nQ z&V9+mya~1od3tx)ch$~_w>^?_YOdlcv)8^&OCwhIyk44A$ulMEsqUdeQl4^)Zp^y2 z$9<9)yXjZqNpltYyNrEV9=f(#-+Z}vd3Ci&rpcElI|X^)Mz1_2kg8U_jQzV+P`<^A zB~zcRn7U_)LuY{RlOr9{{2n%)m-osaea+Th)ZuI@zB-sm^A+cP|3E+g@QucPCn7x? z%vj2fC&m;%yuiG{JHegjjqko+6&fn1!KAC&!0jDR&JH1U;y-tZvo!>1kv%cOhY4+{FnSU=| zyvLm%I3x0O_rxqs%@wRVA&o~eZ-2dfE6d^fk5l_*?kZZfwC%(V#Slr$YxRd-PRm-5 zBOu#i^V&4**)OHR?fM3uY2mlz@}*ub+7q@?^xPRx_Bo> z$>9pq)R-%ZW(VAr)Qa}__=RPvRVFOW7IiD_|FC=E^T@4hTNj))vNb-WA-g^9QsJ@r zJ{uCL^KIwFHqBdC{P0)7e}>F-f37P&+rKW_X6U;~g!6pv^#scX z`)%8P+h2%zo5bkG|6z5W%A~_V}FwQ6T&wYoh@Gd@*P5r zy#+q6yRv;|n93H`m#tErG7QTn%y^p={EGjNwycX^Ws-X2>8*zjNiFjHR(vJ%UDw$S zp}(9CDNC zS#JV%mz%nN7Paz=ZM%ARn!wg8#`ksqGe}!CW_y0O@y(mmQ8NF^YGzfu=ce%0icix8OsXKhc6DKuoNILW7 z^69Wk4E8G~ojBz)RjSdu zLGJV6>!Q|8OiI<6FY{JxlUn5Yok2}BuD^+i`HAA)X6d90dA@@4;?CS`R$g*&2E!Zv znR88M$bJyesrmIJ@s{YUnX2Ne4S($73X$mBDR**=-GeZ6cdldsty@@-p`Ryv1y z>a3NTZ`879KU0aH{dJDz1%|RVo$b$`9)CH}wnyRNm$0vU*&}xbFW+=7Y}FF|HysDk zuRhhhkbYg^o8Ny1|BH4TA~i3wPBt?+EE^ZiEbVaaQbX9DO)Rku=4%#b$~|qcNK>;E z**Nu3^3nT}lBY$dT;7<%R#!CR!_~z}T#K(PF>Gcw)j2#hdv;s1?X)Cbuf`s$Q#M`) z)RZH1XV3P`m|b@2_U`ci3}1hgNo1buem$u$vaD*!M4vO~6E&I4W=q^YUln|*b?ck1 zYoWhpUtqi%&YXDX?cYl|#u{55_65%QcW3kA*DagnZa>e~HC=Ud&dO=}(o?sTovAKz z_vkfJODcaiKh$|wb58iF-8G?0-@Ee7KiL+&e23Vj&TIU4Dqk-$vbWy1@6Bc1Q0}ai zm&yd5WUdp;?U~du@3u)dyFyn_;xXwmlUb@lu526bsvdcBQ(L9q^)~v4Y=4oc&)xF=JZGDZ2VT!$Nt49#NClUoD{Tid(PXO{^@zF@}^q>hn&5|4%I@hn=5L^@Sd48kj zor*ad?k4R@Wm4bIVeW8^aq{)t(6_w?$zf0YcIXLLOxxiqID1;z2JLSOTJ5r zIIQb(+984Bjtj0{Ygv)Rv8y$ZVRfwUkxzxHjY=C8qa{~geQDvx zqV#n0w)06h2JMyxKU4}XE6h76HUIVPn9#Xw>wO~U&FlYp z^3S=)>v(c|^d04!zR3M&SW#|w7KzrAbsw&cisoyeyX zCe1i%&gI6F@|=O^QrE-yEgr8n-)DKzsefR`#Yn@2e~$Stu~{anbICh$s@w{R3ngDG zea@`A(O@UC^hV@?6I+i+M_Ikz?I6_L7S14S9K6=!M4rGV^GlZ*M0@-;WC@?_Rg2RK zo$a3TpW)ieYf7tiw#g=cmzZ{Grss3Ulw*^>Z+$BuJjd8#M#sjo{mc_%%{0$=ocDWq z=kiC1hu?k%zB)NqiMvGR^(|$OH!r_y?7iEgaD-v&)W4pxj;flOIoWQDjwLA>uAVea z=d{RzH?J=7Ce1M8G8a705p1byvBWs&L5#=3z(xNVL^eD~-f+veA$H0p!<;AW+1pI+ zL><$po9CH1`*cCoF|$c`Zhfuaq4iDK#&NmQt=Y_qTVBt6vQEX#vf)KfV#%fEj&uRH zi}TwjEXj$`X8*Uh`e@w#cNuey=cU`tbXl>;W>vufvn>TbIZ|p)=}UCI*E+X}F(o)j zV%}w`!*0&ZAHH>57k}1!Q z!E0GkBiMD6G3L~zF3Heh)5~vW%srO8!mnwAVvoi&BRidUA5O)(JZ-T3t>pygMqRGu440!dcP(AGW!*9B zChar)lG#Th3J);~8&B-jox#c~`RiNy1NX> z?!J99Rd{BSqtLR*DZEqU3a=VwiGx^*_M+D^Tzco2s(agDE}Bb6=$U z7Cef&mCCs`E%I{1$-5?PDrt6i&TUqGlzl;x)wT3f&xr@q-pt`YY`jb`@8tFRqA!zV zcNi}dU-fF`_CXHDQV0sv+>yOS*g=L?Jsnxc)#qm(Zy~-G5s6C;@y9a zZ;ObOS2Z?jS@QbqEU(4!t5i)VUYYV*y_V^;?sBf{oh!ByA!O|eCOj|^s6N@F=>+8{`*SP zB>rwNioCu_jEVi~RKbZKPsvPcl34G0M4_kFUD>Bq(B;?+WmTK>^~}Zxkz&Yiesmgwc1Ym4u0Ha+pRfhRF1;zqB!li2zR!UD>N8TFsUN%MT-pCxrr z!G6wNX7;2g&!1-fI_F+~s#{mC^Q7lU+OCJ84_@9q;gQTz z`EAiZLX1~ri*anP^u5# z-GtBg&UdK2maAaW=$JX{am=Bw7LJeQuJz|$Uh;Zf=G$kfQ+%qe0#8Jmbv`}4N%S|r z|7Hp45Pnq+%^8t0$t?Pd!1b*o)x=2%Nl7P2rCGpf$f=~Bowp17-Q%glMV ze4fAhn)CTE7pv%HPSZ)7_MY@J_`Z4ja=GmF8J(I2s`L3a>Uc4kO?tCQ;wERzwO0So z;vEIQ4lwK9obBt~%hr9$WKLcW|D3>=wliMNyl*V{(|_%wRV7IR<cKE8^p@b| zzf+59jbk+DG|%Bb_x6~j)VKK&{3$(I5%ET>k2tk0OT!LMNRi|d@oQy1`gCKw&t2=V z<}_QQ1F6OFGngU{1_!Yxbli=TnB&FyV~KE%{nDH@r)o-eyPTM|A$K9O>3iGW4d2VQ zXYeq(tK3`k?ee_&e-~V^Q@Y)msd7EleS(FG>~*VV)5gDH*0buT#}#*0pJAQwZ^Gu2 zQ5w9hvu59#?_(_>tF+>H;LFD`H4DpTiKacy^?z?$GkbByls?ail`ba=th$d07f(@B zN?5&SW64EkZiddU67mi|&L4g=NUj0I|&Ba!=Jd>!j z%KYo?-)=f5NG_0q0g64TNqnQx=Me7c{>(YeJRI;QRDKdihabIIz@ z=?}s;{MM6Xzp{*J-egOs>D|dy9?e0)w!5}&{qVil?!<;>wY2mtJm*}C=S;kmRC0d) zU8~9?YvopXV=y&1I307 zt!#!WZlx_Mk_>lC8+eb}H;Kf=E~}Q?wawJ&dC`XME8a2N_PU?E{FYy0efZN!^Kw;^ zmq)JR&bhj=eAN=MKOJ{<;^k9!Ih-q(6P$R?nJes7!>y?v7P}5REc>eUdaa?MrP~!f zUWXT|5^jtFNxJ6*R~3{s)@huy-TP}+Q}lm^<6PaV3Wck7M+&DN2~IqE=lUjtY0k1o zQkJy2)qMECXfF8gamO_u4({`+#&W4A9FLxila4rd<#6!^dmZLH|0V8wmVeB)+;3-; z9@8JAeAjY)25*6qQ;3yY-pqLy4jNuBncK*@KEa#)W6zu|Z}t6-MaZ+ZzY?9lndPvW z=|uTxog3?Qt5-MXUUfM0%CBU{2h)3}WL6}2-Mp2Qd@}Q7Mw#ouDZ36#J-j?YY)-Q8 z-pSjzBwwF9%Vv7C(WvZPSlM9{&6z@9TukJ+|46=%AC@n7g{tPQ^FsiYh_H&CAwIn1AQt6&{!MoKGSdt<7v4kImTVnBKl}o}{Fxd;OQY zH*Ga<+FG4S3D{`7NW5jav4Uzv&^E^(Iih*zU!Fa@;=zG6#aaRDxJ-`Lq#WBQtWf8> zuk~%rInI}}-km=@@uR%q$GiOjk8?A$>=SibyLEfG_iZ?o@k8O_*6`!ol)P-kTR%#~ zdp?eAXHnVI?c1TGJb(M;H}6*6{hqUtZNZGor|ljb)NP%Tl60-q&?_^bvc)jEAbZM^ z^h}4>jUTMqbeC+pC}t#bbYpnQ*_Ab3b66jpEfSkld9~xj2A*kkx^3@NdE%zH3T2qT zJHGtg!@xNyCXa2LH^tpNP`I}1mA8i7qK>BhLd6Br-Mrq?@8tg-w(|M)XkSsfkHPno znfGjy^!5i**wwotbnMiwIk>Q#7h0&I~ z%+J}>?pB%7ZF%L76K}M~T@_y=lrGB3eMrzEfoXEnCB}7spRW6pYWU=a#ceV1^y!D5 zoL|jZ$d$d7b7seBUfqKQW&4inF}`hO`?e}%)zgA=d42n{dJ{GrHxA$0a;@^(+pZU{ z)@A1gC5N3bdby>HQ8$U_mD{vsM~sYublO8E%Ao*R#`9SB?# zUD~(eRZH-izrATS6Rjq`z5d~OJciIW|&wYGQGTW-*E zS>O>)@9hv!Q9Kz~iH95Lb!4d7c=Q@A?XRvVIzK7>bRU^CKCQ;tBIWOO2 zYt4BT>yom0>M7N)?F<*Un;mFMon8B6gN~J=MaW$VZ-tYZlG4Y5wyjzCc!$1z8q{|rG}W^7Hh znddZ9=?VzwzNtW)#NIN7TrBV-&WbD~4y?Cl#4 zm(yiFMqNKtarE)x{|vo9L^*{OM0WMA(K*b?bV5_^>sqgrd?mNj&koo9n9@JZu=><) zH-^{oNh~odV!MwN-(I|Jo!DMNbqW7XRrEqsp}`A!sC3KPR^YFWudOlhjWKwdU|b( z53k}44d3UcSSa_OLDBDz!0nrxU#`p5JkZpm*(+%%v}sc7H8n35*A%CXv#Mq=Y_pvd zZMWvh?$>Wc%hz9F>`&{dUa#}3F5J%SiOV_bW!?^LE-RL*Z9BqUy=kMa{Hrg=i-TV? zF{khJd*m8i$5bPoJzt^l+}^#0?c0^FtJ^p|);l?=#@keShMGFt1RJdi&xC|&H>FvZ zbQqss|K7Dn^3-ZRalVO$!lx|x4X4CtW=p$#ijFek7Qb?D#p2>)y6wx{&&~Q?@~A!N zP>P%2`!|9M3~JTyt5^nYJJBg5xvg>XeuG>6(v|`iyH2%Fcqh@T>|-I>m+SBIS~O|x zSCdJ{jH1q6nR{YY+QxNa0f$~s-I4Edrm}Rd{nfRZQ=^t{`nusi!#O3k=WZ(Jgw81S z=&X!r=$ilY@!c?obd!@Emopx2Vpe)%(X~OO_?nyfkvqQYX2z}c@z&PO-Xm0K5ZJPG zT9m)A-J5g!cW?dj+fXPtXnWIILDl)|_D#O|{HtK^T=p$B@4jUEo&0(9Sof3Laom+J zC1xt!6|J97_sq&!_dN&RF1XH)3p7uQ0Zm#2$Bj?-&4x4>ARyR$@>B(!u1ydSj zcz9B$dgXj)o3+HMF}**`*6D{vhYs@%-}RXvHD>7Ff3@!VS-Y7JPwsVE^>J@Pl4ex$ z%wLHGKLRJCfK%GnyP3%b@^=dG_U60>=kR=Ha%V` zo!iYL>G@A>emsYjSK-2`RiD0><}K;goN=i-WXG-C+^$&n<;j6s{NE;Ba$Z%sYQ5N3 zuIRX%)sIZ4e7W^1N@D7Rn=|`DH9d;@O*`KjFY{mHq`<|+y*)@oXjxZLw#3$#C7Xp7 zrljrjbH03HLh`kvLfzl@*3C~k$M3sNho$7{!LMAMr?>arEPHwS)}{?pxn#DlQYueM zzP)UR=Nye0t?Ol^+iZA#zc70po+I?f+ zZ(_#>waFA`=6np?A@D{9a-1r+5|BxeJa`*mgdpo61u8DQ&szzh4HWM zg7=b6>)3ks9TKkSE{;30!6sMN@bhZB2iFS^sy6OhHxcmt}mG*&*g}#f7G4Z(cf_aBgDjkLiY+RVSY*+~MkC_?d0*jv3#V7M{6y zgVnC1Q|;x;C%310r$#MgPx}5-QhZt9e+CsDiN`u;p4e>KC2_-7d8)jB!9kxR`j5A~ zxj9`@Ym@jnqm{+C)C)Gpoe3}r;an{q8T02gpPOCJ%Gy1-y&N6OzlZI8kh0WP?ewOq z)To8#ul4O$o49V1dG|VUOZ&2>MSHXO+aj0y>)g$q6U2LYhp3(EInj3y>vm<%I^uEW zwf5KRK6iV5BrnepyBS!URB$X?xWQU>o%!U>=pUVvbvI`pek98ud+4T@x{qt+rnvgc z|4bw2^ZOn>IW1fFfUM0EwW%G4Bqh)LybAnk;L#MBacj$-$y^CrN)AVCkP=!}`F+~` zyBnoWgjVy$3LSiMVQsWzY1YhFVH=!-!?xn7;cCO5f^7$R8g*G}v-z&yxSX~#F3o>u&%3H= z*&QrezZG_s&pFVryXIS!+MfRmhhJVi>9@8}?()?C3~X7veWEW;t&({iz%XAyQfFd~ zpSjD^&CQ$dL~gOK_%dr%Y_@IOE~DeYoBqt4^f`1>Xw+#ltM0jBTP1Usnb|aFg+1Dv zuqn-}dgY{Li%#Wmb0@s!J#L!W9{qIV<$L*C3Oh23w&o-h8WeI*J-NkM<#uUoS2)iI{w2;w<(R2Hib51rtrA=WOJ?1 z@C|5Px_{~ws|mr~d)@NfYnLw5k*aW3w%=Pmh5zQN_k7=Ew$4v8IUxJY@yN{_-iB96 ze^M8$RrKf;*ZQz|`I4(Kn>PHdJN{#-^voo?uBqyilnRtNjvZTEP<}b7*Uf7JkGucY zbn{tG8_y4gqZpWG^9@$A6zQ?&4z9(iS87}yf?47l1 zb4q^9X0bK5`zAm96#V7Y?TBTk9hbFFt<0IYNuhg7xX{|)f6{ZlUB7%X#Qeqw0hODI zGR*>^EW*0ky%X9DT~B@#xXU4RQ&Xd-;=TGBE$YD#WWpW+eqcP zX_oqxy=j{>Cf#H;d@49uEi`M|0^w;Zo$U9imCm;~_GoErhTn~I3)Q}FbXmDXTf6ko z-m2Uj9mTSBkM3lsM|N=Pg!pV+{e*#c;f-%^o1zy?+*M(AY@=k2#rx;y{FhvJO$(Yk zPwMNVU3sbetmVtkTI+E{*S&k6{_D&2vxQftxx9*5u<6Qcvn6^~9glNl+uD1a4j
WMXFPo|`L zuUpIiDnF*T+1hCC&Ag`RK`Se|YK@DFK0gtk5^SKfUS!5ouEurezHvLO+RL=2*B63!ldZEQ!vLd(cExZ`9@wRnN_?lfe7|M7!l2p=^-#Ga6XVuz%UpU$OSNgBN zl1A?qI0)uUYIQjpFP?ecQ821dd3j{Ub)ThaJ5nmRe&pTwwe+;buZ2_J_*SNVo9De` z^0Th1Dt-#yXQM8Ksi#ddS?%%fuISAEdy{7VE)+I4RMya4Q|t9L`MAff^MTLP&#YeJ z^E^1qhDW65OTyf{o*l((%(?odrGJHA_I?c6WbJX}ZVKGq=W@%gWbuTEvwttH81{~!4)`V`i*&|nKeQLPmTT!F(1XdN1xb(jY z7CtFl3mR{24s`YY8r>o0uDlEEm=%vxo^PYu9 zhr+rF`#GNcPS}}N5%!R$=jV6z_U}oDBAi}*4ZB?skfSEHcUA1a>kV62UQVhmdip%F zSKaTA!>&%rCfjLK6Kldm+;|pV5xsKFL&Vv+c$w)mj~>9Cpz!YE7?GutwE17B^K{?C}~JH*ff~iEYk&@v2Y%sNkA@ z7Y(`TAupcxpMAAFc5}e|)7dNY!{z+X{|b~k?<2Zy>cf&<`FcCHK2B^-3Kv~D+b<)0 z&c9i`ZoL&JzqNmPGKuZe_B$Jobh$r#B@&UdY{gs7o3iPjpDe4dJCdytTX_8LBzfBk zwlhauet!4s+V-h{q7=Te%z=(|U{d)}r_%mbtE9ccrG4?Ek8H;8S~m%ABv>!Sh7UCSIDk!D4b-j!^K{ zlh?PN?q0UqHtpydA14LPq76w(25%QeKHAxJSherXVg}_b4{N>q5~fWj|Gwr^jGr9; zWv;{IOKX0#PV=dnwBU4~lI(hc9tS(SNlIm>ISihemG6%%d$!$U#nw{3c|T{BXqPhfNpr~N3DT`r?jQ&pm#nJ0UyDBot~uT}NlZFgSHwc8t2VihWR zdRorq$@9{MOMA19%t>Y~h;{Um4Bb6r#d*0f9^6KpE9o8q%$epn`Ubn?Q@-+YUQa_{L;^3z5fG_ zp9ZR;&PfZ!Ci5?QSJbUlx7YYPSBJ4QehozF7Xdsko-`VEN@_rAI%X zf6!7Bw`W{-u=$Chu-KRDS6><2_M9hO8(>v8|MJ?)D^6}oDl_V3-j&n!h3&+ftOIkd zOuTmfFN^YFm%Q08N=whYQ%;l#SKf7c%DK6d)TK1O)m{bg09c! zSd7_y+;+t6*^pA2%`?Nna(32*L%UwHbTJ8E5#wzM30b@{a=Y)_wy!+frmkM{Y)Pu1 zs@Y1jCEPOvXfdvjis08v40I% z=wMYPEX+OO>bH9BBU4i2D<7XKtya=n%VV}qr;X!n8{da75{9}EshK;E@M+%fPSl)#Jzg^Ha_$zN>3SQU^Riw~otE=--M6rE zzu^3@+$W<~U#xKWTK2hAC#dtxj9c+#duxkoH#U7^cxSqC&l=kaKD`ThUZw9(G~KHG zfl-8GhU3QTvQC>P7M@wMTO%lAZQ;YRC%0OAvez~Uy?k-=yi}^Af33;<5l;-sc;&@lsFZt9UF|qvuv_5B`>ennJ&~US6kTcI3~4@MKm~m4{y!83dh7 z43OvbnxdGsba}SVfeAhT?(xLTJY1^hZR;rT_Lk`&Zsqrm2J^At<`wyyoJ+F;!U%l=(b@w;%ON>oB%lhnAd$9h^oM&}D zGV{Eff!3j1KH@tDfGt{@n+VpnM)?=m7dSOo8yxJ*I zEC0IY^D}m;e)%_1JiFwViraVdWsz&c1+Toh?lM#0`-?B4sj-fVaksoPe=PHky>fm9 zd*B}D%83g_cpR*g{C10Qg=~JiP-5%bHwVA+A2VicjA=AZ_~ROJb=E_fm-{MWuC22d zL{v0)jD}~RUXIMIjC^tXo^vTPUQXhhw`@iF zBjvErFDGYoblw&IC@;k1d@Z{na-+_4o;*8?man@q)~!0%^(HG~&O%=qvjgIJSD98_ zvHT)*O?Y6(n_UjM zv2SiotWWp^m6J1O{Qjp<@FcCiZl{dX3Zd-C%i)&}W`4MpcJo$PQf7UquT;+~arvxy z$Ai6gJeTRLESM4#u4iWZT)`_uXyLU)iIr;0!ncKQ2!9cHKW1x4>|Fm9uHTqW1YfpV z5fvW2Mt8OCs;_Qg%a^3qb@=x4X|0_rIbmV#mTNwxtGQBF=k9p6W!@FFxLbd#s?*0N`xPMw*Sc&%~j+Y4GZA3j;NZFk@lKk;hU*H@S6?t3bB zafXt_*3-wcHim9gUZSez>CEb?Ee8cRUwP2B`rctS$DZ@6RT6A00#*h@lvRpeUOji! zccoLu_WZQm6Y_Opg#5Hk7f$?}FWm0cWS zXiDO9SS2X4s^_y_)?InW9%0W*(DY{DSex zsfpfY9jkX`)m7!F&yPNMQ-x3SFf4tf34Gq2(G*yG1<}9D0|P*ds_L| zL*~3QP(H2|lDec)WO8A>|E$mLANHMGeS$SMcv|RTP1~z)8m-0GXm3Aexu;cdR@$Af zJq6B}lRFD`3Z__?*&PU%+!J(h=c1!6ydRB@otWj99(n$ivDVv#d==hesdH^ob0*9; zF*$DIz1+O#;oC`ne>*Sx)Z49mxoGR&?^d%L*Dxixcb3fz?^0ftVRAcDfHP&~mAj7u zXC2!Xxj<{nnc_UXh^ZSoCT#g@Df{I=L$IBx`?1V-^^4j{dlZG+0z8>!znXdRKf_gR z@A&++Q&K6Ojo8V@%3?OdO3Uh`6L_Tuu|jh5Py$3s`# z$c-r3yzDj0+)W1>=0yEWT~e{maz4{N?~>U8d#ufL%(rNZ$hgg2v$W=^bV|15^?%IF zVSgVlx0+YXtS!4+(jZuHSN)>@4EZO7G*VZcN}loPRIJOYb!*lM3kW1f=PuiwvT4F& zL5@R7Gba=tQ&w8)xN))2wernBwSIi^e`dTy<&2Aik-hjUt8b!0cbTQWy7~9SK8iUy z`_h!#Yi8-_KI1m?`sF(gJj*sa3biT&1 z&9FNg<-<5C_BWcO9gUoF@MdbG+Ad|5C7gE?d;BWe3PKm0W_)0I?r8Fg>?gU)92XsS ziP#_?)V^U&%M7d4%-SmMayOYG`fHDFmzG*vZ|5oNW9zI|()v%Ip3r0ytKb}-+|jxykchbD$6g4&~}Rm=MaAsc|LZ}%eOfl zVSh{iF>lB=ySC)D#jK>QrL7!Ro0kSXo@U}+Xv-e6BXYsDlm{0ReSoL|MYN8=jL->=(6JK|bi%QpLZ*_QNZ zNc1_+czj(kaEX6%ik@`xB*XhtyKQ$&pENt|iNf-gk0W`@8iKw4mZ*KaoKfy_E( zp2e$-7;XL3a(2(XyZrl)w^y2d7MZ#)U%k>baNX^i@Vv`6PgSaGps zhmOjbbjF0`c>+aTd)Ya*9XefJIY0dckC@wxuk0$5zvs#e2(0>i&*<{gfNtxD;cA}K z%$Mm3KKOl6aCy2kL*IVIr3@X_Y02UX6Zs~ulYD=|?M#f|^M{`-Yq}F0*zDBYw=bJ) zY!}ADll}4!Z&0`Hk&w{nRAn)p(n72AQ@vGJ&zksY%Ivct7V$;doEx8=QM{1xpJ8tP z@>ge;o#?y2T*J?^>cOAo*Y*as*?Y*{dLXaiwrHzClvMTZ=?~u}?{TU4+}9}T#~hGit^80s(SO~E*7u_l3VMD(#8+ePOHM>`6M>-Ul=ckJj;AkLkE%ozoCo?Um_rf8dY1(z~m&_g4S-%D@p(w|1>=uJ1ne_&TEleN~&BuiF_uQ=BDj zSS)QHlfQSt2If(C!_2$!?kHuZjAX3UtsW%UsYv0&Y#md~A0b^l)aH}tJf;!{iM z+RAcGbIvB48QOw;8x2IhPrEaJ-jt8CdaEvo>r~8U3SvFQt0$l~VGVcH=c29OW@Y;? z({-unWwL0wQPt7Dv9|TGMWsBC?t=MYNpF@P;}A%2c^;6h`fAscrdc}C3H_#1XH1!% zcJ6Zjp+hVW1SVul&)XNO^l)kChTPMJG8__VZZCCa&bb^ITe`|G*~wC4>dWqa&u@lv zmNzu=C?4S5cw=Xa#C#$wA)Sj4YSawUojdk+&AB@4Pyln4!-RXT=I@RO$Mzi=k z9&LW!F&%H$O$uJ;e=huR+8ySrp4$puuW8zt_U3Hs{p73(%~yW&zdXObRxC->y2IQp z+CJ*>f)veylRqN!#1wN+i*?pVXQ zG9?O-Kf~Y9gjkg`LUT7uIm~;bc}dc)A-c`DZ0Gj3 z`yMDZ9LU(nm18$^Rki#1*?~8oisd$bc-|UQob&JZ`m1uS(*wE}zS#DyW9E@CYl$b5 z_zeCth}Dz}PMUY9$aeXq_4z@k%#_y7l68vA`gH7AO={lKM9KJ7s!uKL1D6DB6uP4l z<>@ko;p53D2hRh0eI=)Uke(Xcwo-gaip#r*w{H#Cc)rk*y`bygw(R8W9yZB6+n62} z@OIo_iC%N;Ls%EPc|yZSjV-s7U;RC_>(-n3G4nn?pZqSE!8jq}#)oT02P)iKAI`db zm0!(L`K@DyU80eU@qPQfSu0{*nOsghE5Y{tx=+Wo+^|{8r847Ah95JSRlQeb>u|y48$xm+Vb$ zk0{9cP+;bLsCVmqS+6{p^$W~~FI4Z z_bV((Ex#kdvpP%ia#+MIy)Yl2dcjLOA3S>=XsvO|tZjGtN|Q6}xjQ2G;tkR?wn@EJ zJ(|cEu{L^kM9QOro|#?S9tH<)JCY^#%JR_GN!fM#B-W`NE#jL$#q`6CyvAP1tfO`Y zTNj?bu}#X!k2hwwp28f_!-t-B%P{j8xTbzw`km2bbc^%VC_-ta5iL}i14SdM0=nnn|7n%KdgGhv(Z9m$I3cs`I~>Dcx?gI+pjntX6fm{W5de zz!h(d61!jd^jzy*W0miwzhaB(To)yd6Q@rLu9@&w|KSA7$WN-r4&7!+@H#OgyPk9X zN)hKg%fpxdGn_vw)jg+qx6;Lmt^9RM|D}a(lon%}vx8UjGxrPuhCG9arG-*yKaQ{P z7LCk4dR|B5ZAZWFF1~C7g_woAxj*!8Q!0HgxV+pVK=`UrRr8anS3c%NZ@MdCGvDv^ zhAU5^e0%22VP_Rm{o}^GXYJJ}v7eEBH!m;;WT)=Dl&$kz@7iqcr&gjDUQ~G`Z2mHD z*}Kq9QY#rIeK@@JYRmGwk>7NRpY7fH=|blvTkjan3(s>>j?EB=I5b0a-cGv>#oHO4 zm$_scODa#W@+sS%-*7e8=j0}ab4ym5mJ3Z#`D(Li;+CCj9?CuVrma>w|KX3`%i&8o zS}v@LsMXqdxT{DaS z+H!rV5@F&c4NEX&7)tHYU`Fo9Oy4L&y;;;{gw0DJ+&+AL~=Sd za^HOt+^e#0P=bn81t#qzNU9hl%+D zg$DNuJ$vuI)8(1>DOhXIT{~YRqdTwjH${0`n%oP@UU}fEQ2$9`Wz%2N7i#T2Q173# zzwO(!d$-QbovmecS1;#S@b*XTTfcF=TscwXk?FLRowmImCBJUnd6hZye9)}dQ^QYQ zS21S2 zh5fW;F3Yk?Q7(&^cc)9!cK!@{?74iU#>cC|S(2Ww{zZB>ZeLNik7>VZ@5HQM`?|TEC1>{ht-08}tAH`R;d?$Ghmo1z1*XLC^+(0xL?7*4 zSXTe-v!C%jotPDSIyMWKJ=|^cI&;OutIE=$Vn?q^^*_w`S*1`kb?Wt(TXhcQO#N~+ zHS{@`b<)PG&fW*Eo@Wg*&nQV*cS!c|+6ukB( zZ8Tf$H2qeQvig~1VQY1-M5Sd>^E@`G+SDBTk=5eU(DCTVgcIkkR78D~jx7jqo}P2c zq06f<-!!$dt!z(+zKKuI#O}p!)*hSWA1riuY19$(r3QsvNy~p2HZw<`6kPLM=Hs^) z_aBzYR-ZWN;?VUc=}G(N#V21FX8qAveOGLSg!*(H&4_D7+XYiz3(Mr`Z#90$mf4=z zG_m(+zDHGzr}-UeF2&26|1Rr4zd7g4S#G8^#t&k*vv>wK%UyZ%VdC^vHCwl$&bd=($lhbYk#~^l{o74@!vXT z)wxqWq*!=QZql{BooFE7;&)d)F3D*3wn=y2@3K$Kd3MQ&GEJ1lfzxkBpsbW{A91^~j?jziM^19T* zqBB#&9F|TIU}3B+)GaM`bE!JNk*j>9xmB%Jo(P$FCrny6{LJPF)*FS= z?X;Gu$Hi=t$^XR6S>gNZ(8Gi%S=m4Sm(qVbZc#ZXYaJESxo!)`kz>;o7^|PBdiL2U z-dC1NS+U*i!h7a-mt#Z^ocNQRp}Y1=(CHP7BEO@=LKBafzI|G$7kVY@W~SR|>qvob z0?gZs9%QP#-JjsoYkKq8X{|?DOQtymI2Y|V`m=G4p+QQH{ufXkkvGkHb!!6i%r|98 z((5K=iV2$}ZVgn8QA~VX`&jOVZpsbq$?_gQo_+1SE4|la`P81d?y>6%KSd|3)n2Zt zF|i;z#KGmn2^Z5Mm4zIdvB$hTopfVA-Ynkvt9_Qb=OK++ldM}M@&>`{V#1~OY%~_; z`>NX8c-j9^-sFF3yS|6-JMvOVb&Ub1R+~828-a&M@t&?k^X~{wQb=zFNRM30;glzh}Uc`8rW>>uw97c?i%3rv@KyJ2Sfj%hPLKA&_&d*1Q&zq8+P zga;&M_Qq?>I3YeWXX?adI;($7>pjnvzi&m?-94MGo4|7TbPYuHaXT$1$G+hq)9TuUbkk;kdemKRsAOYHEyo=Jz?%)_uNq zY{y!sZ70L0Zm??qInRH_Z!!0x$Zcm`1q~xh>+VQ0clN5Ej5@O5U3jxh*K_5Me>^Ym z(~S8TV8&H7JwP`;Vo6TqoIl5#1Z7T$jy1+>o+K`pxB88`Dl5o#^GW%w*P6gH=3_HwSEw z-}^5qJ$v5CG?>sy7EhX#Rtz(-%79KhkE^{EX z+c+&}#)PoW+2VECziw`@)^T_}@pJc&nRo508a;JZcZ$646uuKanLGW4bH%Bnb#|w! zg>6o3=3SB9|A=eiZY{poBKyz2l7IGXUFu@>u#yXHX6t`uf93YMQ@1nNPlnB1#jTZD z(6VgP)!-G!rtVfN$$j`MbFOUtpK~9B)R+AI<@cy8Tk2Qpl=uEO*Ztj@wq;SZ?y)tK z*b-M9{!!PzI-n+R`M>nQUj4EK(sw@Isx|o*>AvlTiDSC*8LeqahdZQS32oGPe`Wu{ zR|2WQ8>(b4HwD#OuXLNX`OA5cldGS0T=Pg#WoJ0PzH?qx|Kr#j-?VeqOIZ8Axwe@} zKb*UI<+C*cYqMm1PyUmAxp3c2m(Gy?4B9JAq|>*GIo;1G(VPAAqqY9Y*RvH{iZmi- zp9|kVdrR4?_y>1tdhHJXSf8t^{(0A?ZS(I)eiZ#PEtK(&dSG*V(1N=~M%RDFdCXO- zS-jm}Cn6>7t2N)wo_gMr`JekzdfAUXo_qX;ms{?%7pslg?Vq^?bIh3#rSN9T=JW|$ z&n^AOd|&?)`+8rWx8>oN5C1)&+n$-sdS_9r^A^8J9Y#6tg0(hJE!&%0S?{kEKmKgY zm?vNAzBl-uOwzj7xmrT+md#*#Rl2orX`J8P z1unZ+@vLlDtADlT$Ias8=CgKR-p%ZPbX7&lX#di0>T!meAMIC5f7LtIsA$K(x%{L> z+4*0ympO0h&y#qgua&0ob;|S`5%2XMdCjpt@B5!2sa`dBb;0q>_#gUyv*!zaD@yKC zslOq=N-ko4X5W{xsFRbGmrwD|jO6&IH}hAZm0yI0xp`r@t^Ja+nKS=0WOzBu6I?!( zr*X1ud($VDpQ~Q{`Yh%Dv2k-z{k`RjIbLtzK2>;PzVE)0Z9%6`UD!YQSc=D*EzeI! zC0Ft^*7ggtdjDs5)wVwUGfT~F-ShwAW3rC_EC0`M5Og-Dfgl4D6C(>F6Dtc7GXpaN z0|Nsilb|BAfRLerup^67KwyHXfl;D}1FKU(QqcnNv7F3|jP{Jb{{H1#d*jw>MUlCS zc(1vw@pVoAkn5@*Q`dEWLwDxIh+9#Uo_k#D**~d5Q7`ld^T)pRXD;8|rFin`U%uR> zjbA5Uo0j4p>hWBztn;A8tn8;Z|1qxqD5L7py|p^~=&`Jnf6AS*Ax{ri|7WNQF3_+1 zl+9YRMP-*uot(DvYqfcsrmW8X^*T)L(rWO zhbsv@{&)Ll_^FIne*VvH2Tw1s+^Oom;?XLX(oZ*ERdsjS$=Rq*JgcPlZ@;GIDwE|E zDa#hE>3MXGb@j>1nz7TjHP0?XG0539^1)w`QORQ4*q4Dek!c{meicUh30n0 z57}F?&D#3)*o#ePGi!dx-gt5|SLvizh~NhPi_9XEp+nbE#WKtY-D9ur>mF^pDELpifeo3zW>^J^gPQ`UAvi*C+))A z!~9LM%r&EpLxMz-%zGw;oeaIXY_;{#{|u`x)pku2pSI-3vEwH@jr^`R-_rVR;c_^} z&9^2L|iZ%h$ZnR;1i(woAcoyT_B{}!Cj-uUsYRLNBtujuoEt^!wr z<6qpov1m10-kwaOi5~@P>Vh9G?w@h(ioc-6I_qO0C%m2%o}HDYCUz$&{F>0hE&hQk zYnHDR%c|Km?f8nBnp*nI?m7W8IWKSa51;woN#)qznKCv~Rdc4j_j`J});&_c&bz#{ z$;dxX``g#As&6l}eeaEPxvsmA`^0q>RgZ_CB|Fi|Rf>EtL&k!Y14b1tfH zQ9jM|Gw{@AVeh~!GQYmTdQ zW+{1^CUvRYdU54Vx!|{8eG$iKV>a)=P~$Mui+`$=*;Smy`pnMFTm4(yFEH9k>5_>H#bM@yQ7K_K_F>1a?pk&3Mc-nVr+F78Zfz3${bv4T&wkIFvZnIfVr9`0zi%G3o#{N+ zaF=pxa?CVVIor8MdR9)It$Jg^hfeRen{Qc76+F53%coDC7B+mof7AXmB>VAie79%v zEq|8i)c!^MId7ZqRDTk9u>0m0r9ht-Q`PieOxl=m<;wnBQ|?UIw>nPrX}2Ql=}g`0 zuJ7M(&6^};5TwoYy2Q`d_?p;~NGG{-mKHN_^8|WSs9XQxW*6FXQP{71yU=$3G~LZ7 zVy~T@x8TW%S3!%cdY)#p?Al~C^W>`cYbQMW+p+E3#S@Vq7A`8z|KM@iVvdrHJQe1>*Bf5EGXSQoonKXl|NT({99?( zS6{T~9Q!hj;Lp(?+y!sl3lu4^c)uic;VNZ`tCQB}Zn@_cEBNBUs&77ozL_9zFkh) zb-wFUWJu=sN%?QwL#wCEvNi6uG%50#6J_|Wa9>w_#M<@WR`jrL{*W}yMrXCkCE?%Q zn>Ph6YI#vq6u*7Z@lU6jujJ=iCUxr^Jf^bLr{q+|-t`~6^-rDF*}MMGe}>DOPT%^^ z@aJq*-kJw%ret^>T~fuqpvwN{i+K~a_&a=YUuMzmcYM*`b}oxatyUt^w)S%DjF~sS zMA-^ouw}k%t9)7GL09zJNy**uO_{EC=ZoqK)s^(S)vZ(1Gg52Yj<}~OF5OaD-K8lK zXns`oo7Z%w?xc(9EGDj8mNygMJc;`u6BxO;S4KY7Wlg70*nXC_*=fORCuexhNp@%b zZY8W~yf8mHV2{e=H-VvzP8x9QYm zPv_}8IdNae=wxb_PwvLjy&_@ven%`#t+3u0DZXW5-RUyjTPk~A{$u9aGi%a+hE>W- zR;w@SadKJm#LeK5W?}V0!H*l?zDoHf=v}Ur`XKUlpSSeQj-(Gu{Qd7%7N;)%A#^pQ zs@HJ0=J!V}=X`qZ_TJi}8^2@8jNNyaoGMhZy~(#NUtK-*?K^u*uRfpY;=j$mUip*z z?~tYFyKvEzRBf3RS0-gMwkJ<4*%bTl$mDEhUoQ94DuovNk4!uJ_LSQEGixVK z?OEc_&BFE}@-$PrO`wQxq)gp$=Q)0cwS0O?6I0gT|0r?v#Fxm>d*>IsFFbx%?#TPw znOg<7?NPqp`XuSrw&Kh=YxB?FoD=*abN!JmPmgxq)N9|8-?{Ae%}JAerkd6T+}+c4 zs{Enex7{-3!N2=7|1${9f4DL}sV7QtdCr$8<>e|T|F$kUzU;QLlyi;CTP{&;Ro6v( zDg(uvCyC13?OeWhQQ+S9NB!Rw`Y&Ad$K3OIS>GN@y|xeLIXkY;*H8L9DgN5YiBlJq z-Md(!wm;SXoyD=Wb&^Y7xm(OzwE5~u%Ok@@ylI#wR`6d;HL`iA~=(npFQd z7UH?upd?Q7$NnRAs(;$m98dO@#OzkPzF}?mo{gt1M3(4AE_IuKrYN&4bN`f0Cw*g$ z>JPIOKKQNhA?r@cjJd0CF7iBjORQexNB;w_y&X{%diOlScRYIXaa+X1No(4*4|1$~ z;l*@go)+VOQr76L``T3dOr;3Lu zZnB-#<@uy5t0XJ)lz+z-sY=rg9rg0+7ydo^87Y3ULhaGZf1qjQ)txU@Zi;@A>ilqE zp?y(6VZEV5(TQ7L+uY_&E;%k2n$#54{&(9fU(TS<*ZwJ&WqAMF$7iOKI49~w(C>fB zdYvUF>V;~B{;?lfy|89QW%AlBDIcr7e=7gG?Q4GhjcHcD-%_VMqmNlf?)#V8AAbJF z?~!ZJBCm_{*cPdLb}rq2_}I0}kv_B6x<0>r%Wu}LLequ+8Io)(vvqV zEGwljW2yV0{nImf^>1gaDHM;3sXej#!}=qo)wc>yYD}ro|L}KbvYk-(H%t3`JInn? zq}NM28eew45a#~yL4B{ZBFE9>@5()OW>%r_iHY%xclQ|+Vy{{ zj$Z%A`~L`o9;j{4zzS;GGl5(7;I=)pfRLi0LV~b?gJXb*l2Kq{fm0z%!vb*2o(a^l zf2X}faoac5@NJ=;@<7ID^*igKY0A7dzOhFd%N58 zB|ZBd)qE2%*s86vTE}eGC3mjlZI|}EzOFJe^4OZaZ*uzuHx_w`tbcytlJbs?GG)?x z7N0v5nzlW3?o+9~XMDArg7$}PPg7BvcGGFcghi80qHk1GOO;p~#x32j=-BG#kLHxC z%a^#By(p}E))f{Rnd>SZ8Nb?1?#ygIXQ#kIMXAVBW=Y2;Y_;Dqb?v^QE{&$&<$@kd z0v5H3cyW|;TF1@39yH0T!#!9eNK>Ti+>zdy9j~14Ketd;`Z96al7e3*dHE~mY|g%P z$ZDp=%i0RV@270J3qL2BTs$$kb6a%y8P_GQntj@h2L(NK-aff2xJz~4&HY}pWBBgd z2J~(W^In*8S8C?_U#6Oy)^-yk>qEUJDsR>vId$)ps&t5-=qxAa z`;!XSe9etKyl7rl+iLB)IFX|AJ&_)bM%guse_06SKV1_fvSRP& z;DyO570-Lq`)o@7_RH4w%S2qMcznd?9}dTuBXONPyJ>6S-j|a`u$_q)9rfq z8fk04JN}i5>lt@lyb*UR_4-mmoS->qfA8q0z;r<^@|_EcSN**X3vfhw)iW)C_y)-NmwGEsXo?U3i> z=qUk%HwTjxjyQ^D&a-CEx@bH@$YqZGsH{XfB$EMV??9^XA#qnad ze9fEHZ+$F7dNU?G+ac{F7QW9TC8Kmn&!jsah27*;cD{C3nQGUyHG9iS5!cH$ZpZ#T zvY)t0X;OAl(89d;mVVvqczut2JEdQ^_t%G?f*pH*2``>|G5b#8ThSApMeY;p+yuTS z-Q?EsS^Q)E<0;uE{ARAYcbM^w_tzI7^O&WF;Lb zv5Ay3UKEr+-|+qI%%4I!b=haT7kS^`Rkr53S9S2eYxNiI|3AXuCcwbR%*@Ef%*M>l z#KOwL%)rRNB*-kJXec18pZnAV|Vv<-|03dom$Iw*v_?FZvV_^ zMx4=~-iDCcwXYVj2ue>ANO`kD?sTV&`XU>NdXw9ddB$@?roAd?*6dzwe@QH1I{#IZeI2~z zN4U}@Bu+e=`*yv^gY-`dvvMW~W^ZsityXrwbn!GnS+U9Qy-zSz)vucIe9MhXFJ5kJ zntW3InsB`0g0IoD7w$JIHF%lDVy#_P>{0xpd*xM?*I#^6vywi4Tz~W4gKvNIxl)g< zK4<)V`^U3ZX%kZS3%D-NsWgx0IaPgN<^}a1U5$G^=1vz?-OkssbqR;CDnGYJ)Wi1q z2i_&mG@hewr{tAwAM$;!l<+DmndiG=x__30cvsFd5I((5#DD3gwI2v_TQ`7 z-*X4_qmzi7g%81gZ|=tWj)S>iA4 zwS2dkLyKoTuv*q|PcPN+KSM;GB8)fUIHcnYMPjPRZNuIzH?%Tr4j{TUG+<2?6TPfmgNV`y#Q}LX8N(EIp$+sMo zSCzV3cg*xRIdVf~!LR(LC$W}cv)pbR{;hjA-e375+ve}N|NeP$-jrUI{MBt|1@i<4 z{eY4$PH!!jafzz-{X6w+&o^tI_Ob*Ivq8 zSaQoRvyRh>g*)}rhPeS|GH-)xJo*@?dLIoIh;G^*y@*ljl+x6|;7z$!CCB+)_k5fo zuOGT|(Ftas>?fNa-s16pTpm!@?is%Md)~j(QaQ}C{?2pE(CBzrRFJ1o?6-99of&6Z zYt0MI%|)~s|(EpihTrD zU#W}l)R?4Oen!+iR=z9Za4TXO^ZpBIygYBoKKv#K-Sv+ugK3rF?#w`Ft11XuRH?blc52wCRiZ*u6?_7l6R6rKgKSa?rd;r4cc%amvA0(`6eckP6C9J(&_zN5rPdINXm*Bc%zZLj~WG2GsHdRPA~Udewix7-Zb{p^&|>=sMAxn41$ z#>JB*E{kf)@|!&P;LY!HOGK*TpHg##lFg2Q@C8cGGXzZ-8Lie7Y!Ar_`NHGit5YU> z;wS&(xwm6<@`^-e>8N}QxOO~Yv*+@a+TVTtGb}CGxcG&L<-)_edJh}^Sz%)Eo+C8# z%JRlV^?a=c8Gc^HnVX*Tzni-!+jvH=;N2}TA_A*IbPu~(ugY8QyPZFv<=GB~(kai6 zc&RTtd{@Xs>OaGh6Pf*$qWu?2{Y!gO7qjrLEzGE%qvrMZvi-~WUFmXZrG;x5%0BI4S-4@|i-)OoFXw+*P(RC{;lo#M^?-oYVN1W~^dH-M`PFX0m+v?1 zTsuK@y+DY1@JzF&K;yoSO~FfQ&ALl&XdYi})Vsd%iki{PJ-q%Q+*wC?3-&IF@-g*{ zz4~^ETv&`0{~@y(Kc<(?^Kd&SH~)p|kH+WOcJXEE?|Pe$W-m1a@?~Q9r+oo7txiZhur0sB@@=E{I zvUbxOlTWfW`g%0A^DdteKE2@8*5IeBZY5p1a(zp@=Gi4Y#Xg0*tM5;0FEsz7c!b$< zeR>;T*7NLbBK3F2dyb>6sPZLK|fLO{MtCV$7jE@`Ld zyPdA`OUbmzTzfT#J%rcI!Mbqkv64Sg97dkq!OdrE+yum)6yLbjD=0Jd%Uu5d44*@z zx^Hn_e$i`Y6vwmR@psqDEixrHdl&a^s`NXZ{BFT#zw8)}#6wn$7sa+;+3s&unb*4f zSMcqUkivf_x4hgU_gX^vF1uK}yV9IjIlON-{OD?m^#8NSq2rSm`>EiHM}p3)npZfy zJ+|6vo$_DBd^YxDZLe0E%>6rAYg0bE=9+DmbC)^I-S}gjlz^$0$t`==eP1`;I<9K+ zO7N@uOsh%TzjPc|ZHvAa_N1b+m@jVL_l`LXYpkZGc|;zFT6E}=?B!KknAY;Ke3_ym z@b1p#8;oMgI~7izDi=7UBgr0md|~+J(BiX4@4x&IEbrSmts{KreZPBO40lb@II=bB z*nv;{#p;uGvk9zp`S6*;Ibn??w}#a;u6x(7KXjXW&EH^q>aC2xypIc)hi2+IX=SzB z{b%TryOn!-=M?D${~5F%#$7AfX}InrW7Oq_1z~1?g%@;kDcyLsqmA7}#%SU3SP_@L zjOe!I64P1U-c+#U>Mz++;+t{t6w|}3f~7k329=8=ZyLVjiaW!+NNo4bFTnxD$A8rv zGZWi5lf$5AyF^g!wZM-uTe4V>iE|&kajW>)6Eisv-kQb9vjT+~)-m_a;8tXMp&uDH zPcAj#L+hjvyBL9jP(2AHCY`eVJ#sQ9E5FRVoRHJb_psoW-H9CzQ(m4ZTVeb?F%X%N&)-SH&s9RSfBDfll7)i=$@;GFJE8u?Ht3`SB(oZpHH3k zt4ce|W`YRQ!otk!36r1BFP{Hcd4iAW%EuAWr-IJ7tkask|5<=(V1&f?ux*PQeyuF- zw7t@l>agm?uZ4l{_APE(CH3j@iB{?B|5hElTB%y?)p{;6Nbq5A!y85Or+z94%XL*b zxV0PI^;LH$ddGFoOPRts>HYMNl|Q$c>{_>{NpX_9?sSfcSL5%>-YAY03MeSLtZ~m^ ztu8~6Td@BDwlEp4Y8fSycf!7be6qrMa&yhNJrX&X7ld7U*b*H$^XVqVD3eHQ)kPw6 zCk5(#S$1&iapqk*6-_qNGyWy7ySHK8mfP3wC#N;MIX_S0rq-`3>l2ROHEpPNdK(g2 zdUS{HF5?Y$MN59)Et+-Qf_=MWc#Pf?5uP1uo-MrcW}e5yC2xz~?bsT5bMCe?npbl8 z1h$+qx~VPSlX+P;gXiV8@J(OmWz06d6!>OUzEo`R!xwXdY9oAQCOn&?u+nOgis0Qm z_cg2M9;s40T$z2b+F0}0yqH<97I(UJUC&rHSx+^%@XH~U3D@{it8J}T+?=~J;G(LD z_^k`83|#kf#&5o6ccCh#TTY?hB-CaDzln{h0lTp@v-C>W<$>FpcWya8DJkSgF7FTb ziG9^7+3d6QMZVXcS`~5g_|$7v=S{=rcvO}A`&77@t!Co;<|x&po@bp`-psg~n&3WT z{Ja zr|9Fm-w3x!doFe@ku#x8&P>yPBA|xc*6t@7nXri%e%q zd^IV$&68R9W?9juqRP4J@@?MS|6?rYkuhnt}D+>%$uiN}u(2 z?zUU;ou$})-^sK)E$Q(kQWsTL+`aRkp<`uYgwt}v^%oP9Pf1&b`&hEIO<$R}J4K?E zU4y~m@6n6>M|Yfh$Ze@TOVs2=L*a#$+^<$KynH9VD(3CPlj%7o>P|YPvNwNK>N*Ka z9Ip5=?Sb9p+mmvvJNH~}?p@d8ZW6h|>dn0?Up~o(9>|#UpJCJ93tZ=IR4jjja(lSa^^UR&-?H{+e0bdcDE;*2_GO_FKPQ|k+dID`QgZ5VNtv>H3wlGk$4)D;3^%^Hf6=x(-{a4%E0ZwQW@0;k^E9uU^+VTn0>Sf@ zW%l%muAFZ3^LcuG;l66lv_=NDN``f1St7r;PC0ElcMpqu?i|0?HHy*}E9_rMwX<0- zc(~BPWr5%MUDICKY*?G&mnh$Trr2r1;pf_Ad|s^?N|rinEIIugUH6w>(4Wbf!M(_~ zO!)H2Tm#l!Q{*0}hwj<;lDn$jC4yszcI+wIi$hI?_` zYvrC_6DkvS6uW*cy8fS`g>#wQKS$SV+ZPvZm|$Rf>yo8nKvfp^gyhhMXx|;&T?=9N;SJ~^Haouk*B(lFmzt2|6pIc}BT<*S8eSCuuk-V(WXse|*{fy^^gH2&!Pd(|s+ zlTUt8sZ~RSKbL-=a_i)E9r@A*eTQ$FZ8g-jTEI5j?ev@kO{*fg=o#UB{05E75+9tu z>g#qpcy;iK5c4fE3dcB@Q`GKUNLa(UTO;Nh3j@RMnSP~Wr}-667Mk?02u@zS>f6^F z7cXd)WClEtviTBrzk27bzPH<2WzL7PI67```>yfcxUMzoThpAg3CFJAH~(X;D6gX6 zbZ%e4wNBNTH&>ojX>y*syz60Ej{!nn_>W?z?!s%lDjP0Oi_3| z@1V`K*XETfb1T($d({drd1^L!$C+1wHrES+=LT+=b>qv6CcU}hJat_jk0dlM{g9oo z_UTpei$=fdmVNcD_TxKQb*|a*X|1_|ZQqT|Er+*qPUq7&HMiZGdvfyn$y0K+C2PIv z(|aSZ%tG@MZ(ue{)|J247Zq+`DtR^QW~ae+)@9L$Y~4Fz z;sUO9s`9@4c0BG>REpk-t+zxT7fx>2)%^GB;mqFf?O!W%e~2(nO+Vrn9Obji?4`8C z=~`=!6?u&<4!8H@xN8RfSk1Y3lDYdiDCy9QIcz-dijPqHm z7JJ2uQ(aq5aO9m@@#=U_W>H~B=H=vdA9(~+G;Zrj1aqwW_rP?KXV9A~R`a@^S$I5| zlO?lzl3Azb?PpQxT$Zcjzd261;a@u8lHd`+Cnp)53Us%Lugsjc+kD-Rz=B9c>9S)h z&h43AS6yBfE2Z>!(iwcNy$(Q2X>n|kl3@|P|YxU78Y zX@ToH8;^F$tW6&^qJD(D-1#an|t|w zYacw+w4gZl-0JqUK&~6n*B`JJZ+T)>-JSXP*HpKSmlFI=M0`rfId$y1_1mrMcU?Mq z>{wm*cb~t)-BD7HFIs+$R|?QwoSe+U8~BL#UBH45QhKK+H(W?Gy&9>nRO)6alEv7{ z=a4hi4wS~3zBdNXQ_Xw(&`P#(&xOFV@%FiWc{?tqTE3Hb(wFM(CRqI?#K!R!^eH(}7_{Sqz=5p=rrxt;y60U?|KWB};qR2loSf`5Jwwg2Y#&(8T~uPv zKkA>nAoi@#sZE}**0af8WqLL{OqQe7x_WKJzTL7L*I8!msB&8vbNxe({I$7z5C6-U z@;x|rjXEROlyjlRF8qHT>O@j6Z?aSpd%5=E?9^;)73K278<;nl1llAA%<=0g@7X?K zC);%XRoiC2e^qw*&K3O?r8$|Kq*RveJiCL>bKj9WRw6Gm^Tll!pRrPWs`fs~Qe(q* zn=7o$E_J0-laC2(+`UWJb<4s0O4qAeTUTzcDEfS2Yku}FnK!rYd6*yW)AQUced2NN zBAdwzZZn4}ob_9M>s6yvi#n^EWYIfQj>}ulP3k#&G`L_jk5ns12BSq}r62E)$yqhL zS=k#{J~S@~iFp1Y`1-EwS&C~9eU#pIqG(z0o4h&aP2?UjPfE2svZypTKq}$$HNm?Z zb_wKqV;jX{8h`XtUD)&dau0m z$->{Ie5#J%`kD7`Y~kgQS`%B;Rl@!J%3H+@w-aR|pFTZxc)rcd-Lz>_*@^I-+xnbS zXPGGdi&BtLpH<*`%DJg9&w1))y`N>hGh?^0ZSmCB+4($Z33uq%{godMI$X&;>r>2f zr?;?qA;)1y_RxLVY?X_+n`2K#2CrJZZ}`Dp5r)=O>aQ` zvXxIPSG6v8TVvko+_97C1GgK~bo00_Blb`qpQfiGcUh{MYVQiJj$Oap^Y~S6?n>Va zB^?10c}0^apWtm>TgmYHM~+o}W2TkYS0=Ca5XOh%bGdf8=-qQzo8o2i>Vt(MR{)<8 z-}#?y7jDfGi3(V8c*^y@L}wpOOO4*X>iPXso#r+QY`w{MC8J6^#&~N_F2f}|eU;#x z@4*rGs)_vg2=WTzti9fxM_xXeSLYr3O=II>JMSn?)!0Y;e-=hvYp~+C zUMOVJyT`lLcHhhk3vSMM)^+OPMZQ&Lw;X+SPjh9@D0$Mns?d@{+OTQ=Os6*+S{2W$ zdK|8rqIs==IWknYa()YI)4X5j_3BRve&pfHPr27D~V(Zrqw@(UY@!o@3r| zlh?8HvSi+Tky`P^c)<;+iz>@5S*RQm&D?qHe&|u7l^yl26$yp!W``+Ns;31jU;nWp zWaqk?s>(x;6XkL~`&MT1mbE7&mugp=o6pak`AI7MnyqSh@*MA~QE9hMI z>1N~&nY&JMsyCLo+`j8@AXvLIIng0UTP|j`?5ij5IyNmhcY3eRtMJWvmGkOeb8oU{ zbb2TGdc)+a?x8Ja44e8Y`~tE|q@^4WJl(vD*J^5so?pZv)uY~9t`pqG~-&njOck;*L;PV;91x|a9cdrte_lE!7 zjOQT*DjC~zGk5MNw7J@J-F#R3kHl{p`xxH-SoPe>tM{Su!c&hHUH)?D>X~0p3-+#y z%)FVeaw@N!yX1!4T_=&lx%qalychfxUnAS_H8M!#?7II9S}u1_9^?vDc$Rn5@2#p$ zlz}SORrk$LtbX3QzwgX)5WUdx@r=3c`6XiCwjW-! z^G3efmrr){&&s*qU>Dl?PS5twO@mG*Yu(%J3#z7GNqYQBHZXgud{4ongu=nZjXl zvv;q*D`@y6&LrZ7j7b(x^25~F4X1dPrM>GsSGF{xztnO{pj~*7u&&VDo9Ss?QVL4H zDhsc!?uoj3aV^)!w%nEtm)@~2Vq47HX`1CBfwjzVA<@`VIRM4J|pLOe);mBH<>@qlL;4g z3_9JsOSWgVlKd9VzJDIkyB7Vb<=0;%nlj6(p;XIKaYLoyS;i+1ub*XiP2OKptG;Nu z1m{6>O|-gRAEbm-hd3)8jRtXBGFJ`)sYNvRcXyt4k;jYpO_4PDaAdu9Zl zPuU&9q{^jZ@VxlNoRfQ(vRTc(DLehWwB}E?J4zc@P0x8)-1u+FvF6gdVQ>C;&WXsp z8gY7^Ricc0s8+IVh|;e%hDaM_$3NDqtY#J`sTBFIkj^N){88ocyDcW?b6OAb%b(i( zhkr%?rU#1mT`qj=JhM*T^J0Q)z=Bt;QHyVWk~h2gxz?<~X2arXm#$}oJ=?H@-+Sso z!K?Cob!)YY{#I(9j0h6QE(oY8bUVN>ZO23Q4c>vz!rty%muflZxanM{_Z;U?Yl{fg^4Boi@l2vh>()GO?Ds^n^U+s9QQL?olgjG27Nnc0E zv%7-3F9n#qd{JbzdSyueD&3VVUu7;txPFyc^72HzU{FVL%=NE-{9BJ7vtF@h`^I1) ztA4Y0i&a7QS0*MFq!Uh4AcMwRkaw_KeGF#prN#T%Bdb3{fh_I=Q>!_oQXTN;@|WK zD+-#QbROT$m)Ru#R&ZtWSEt837De}d6y-iy?#}CWN#NAQjNMZUFP~IC6&PR|dF%j} zWY~{c234(Z z_W0CmU$OtUY@Kky+xJ!Wf0kcbWg*{u)44@K;&sgBrsijISL8D@Up{;ErIm~AhO|mi zRL+L1rWxlhJe#vZ+2#JC{M_kITOY?|Uiu&seBjlbPnFs+;t3miEspv;^;#db&e!b2 zGJZbphOb`lE-J>bs0#-KD~F1#>s!heS~7Wo)Yd$SLq7%e0-q$`yFK%Q?rA%{uK90E znF~ApYF_p>r}hSG$K;&5lQYv%L~z9)*1`i%1ls+d$ZR=wGP7yT>faX^|5_(eq`T6; z;T0GElGh&BMD94L&0hCr%lE28c{;>F6G>+05B zDB-$gqdqG;`(x}%j&9~z_m*pE@!ot=sZ`dxCrT%0ivm}JkK)<k%*W6J06b*Ba|5dn0R?&N@MB#YJA- zKI^@9p3C6+)i+h-;};IUn_2z33(Ie3oze?%t5WzlBlcoS%FDY9{!)CI20P|>E%$i9 zm$`=dQsYgPLyc|PTc&UbT|DVOU7Nvlv0HDG+iul-t*Uvh`}`C+vRkAT{Eb?SJC_Rk z9$sgucjsE%>s`x3_nxg=b$yr9#FkfL+ho#0FIKC+vpuL5>+5jv{gWDPbJ>^sUX~`&MmztPwTV|9;TddjaZrE^j5*UoA)HqP^tw;iusC#Cads>+%NB@TBpxo$5{ zjuF@)8E$w@ekS|f#NmgqWB0vQ98Y}i>b3lKX7L%mxwSX9J1l%+{Bt5t@hZ7p{6~MD zdXT$#`L07>Mfo!doK$MVQ{Nnn@zL1#)-osY$4SR6DUWAO4=&*HH{L8=wes_gy4&T+ zUww2h&zf}StLuRnF{$^LQ;*NeWRHu>zPa3B?UN-uYHgo_S9~^Y4odV*x^S$6L8q!p zIem4+jn_%;dMg4i9$zKBxp?;al2==!*&m*};I`2F8hzoNf=Y|$*CV$!YCT&cEgs68;hq-g8oxXDZld!o z4%aJpqTbD!%$)h&CV0!7MYkrF+iu@;>-@Vg=eb`sLYA5pzkQbXZt{BWZr&I6GOh~~ zQ+`(XXgstJ=smlAzv|SNf5jKot!`Yn-*@9C%bY{+pSLz`DzljQC19_kgI2P}rjqa& zA7!b^^?9u(Ww&xW0%{r$2Q=R@<%pT{;Lf3yA=`K!EO?e=>QjC6eV+B|TPbrGnq@vk znaD*=?D0{GxlwQ^@6F5~OADC-J4C@9&cL*~xW&Mdpr7nTzGIJvz$| z3Orc%;g`(%jEh{)_P6gl)OTRh#+SE)zI)6Q`JVBX(Pgok)ZO6RLY?PYmN|D!PWNp* zeR6(r)8_4rnesgcxSr4aH}%aP3;8oo%9<;_Ts5^;j`xL+S0|-R__z-ZEbgI zmR@kP-}7qK1a5B4v-vJ@ZtPQ>3T%b_^HuNK?4JJMkH+k6AsII28I3mA-ffPOH7=A| z#Wcs_^NU$gN)IP)5?>*FJE7t$i+}8-$JVUcJM^aRd|?o)&7mxcH; z>zB>^s-a|-cXzp}j#8MLS;3B0exn_Y99MR?mff6?yzZ8%);`S_PS<+phvv5}IdFd2 zYMyNWP_@O&U+q}6=kK?kE$4kFxl}5ornv8D>pwC~8WT#&deSm&#HLrm|i#b7ooGE5K*NT5axrF>_CPZXmDai_IJUWXN>&S_y9O z>wV;3dV72J&DgNrkvDDLzc1JL#Bl7Xch91i61NpSZ_X8GPX1^iy-Lk$Yhgu{`kUt4 z4{uzuo+6vNG_~-G?r;4+@&AtYi=Dsd{#Io1nsxHRK5H!7-|ZFt9+{%;E%SY0e*5+p zSIXzf%zL?{qWD`xuG`LpQ&;z|I&JSdPn6d=N4xfVzU?}rwMz`TnNy}7X`Z|;|6;*5 z>#46w7E8Q;W-&u6$!@iUcBr25dzq{&bMMD>o?Ghid_vGimKS0*+r`s8ZYn41f0?|w z>~wVTvkR*(F8BH#^6%uu6NmOR-_DHCda%Rq-E!C7YVEB4UAq|HEt~7v=NETvO0D=h zyA@0acR%@fKJ|=2ux#ihMyJ(Mx2BxibNShwUm=zYCoWz5@y^yIy)&xY@78_&&#>z6 z>;DX)domxzU2Z)s^nTNhz^v2EUV@uBa;+UBzsqiOJP{=3c0zMa9^2`dXFHa?o6Yb! z=vmA{#!cX;p zjjX~B)27^hSj#Se^kCZ5_O;Fnf1gQ&T`M1FRW7+{=?>@C+`2K-?w@7 zhP`X6cN}|Xq7CQ2$Ny=>e75A24B%50cq}Kfv+&{^N>%p64J3hw*@Lw&E2r#`lnJaMB`@6?P*MC|0qiWr$Buj=Z zhaMSpZ*z8;+gtHuhd=kG<)Jd?KUm(X*2v!PlCwIo;89kl;hdh;uO*H97a7eKIr%SP zuU{sY%(dOSio26|w3m84O3-dRy4vCWqDPq=7Fi8t?5SOoH$^*1f7Zy3@iKW;$UpU! zeUaasLkfqJXH7SMCy;t@$yc}8Te-Cx*Uh)xz3p$k@acukKd0rbsCQVqjMea_r|};R zUG{sanHypoc2rEB^Xx-!IJZGyLR!^|fOB5I&xM&K3TAgt*x!55rg6s9vsOzy>bhSw zeZCewm8o#m-8q-T-?OgL{IET9sXLB z5Tld-VzYeWwwtZL&mY+kBYkIWY{0+90%!J5YyLB^cIDZp{$5_!#Z$NX`sFiJ z$m^@Tz3e00(B95dP{5GG@^TZ~iu6vgxlSv7Eqd`}&cy|GUZp8w`_vJ_sh0TXZx=GpFt?5erk8yr|LDGF(xzYcTKxx|CA&D^%ar-3{z9T-u)gU z!ufA`PFq((y;I3HnY)1*auK&1w`ez=YHEJIYoCa?x&zmR%%d6(}-seF( zUfb;6CV0p0gQaYl*|UjdPRrBpzgiV%ksB&enmx_o_JZhBy@n?gPL*x=&tNp`oc^yF zTpGbUzAU@)s=DEr_3SRw{*FB_7+!BGu4?CwKIvU#R%p01`BKTB3KsqnhAWHDKG*xc zE0@tK@crhNBd<12Q)F>h)vsY*#JY8su&cf2j|ulUsucS&ZTn7{T5Y@kpTRyf^;?6= z$`37j4~L1ShDDXJ_c~=%Gh{ru!YlLr#fo`}_m6F>3zp{Dm9E|XNXRLpc!{~I$z9nA zOD-xexL9~?zhH(0_hro+hiv?WHw53gvdUlKj-J}(C00CB%$HuZU$KJ8EM%FB^PWl9 zogQcW)|F}QjmU6ew*3~%@He24C$L!k*M0@1+1%59?LM;I@Py74zBhMPEcAc(#Q8vP zD(?iFM@}W$tFjuUb>~dw<0zQ(V(#ZxWt?BOnq6j5G%fz(yIf_x&^7*4ubKU;_O4Sr zJZouKkz3sg`OaklD}9fylezMvt8B-sXUi@wV0C&|xTtyCuk=?|tES5G7DrD!BRl18 zag3b0{LxK|`GtKJRv%UW%=e#Rmw823`ioS%g+IC)_HGy6x9XJq??AqX@0MO|DOHuu zGI_r0dRkdbY-{u8-kwswppA-LQ%)P6Xo=m`|MJGm6;cjIK7Wp`>|Z}+V^5mp>R9&K%}REATikJa`j!<;`{s4t^U)P~yQSrVnAf?5 z3=g%A_xrUu{3ov9 zv~*CueLnK|WKLgpSLSJljz780@SkC+z%V4d43ka85qgN%fC$vlBR@*!Z7?S9ERu zJ0&>rH%Hi|?8v{@x2$-cyR}zO!}?fwuKiP~#k)Uz<#zw$E~Bx8dG5vi-vb`={B$zw z;q|B-x1Y0(`INLcfZQK+DbF? zM#Nh#9h<#JK~v5zxQ<;a`73focbR?Y+gSUc#fP`(glvDY^qrpVH|cqjOd%#h)tYys ztafwNxYoYj=N11wdOy44mYG*$BjyW-ziwr@b_5!@_j1eZwol0= zzM1U;R*HL9T>I;FG_3y0+S&y2HtCr%SbxxiwcMC(fJa#FY2JN0045 z=!b^~DyzF=6n;i=&w4%EM*XjV*RJ%;UvGZIh%el~Nbhc|^UbK|X*JtT4h9Cdo@TY^ zSDwvmyI<05-}-X9F3Gp@w_RUvDakrH-|XXBzNb@eRWUDi>%O(W>OaF2?OL9n(N9a= z44W!T;`j6~npD$U@g#gx!LMSj0Od(L-!(L{Y@4CAV8^@1yfy~k;(E?nJ6LLG3rl3+(seRj$!7{*&YgE|qVl?~rLv4Rj;7n3 z+t$5WzufoT_G^_oGec}F7rp&i7Pt0EM`=I;cjV>2Qj+Rg{85VLxkL^H^5x+{z!@0ZfepY{KKan?6 zh-=sE&nKlyHGg}~-d1q#!>cMSKZToRyQQ>_So^O#v*1C))Je0dL{&X*E?f2VBKs}w zTNYl$tA*mvmA!iz+Wm2=cis1}>>cwg7ls6jXoT7bFDhlbQk=PaxoPR4D(zW`hn*H5 z-IsZ6LB=Y}&6$Nt!4 zzStW#C0ZlyQ2bw`xv5fZ)=oPv=}0N_D3qN#Sbv{O>&K$l3!2t`Y3KXRuhyE%{AXCz?o%87?rJu}>4~L26PF!& zX2bu~U5M-9L(VN5neFQTxCJs^zJET~OW{9*(ccT@e^%ez_}0FC&a*8O?p9a-`MraS zPvBe90*mdda?|!L75}q7XW9OWtj4Pwx?9!y*Oi%`UwOdgamcBXdz>r|T#l`Qe-;Up zntOlIxZ_c-a?mpBQ=}!I@(F%}g#{0CGG0o{MLoK_Ok~-QWtY1W4mB^l89I&mp_bK~ ztV;_xHMYLhEqD@Y7eaC9?*)6kI{%1&KaAs@H-X6-GcRlAn z18?*Zn*)c1w@m8|F`RU7snoIs8&cz6bH3Ht#?-uR@xQRi8@^28Sn>X9%puvYuIm>a zc)$Fyxam3t>$v|62M=6N-SO8=UYFmBC1)l@HzqD$?emhR}sfZUe{Ldg{ zqP5j);nsWK4r>+3rySom*XYv8>QigqHcQ>vR;POSkX3cVNwdEAW1B0_#MHgm*~4ok za`_)l{W90&laJOm-z;+wp1fiE^yyr(Qy*!D zX6PqAWM5SFj`?t{wc;`^#XEDvH!rVbnEF=xwv^e;u$bJJPk9ggT5;QVdThW)i@w-x zY{$H|o%prJ=3aMflc>RuZI!ELKikf$Qua@3uKbL(2fLNT-gOsjI?3IVv&;B;9`Ey? z!I2AoIvv&DJw- ztFF7mF?;S5=|Y89z2})kw%n;=?MR66FAUov6x?5*KCZ>(*ttaIJusubNeY+7(Ad*($czYib3S}pT-;5+p= zIg%l9Uvjc%&)gQ~bt?>e^$MSeuA7yAQRaLpBk$XQ>tC3HSM0oQ_{Z0pG5OsJ!(QQX z-{QAt7g|j<6NrDcGxdOO`VR}AWoM&b{aVRuR@5RLY+9$`w)E7k2=)0!>(_AP*LwZE zQ!DbZZuR%#uWlFSWVgTP7rxIq#l}L-Q1ebqx@*ss${9`(kG};6t1oIhz`369YRW&` zL%WacdHf)6Y2J(N#qLk@?bq+P8&aIvJon*~4Jp+fQx69G6<%e3C0NVlR;t}>E$f0x zEjiVusG{Q2sisrS9*P$2c^JiZe&3m_O#-#Eeod7McU9Zny(1($AW=8vtmPmqMp+(*DtU+Wv6sMEmruhao2;73U5^`I$By8^C~i)iEhd4e6{H*Uxc)N<@4nsnZX&k=1F2K`&aE-yir@? zM&1hbMUP6?{B$b(%XZJId=aa(f8_1FM>Bt|6gg}+zjsZZef#3DbLzWdZ!h|APx|1F zm}94BUdfrNS};jmh&RHo;41el6Kf_#mo>KR^(AC>#^ zrZ4%Uadj>KisLDQEzc_ocQ1ROx|p-6IV<0C^0I@o-9ytgW8xQ;rZvj?sY;bfIkzis zdNot;jMh{i?+uL{S61Y2D7hH);mWfEN}sP<9y#D<@=u^*)#B+4{~1bRo{NjmVU;;# z6L9au<)yrZ7rp0szO>+06P>d3X`x5{i{1-yg2j%@{Z|=0a6hxAx@T?-n^%3C?zS0U zwl6y|<&^&Fg3jx%J9q4yxXJmDZW-e(IVG+wueUv5j7$!H$Ef{1rB-I2;@|7M&i@(w zpNOu{%=BCBb&uE4X=zk?g>iAf8rhlC(?cJbzx(!;Px?Yp%ctYsY#R~-*ZOV?S*9F0 z<-r4~i~fF}T6om9I$rhatM>jW@-E?lGUw)1r^H_DSR|OdiQ`nRmcLGFjOl-dH|_r! zj&E8ZDjoc0e&okD$5*fV@NwB2-Tw?72@jslduDWOa@(70r;@LHnsq+dHuBo?{|p>E z-||*(PWTZVVf0+WcR`engusmFb-yY?ctfrF*6-PJM8rSj!sC|$V(+@6POVE_Z_^Py zy-;GJ%#|yv66Z~uTAS6nol{`d#kDGp2iy+d|H1J5#dgR0CD-rj=NZkpE~nIcj6G;} z;?Bd1+O{s<)%8zh?|%l3L-Y0*tyyq8{cCuL`A(^DwqCEqOslN5j0@*|!N4 zt!=mbx^pR07_Kave#CmYDsOc|^yT1KiFaAoj5w`Id@4#0Jop>JE`MUJz@DA&E+_^I znjLv6Bqe3Vx-a1YoAB(2oeTF%JLxVBTk3G-dfS~@V#2<@o%JN;Kf|Vzla{BL zbL?Jr;z@Jm9*5`+3cc0ZGB4kA2Zip|n;Y`^#v#e0WqYpj^L?}8=Q$>@;Mm76J*<3d z%Ht(N6}NRZh;7@FdhW%_kP4-_ii&&v|6cqUy8k2pX~|D4G5+Evw|WeoJyAOy@t&f_xQ`7tZpmUWaYWBPLwbCHMP0deCE#fOG~WQ|Mdu7b|brl^Gh%L-e1vq z_MtBsLly@gzMa-OOQ1b@bGOR{6W0^pgG_y`M68t@u4eY_W@JiD73(#dCgk#2X5xo^ z%10Sp=j2xJQ+1fdUo7?Un2UePbK}DY)o$h5ONPovEj2UUS(dV%kNbi7EvfqN{`H*& zc`vG^QeIW9%Ukhju4kLO@zo&dZFhGa-g!oC&z82`&R0FIrk`~EDs9p|)oXn@zbfB{ zM{~^|Xj;W3XV$qp&O-ZJ*Vo(1ZkLU<%Xc^MG@sAk62)3;FI2u?r_O29 z(!f;Vc~8UA+lswcZf0CjkXtQ>PTWo@a0V-skj< z{n+HG>5I+^n8ubC{@!4+{BGT)_t|0lw##~nN*|9~vHSghh7`}~wnzDeEv#;zPF!@n zyZ%tN=i!o1p{paevpq1iobu&A1Bd5FrT zciNxW&}(<9v^R43t?296Vphf;J#R$_@3;JG!mVndsU8P?WxbaDay!81WOD1Fdi=7J zOFkW5CZH#z?)pX}c-j4zQ|%|lZ+`Fhw(c}f?lJSZ!ZW?Le*Cz3meSO4v(l!$YtwhX zD!aU#f${vRl{+)G9#U9tAp4X(_1zP$hB?a2p{*Id^{#%>%9bx?+n8E9u|DH>IVf>e zD(9<3*8DvOta$ruFHZ~UUAlBZ^GWu7OHBHt5|pyGY&||vpy5^68$OBcT64V;44)j~ z%X;j){)qGB^4@I^6@#Rg?TS{JxN5~Iw+LCrpyYX%E9Ng+m$7%>2K99-ugbqFTM<^c zZTfe|MKcro11xebdG3 zON-ktXj=U==x$C~9dYpsBYV$|?3RZtO}*}?v*g-cUO#9^(0gSku(a@DwRuz645x<$ zj=Q^8?!T(JRa0up`xAVeec1}8^H(}o8db7n{kyzt<)5R~_QGxp-aI{Ysjgee_Fu;3 z7~THkSMJDNXYV|eQN1?j$(PWX54+Kex*{>{^6G5nNN)-iYV#^c2fK z?OXHF++lrxriFuB<&@`^o0cvzOMbO>ZkeaS?i}6y%BgH^>_L3fSE#tV{Jra8wqk|v z;?C!r3Rb!pO#aBDpBQAANnQ294XI@+Sp@LxWni7~fUSp1M`$p?|oES~ZjZ(W!o!yq9-B zQE+6D>79G+WnWX}+RJm~uevGP#a0x~S#g`!DM~S&(ZuKgW&TnN+S6->Ki+$#Dn;V?DIcTw-&G}H?==t2=EB$tE z`jqz5w=$!GE!XDqJn5X7{if$HFS{eJFkQOis_7)d%`tCxOo{O;i!O*PS*gZUoEg0F z$*-s4_D63VdvYhh+G2}EoZ?%R>1M*N7Q1(4`&E}l@2b&XxlXjFQswp25BH=moMBqA zv6o5u^qIGBqxn@2#?Ab_-uJ#MeWG2*NB^}6m7 zncDbOyfV5{46~z;TrPgRF2tI*aH`j|_UWnncy}(}7p&1g(`>EQOqs6yxBOkPeS$f6 zq}Qkmo>?ZHV(uC6Hq2()#!UhDp8U)!UZAl>r^+kyg>c-lNy5%s`_(`7>$V)aYc$Vo zord_fXJ33u4wQ9>7hlkQd8LY7Va}`eitjZxO?!73YwTL>>b+4`%rU!Z?lh}j^CXko zB?7ZUkL6!k&X#2oWAeu4^RtK5?RQh3{0$dodMIEopPzjq@k`&zDKE{U>iD{=A8k>R zsAMs(c-iU7MG_SgYaJ4bUbQ@2 z?5b-N+)>tD@!eVAZi+@wsdMISK89A_+@)rdSMFTbzwOX*kAEqT-8(NH=Bf$3*5|T1 z;(~}C8$;E~l|GhvH(x%nQr}mxs>t=-y660p7x5+(udLY{xN^r9InS-p{%yuwo%?)u z`pyq{zD-J%{YQKKDM7|J2p?Q zu1gp-W@nqJ;X}jG&#YE2jj}P{n>w~ zJ=t|D_vJ^?ean?*+NXH;?Uwbs-G2DSvaMUAzGoGm&Cm;L*|EyeF&nNxuX-m|N zmNcwUOElecclm_r-826Q>eg(%r5&*B*~}}}i%gzZ*d?wycJq_mJSVqFi+0y8FSQd} z!Tv-wU+KoXdC$`ddc9l(?1aSLO}M-N&+_2=cJC+txv-4=-A}cxk2p?#inII8arXX% z&9j{v?$pFyopQ4;>$v58-^Rm%QzEXhO@P0b?y4pq)zE$kvrR63!E-&KWoYc!pMHy&vwM^7z6{yu ztC6k``&>d-d{0Wzzk8>Cw&ub$@+ln8mM5=!wV;#La#8R6GY#2=27U+pR`&fYdwRO% zgm0<7zgdoM+TJqZGwXI2g;_`~-SKYM+lMC|R!`hj?Nppq$avM^#@m}m9vaNpxnC$X zZHvGg(S7q&-F0B(dr=|^VB6d zcdxHFz+URNRz0m!&r*0vYj%W!;!)<%9VcY3y;mvn%{*S3c`AoTwqe3D<;)wwi%+Za zE>DiJl-<-?z{yd_vux*K-OFi4J7#Ne9G|dDO}M*Fup(j74vze*OwH;lxwgRxhh|Pq zwvU~8bMAzL%+IuC+*dt1chgEcdfDO4Q@)1Rtzfvlb4~E^tKzpAK1G=Q4O|-79_yCM z9`LZ{W!8$=#Xc+fwv=$`u-**`6}+SLFJ`~O<_(s&_din&S?)Gx+sl--Ps^D260(GS zjCSwj>paY0=^<&YdSuduM~#`=Ov@T0z2m!F&wddDD-tLG0r)r%8d64{upL@2509(5^~CV^$|uSW5RSbe>r+Y!X$HLo_roH?zGHP_Jg z>N#_fe2W*0r%z(rwXD?IaQm+FQzv|QDct8}uXr+(H{)5bt|1LXR;sn6&E~kp~$zS=Tpe?Xa05HJ8$ydh$yu# zc(~n4-9YJ9v!A!btv7q%9g z)9gFl_~38Bj+sB1u1(aDEHZ02_Nvo{b>6gNtFG-ZJ>W4VKJu;bO254=Y|Fhl|K)XD zVYt2YgjK~Hl_{@u9;*wVWRUX@ylDD0j+w7;)hw2sk0(BB-J>TvIZrs`(S;6WMdpjn zCV^_=V%^QYI}4dN?Oaz_^yn*V!}D4ueku9FY{4a$kK9`==kv@=dP~6bf)eg4Aq~58 ziq5UzJbC-Bn8)r##j-D-G`s6g7yqz0Z^Ggfb5)^Imz?((3k$X{Vkr8QepWF>Q!Ok? z^$+V)u1EWv5RZe6WceGJM$H#jUL6xpxX#C%+}wf~@tq-x#!-)oG2uai+S zOLomv3fYlbU=%LHyEEvDVDQE-t=chldMl<*iAXWX5M66zy}(iUBHQ+NVNRFKScF%H zlymXrMTIEcnfp8JKxX$&77t}(R>MHK^E#}|G*K~iTbIZmPM&(nsifiy~{m-C1ZNkXLod3SW)9N)vEFjc3d^~izF zd||Wa=a-Am(#?zsH-0(w&1=)UTY}~L4qL=rT(a10|0Z^K{_k!tDx`gi+-@8X&EA%r zD7=mBvdo`NtxhWHmsd7?)_v2yZE z@e^6NUO7bbs&PQE+vHWekGtmfJ)U^c?XZU73`Uvdfh)saT;`hZE6(d3)$=D}ig`hl zAQ#g+aUoOoQ!6hstLxoJwYsPkqcFd+cj>tcO5ZKt+D_Pe@cmyd>FJhI?bl4X+hzy9 zI_>`H_a>{KA3`3#{c*$a{1&Z+?;qxMp3R)V$3KNdD(<@6iKi06TF>=8V)kB^-mG!( zI%`mRxPp|zhOCt_j-|$mcP?vR{t_nq-E~p&w_<8X!dt>7za?kkss_L0*v>T1DitTVd{@ty6#xv{b zrO9DWZ@lYv_lQbl-yX2}fP09N%$3}URuk4q-Vh6wQuYt@(_zbD@5-*arX=ZogsD_q}y zmF@pdkl{V@6R_wd?a(2A>By*$h zpBiR;H;#>;T7d^R+=Vvf8{ReV*7J`6;Vw!rR$*9X@M(H`e#y!@}T#-`Y`^yqecP`SWJ^ zwAn{GjGD_8`{mZXTyMGE<#yKXU~`>a_nykF*dx66$*fxwuDzZc_RaUqxlpUzrTmqr zf9Zs9nC!58ptDY6-fa#JZj0U8mb_w5XZ-Bq)8&)p;=3Rht}#LE-xo5f~&;myg5G4=HfPY?q991(qAn-EbDf9md87h z5XOg@yUSm!Tky#}H8)Q2@AXY=|CT5{msCH?(SLHm!xfHS=Xn0ut?ao~Z@H0hbc#js z>kav`8CFvdm0YZLyAzmM&iKP=@zR{E@`|0)woeQ%y;Z*?hqv$%=Y>y> zXG((X%b#yuub?5Rb?o(-H(Kwq9=$A5vj6G8_U7D~7Fp?(HMz%b&)MkxRV$Bqi+;xW z9Wi{Y@gB~*N&~kyJ}C=)l-W>Mwmvo7X8A0ISN59B?k1;W^)%aN>$ZK=>?!pxZM}GY zk&LcjkM7TUVgBU_+ppafHM5BM{C7fyQ<(?v_NTtpC0dUz+6J25kx_rK*GAp>qQuj` z7kW&JzVpB6c)3YAG$&`$?iJR>@1!o=w3^!P_#$-uv~w*lnvWlTvU3?%*Wq_!|JwWw zmRv5WwV9(ARIj0sweBNR?58jBJF^bx{t}7x@7)`{YIpFJ#np>S{T38lN_i+{k|A7f zJ7ufT7HjU9n~rM*cCA_TX6xMvOJ1;V>pa-^WzLEf4`nZA6i%Cwqs=eee)O*Uj{cU_ zovj7N)+sac?qqLJ*daaNdUwvoN5ASdgCG7~tCv%@(3^SY)jp}p)V|iYk>9f(cJEGD znJ)2mYeO*amZIlBt*xDBuQ-+Kc>ZMIxh-)irz)2E-@M=Mv~S^bwI9o_Zu3)k>h&Qn zw=nShNqMb}Yp1&`crGVDm3_O@Zr*Kji7_Sr88qLens3=3a-QdR`wYJbym;^|oiLQ{qpR za$WeX&FAj4wxapzgoM@E^;bl1*dChpar>vd*FL4Ur8C7$Oy52%uY0xZ*`{}{dWJ}U$?Yw37W)|8is=XlD|LIsb~5w4Y1vY<6$vbhTlAzfG8&)j z{fIq(I{ReuPusflk8W}Pi2ba$#;S5%V!%JXPLYzn7Ha*aQ)T2VLz80K4qzUHo5ech*!1a$><53Z&n6xy!|<# zu=cWa8e3kdw{&r$>BDuKXSzMf;`~(-aQ~`Q@DZaj`^xkFi%k61UVgDw$ua!)wDNZs_#HAHmDPSd;L;wrydcj*bLN}ldw-1TQ+&64Wr!4-#^pWY1<5B|@< zxx9MM;*<9tMLZG-6}+SUa-wb2raPtblWsoib;`G4!^TC|!nf$j@~gak z=B^aFdFq7ghYm1`TO8oLz5Kc3#>T_CQPnG=wAUTDYCGljkt^Pxth8lrr7_FH_)!A3o7F4wI3vfne4JG5>+ekXdi z|5eufV5|O<5pzlcPv!tMVViIE?Vhb_0>iq_=vi}Qo(jm8 zm-c&HS!TJ&Qoh39C8l!a^8XBP3(YPq+%+}(OxuffnN3SCT>ttcM3B|@c&(M<-eqs^ zD_>+cIbqEl{iNnRT}J1#t8ebe{+(jm zx_i_7Ivm{SX>g7A1cF8~0CsgSB=kS31t1CYq&JT%t$oGBH ztZTpGCoGWk&9V=1J5kml8&#rlJVoY?Kyyd;(UWVd*XD<0N=$osm+4uIx@&n$CEria zQ`?Vh?tXS*^^E+y1II0H{u6uq+@?R|dhOn0u4kWJ+P=m2%72F4bt{hR%s<)jY2H2O zzvd~(oq|dBYFoDFMQgWB_#1MQ zIseaXj_pmRL7Te$&e=yXsm)0h6a4aN(j$g&X5;M@7t;SIuz2|DcRNniGZ0?zcS5p* z;rT_Ee=lQXwyJEVu=dYp6vs=FPGWwQ>r=R6o-d=um!h*kChA%CpxznQF zf7>xuTcP1d|uxnq6$p~n{sC5!kb#S~mySZ_OF!=~2o?pd|k)#Y2Bb;qtU zbLpAs@-<}E{rz(+vV^nE-8&urj;ltoU;VaB>izXbs3CvHU65%ZMTq}d; ze`1>yUKKF$*ZI3nTkyeJ;n^!;`Hwd042eh0D_{ARJouwwA*0@}Q1DCMrnjN~$nt-p zUh(<@(Tf*eOq96r{A>%Skh^KEeYpRr;=gh3J9@d!b#eOZJ_;9{I;UxqaC*e2bBDRD zQ+L>g{bx9meL^=pVK%eS+Kfpnxl_;Hyj1G+U061>Jv?=x?RkN!N^24KIeeWtP zn&G>hSJkO`RrB)++qe9Uwb$(FOmx_^U{dRahgWj8R0Zt*5@WyUaS3a#P4ijLFUt&g zMa|E-t=0}<$XR@4S*%f6!kU>kJYA1FsG3g9uopVupTQz{HGQ41)IWtc>Oo6hWc#qz zKE2ze)_iy3QIGi_)~-n2#lOY7fUEM;@tw=VA74D>zDkwdI$`Cvo7o#G<;_3Mb^5z# z+MI7O7YpA0^bXj4>CAEu#A%cvT-*4+*+z!U9X;(sjyhuec<`ChvPCT6lH-yL~77Z0@X5lY4niW8=+a<1a2^mNuQQr|uT= zwD8&O>C#)N^mx6c8~c@&SGi{kZs7$lWTj?vwg%6i zq1F4e$aY#;>_wr<-`~CXCihNQm)CyhiFajdwXyFl**SczZ(I9+Htlh~`Puwa+lK!P zmo@m;{|MQ?GUV1Xe$SJxA(_t(&HQ>Z?WM*({~1!aD^||syC<&8Ec1{Z|GRDG%gt}vuNG>zMJ=lcQE+p4%2O%-?LUK7^SOyzYD3C>eyv~eiA$b;HW$|; zq03DjPfy=*bv}IJi|?Al6J|a8eBQ+Er@c-LzDYwrsU z+j;FzD)pb;U9jj_!FzEh(NoK>-;25%B3pCmxIp;U-1cWlJ12ZA&3|&Dx>T+z{!*jE z_nS9XIzC*|5Yn%b^?r)hbQ6>0`SrT_ucS4%{IUCah5zdQc*SM>oS(Q|EO$B|34S@{ z+qd~uk8>~eYyAgpC}5Ab*)kz~TZ;V5RZ_p(<4?Y-_wBu9s3HF&@5%Zni;OnyO3>kZ`2BNMsrV1~r!DR~dG>SL^ys^SPbX|&`}cEg?0*K01pb2i z3jCKRHFdAq@>8pJ|M?FK=4IPWUNyh=I?hH1rr2CwCJ=I%)g=vDp^aL+k+`K8jpXYEz7 zO>+z{-#PwN^L{4B?dAGK_g6+*E3Arlb-jD;+J~r_vi6}Fq ze+Ib>d-wkgQyxTB)EruFcqqKSKu%!QeeeGaCMsE-de`F(m%aBsqI7x1ckAg{CjS}U zE!}(Deh#DDjXw`E-p&8|pW%)6|04{#0*nkyOiYZ-%*?EejEsy742%qdiiVDXi2{X< z3KJJ@Jb2L{q2S>MhmQdb|8FsHFfuYQ+AIG1xTaR(dzEHy?*2CmwuPTaN?IgRxlheb z?{eWxsjJ%j8ZoB|yI05@Yg=LFvUqjfi-&e>dxeVcUVFv0cITz13I$I+1*N^??H^>t zdt7~_u+epg*b0T>mMXcc$5-jNg&flExL}Zay8cG~$5nTo`Wu$M3t*XWvTfnyEeqZW zM`|zq$h=wN+V_tdT!PoG?|&4~a{2JLGiOehPg;4Ug6Y=QgJOaaniKCBi^WK%7Q`r= z3)g>ZSY6>_Ica;(F{Z`sf7qrmyzJfftNO{uk3rMB*BjfdxIAN-R_(G4)xP#l>Ply? zMR%=TSGT9Lzv1qYWlJAz{Lk>_N%G;HPDk%va@i%cNBwVs(M|u=eNV5hNf+QXyH?_K zBsA)Tv(4T0f$FD@kK9v zbj}`Lb$5x#y8e}sN1k&X`*@dKpf@~d!Iq_K^PU#4zMj&%i2dE>i5#Emk6E}zF4pb- zaW3>qu4#i!^YIyd_djr4{&G!SOXG$^W2o}+g)5HnUQb_reQxx+^q5sGYZoQ2f7xp; z%jzR#|2OcSRr0h5uEa*g)-Ahcbu?FUE${eot~z{+_~Rne?&<3Jhcza;y$)JfCcL@r z?6zM!iYi$n?K4CITN0`|HXGWPoJ>peiNDa*`;|9CltH zIU3qCYrLbsNBm9Hv0So=<6x;J!{I|uw#J+loUpO`N#(P>PtV@7|NBdA-J*@}U!8MV zwE45FVdkR3gl&8L<`n)Ch}C58TbdC*UviSOV%|dLORAsFERCpIEbJJ!DSDE{=Kl;8 zQ^W(hUK)xn-@mZ%S$O*?g>pScz5DMMJM9X5F>%#{D?1#FmL}gad!(JMre9F-%Y@_f z8IhRyX^yM^E-egPP;h8Q_Kc^NuP#2|Iy3FsI?bfQGn}QmIqN=uSz&egsz%l0>;3;3 zyc!nnh(El&kRx~6)&Mi12@?Ame&tw5Tk7eCyXx-as5o!3yQ=F*fS$;cU_W~g&wnqj%%#h1Q+bzJqcr?F)GsILuQn2^1_ z@2^olPsV?SRf>DwHZ+Di8nke&DmIX^uxz|`%=^^K-b>~+>_V*>PP2*Z)YsK5fPqV7{7BJ2g9kiriENit=BJRKR@Tib87WvV~+iGTUH4Ix^>hnsBBONl z>A$Z`Ro1_?-*P6qNVQJ&M|hdmiG);(tIg&ebA`|EdDYBbw5CYs@``YkI>z!9VX3=B z_8fYA!eYh&-r2v8a+W<@LXa47zfpgw?|8)G&SXs*;Dm-%zvvk3A`;I9d*R^L( zHoLlc_3NEmq~euJt=X^FJxa()pCd5$k{!qOX?Gw0XSig>X86jnVMYG3@9)kC1sJ!m z9;DXP2`p+8kNT88&0Q35JSFp-l5+B#eJ3*C_ukvPxWDHf zmm$k)E77S5kq7?Fn!n_NEW6A4t?@cpYqNT;rA|C?L2B>u<|(IRYb(CjS9F>Aq)Yr~ z*p|+IY;O1w8Eszg?{*ijEq%1M`TnJ+Gs3Ey4HpOAU$$UXZkTgf*mc8&Kc`g8xh?cw z@cfm+Ien5V1e+b-6>eHT=RZS+_}iBmw;#?*Zdf3vIjv;%gX#Yn9!^|onc32?UP}H) zrr>SOV8x?)H$=lOPPcKqn-Dv@Uws|p4yMJn+S)u`X)3$^ZvH;?ZVJ;urk@u!6u;-4 za&Ye-uZ-2DJO-N-XP#Vra>lgIg-`x7tbcFBET-#PEGiH+S@D;_br6 zvX}pon@?Ek*L}8>sn!=-rCi&lmikGwUw)6WLYU>JQ+5}aj!)V;a}iT>`5hm|H+`I$ zXWgB;uD&u8-d*;ieb?30u4!I5k$Vg8gui_mH%;~A;@?kO)^ckVDRbq&=UDOHRnX7j zfN0bFZFBCtYpR&X^k|lxQ^qWjtCdp{qBu9-Gh_|n^(wQwGUvmGgHclsN&8H{$gsXc z*~7PU60_oqwF|3+^sM?#BUs}*re^Ck2lR#*=Sbz{PCa4DzVz1X{|tw-ML&NHNRnRv zivN#CT;iMA8k?`5+snP8fT8VMf&V`%oqxBO82qxePf0IQxm~;EV@b=!SU+1UafTVk z7H_}Wvii(Am)&w69Xh=F226~yJ?EQiI6bruRiy>)YnY>7G}$!Xf9W3idpjOy-|tv# z#wJ~?rP4d|&7-3VQCl4Ip6~HqvD@O6e8GyV2SoE82Ar1s>F@CLN*%&BxaanfWv(wHyUN;1lb{=2aC2@03^SeezjY8qYw%!}I z?48VPwe)`dKMvW=9y_PKuKLO!Z5gH=-B-WV`K~^{;54zM+i8Ud=QRnOT(3EC={lyA zWaE2#MVz)g%2}7V^2m9+>5<7E>lO-R?_1E+Qq^l37B;I%byn){>{*W_mUgBr7t*!3 zX{E4dch5sD-4e&uA7!q8UpalnvYhV?$EGcugiPOLcQu zSB0b)Sg7USOYXYWoD(u_uiuj$G2S_bqS1SfhTZ?q!1wZj;OgTSI3G83^D|AFbNl)i zhoyTyRE76Dgl#)4daCmEgFJ4WGyMT_;W3HRW-~qJNiG*1XedeY2nAkfDUe!q4YY@9fStmlfSE_v!u1C*@xj=FP4D z&v0tP;RR<^Tf?q2_g6&xXK+}5fr&M5nc=HvE8Um9TwvYiGR^&B@SKCZM&}u-uKtpq z(cyYeaetQ7t#F>pCj|bc-_uZ^@r>=S#P`0?Rk?AG9x~qCX6`comlKaj+@FM2$+~$G zzxM0re|!}hUF&`8>aMTH#m|3_i=D9jpsZoQ6^Z0|)2i$)Kc18)V!CF(-=g@;b$^#7 z2xJs%moXlGn`65sqh~|V<4t0-j}=`x)?jir;(6p971m28Z`wkRu4j?sy&>jp^fR+_ z|BTfohjn?|0}dT|Dr-=-F#Gn*sA;E!U6$G!cwdp`$d_P$>8%wb|Ig{p!YyAp7e6>V z=@83>l8;8GeCi$aXMN?@%}|ZG==XrOjl<;&3$N5aUsyez*2X5w~LJ{5c{JbUl4$?~MC9<>LpCdqG&L$2f(yl;mzZ~8?e1yICAg9T3&S;zm}DhhwQAfNb~0I)vF>?FWpOs& z-;16C7Zx?eJY8(E)J{d~rNKwt9K#Fw_fngux&~QaIoWhtp*QM|*pjd5%frts`NbHu zezDj3zh0Yam#NMu&idVTYqn+c+E!luTVbXv3-&2pSXCf!!s*TP_=~HW+)AYUZGXmS zd2jfYc!WiD&&2~3bI%nQ+cZJKp!r`p3+hxHdWM`@;bY_;T{q2sR{_{nptAxj?56;WNAbHax> z+mF~={jkMV8;uE^1u*Jhz zb;r8p%q!u&rHnYD4Hd7-g{m}jM2S^FH;#W7Tj5QRQ0fI z+w3bB#BcvTa$>E>9hs1`7k(cLxF-4L0@MADjM--5G7tLhsm=*nb>XvQk0^fz)0Ww( zA3`itS$Cdjow)7JWB&xsN2Y!nNB{72dpISv^X}3xH?cI_ZOeE}1 zhgfu$^xV3V6a2!F>+qYYB6StjeN#79gqU+Jw4KQ)zXF7OI`Y?yK=d1vYCOH-yUG2>xvlUc5^BOvdS_hy0MX@3O@7I!Sn z=~GA&37R*fIqi4zQp;+$W9Hg=*H?7~_I#Fmw9mV-B3ve3{;pz9!Lc3M7fW|t$W5|3 zpX<2iu>ZZquegs|&5*xT{e1>|yXB3Fl6@T#jb87RSuZ?_ja$UC{@;{+U&LqTu3r=gbE>+>+uPT0tz>hPIl+>+%p>pJc&|JH!^kWK_U#Yu9Mu^Nh zXwJ5Fqh=-NQ)8iPnqTic`Na@i_4rytx&U*umqex1XVI{ut$Pkj-Cq%UMQTdX`7gmt z2Eqjm8?QGN-rRWey^vM(k%jBN^i|ew7ie}VGJ3{c)fn$y6UEiqW~v)8X}Q2tiylUE z{h6U%>%F=6tV{bM!%}NvnR@ou@7}7oJjW+7SC`L(-ExM#0Y-j*mMXFZ^+8b>H4G&DvY{Y1gXw zl7wG(Tr>71U+B8}RlxRx#;*3_#mf5)40@a{>+E~G>BAI_r=4jQQ~8z%U#R-Z^I7xv z@%b^_XSj+^968_jbLQt;Kbx0EXq}N4YUsKp^TDM;VtuGq+qn~;+NJYP4}$;)hg41%Zq>pt)-TVC*iq0SnwZf*UQ zakHOZ7g+X0Vb;>4wbfG#5+eJ)9e5hRI(ok|_jb(+r4JLsvR{XB75c8Gv^IRWwaCR(GZo#w78l@x?Anf#LunM%}z;A zn)>pZ!op-xiFJ=vy>s`8C3r-Y__|tsTYPzW+~l2EEmDe?7c(+GW0~=8dHQ>9W8Z?A zQm?j`zG%EDw)PNcwo6 zc-l7wbuj+Ac(I{p^__)@d;3{->c}4vc=&Lg_W5Gr)!Vm)?0e?BDrB+kgqJV%5n-~uqE@FSv+revhT^2hE3$&-OlrGtbLYJ4ouj-V zmw7Kwt@W;V*r8v@Bk=L*X`|ie4OcmRST10)BJv%RV%DCSe(Mcib}5T43c9niZRQjK z`#9^4MK!83ieJv%`)t9f^G~Pc^;w-?Y|PxR&iRZh``h#%Q{8*E#!1Fxq-NVM*7m$~ zY_Gwoms3849?g6PDFf#RRME}xP3eQ;k%^!F<( zw%zal($Sx$cmGnTbJ5c#@7%4zD=d;5=FV-|5!zeN^mg z_i65~8Tk@BJIZFay-nS;x#(aQpB^{szQ{5r=Zofd_c+!&8HF+$tmJG6DdJ11fs(C$^R*Y1i?&()sboADIN_0NBP4mLx!U;Ux zU%h9~BvCTe@HR`)ozh$4ED%GI4 za8-k7QJTcXbnbu&;WbsoOs5-HO0J0)W{mJ$^5Nim8L=}H_T<0SJT?8IMuR)E&^dv< z$roH-AJ%wf|CV`2bm-mx3=y&$f2bNeZ4KmNmXcd=;y;6Dr)r<(>_X$s%edC9*})Qc z{$7+oE3<*R;jydp`-OWBd#}Dy)z!9o#^qkuw~oh)-o3uXzhr*jJh|tFdGa^o7Of0a z*q6%WBC&Th!`by8C1-DD-zbo=ky+zz`W0o5=eJ*;`K2QB-0Ec0iqwK~{VlUr@YiQB zyr}CldYS8^wJ_af`68y-G0JxiE zqlHJm3tXMO>iY2u)4XonI@J`-b-{&W(S@BW*aEe_>K@pVx9t7K7bT2OiY;3cH;6sR zI@}TZ{IaChr_{DXAG@Y3{m)SHsOZsBhFhDugEhsXC(FH8Ucqv(XM60zqsE2=!}P1uk;Vx&rH2?B2aJd!5rqW zjgu-04wg?@!nCL{O3V2of2&@K-7V>+&hs0!16xuE;DRIqWBtvyrRyjgrn>u6VD^M{&Z-&mLMOJTzh_(0&N2OS{)~0UG%Q{f z8{Ii%UDcnO+L{#=WFPb2{T4*R6l;4^}bH>^Ss~k!eS0P0XTZ zi5*(D2?nvzvRYe;%|0KBt9r`kk;k6DU*{W_$syL`kKUd4Rz3CRvFq;CxEC#J5AE)f zuoV}0m|@6ndpJi{Zf2mtXPTuH6w4Mi8I$zC$0%QYJ9?HbRApv*Pf?U zMs!)S%jcVH&W$@eSy%1u6?ImPJ#t9z9FM^nyKv`KEfXr=|7@OPd$3+Ed696!p{qj8 zE8Sg=Y;k(klcg~8io|2HH#&k1MuJ&-53Y$fu&@^HVm`t9_pg-bgab=75;Fn?1s|l= z&-nQw;SPWF(OL@y^Q`^9r9N`+iL2$?5T9|n)oZ=ml0`EElpoayvR+#HHuQ^0nzUGt z>ggR!uXW1ogre4c4iaYJ3plvka%qzE?>E!k1GlEOzAu=(hAd~-cYI)cmbbAzSVyN&O1G}%#VY2RPU6*5FN#0l%3VLh zv^be}P1_VrqEVipgYN0q4tF<2Y>T&>-||;7=w0D~*GKjy?BjH3 z-gv3xkmmJ?^PfJPvBF9_Zd$m*i$+yEW|+#TZL z6c%+CZfaQd=l3Cj1y84c?7by-_pngznhlQHE0>EuzV^X**0wKOeu?!hOm)5QbNm|f z>bJ%s5o}oaaWwgnhf zdkLJ^sXVLe^4->pjrqOcy^l8y@-y7uotblJX6v_(B%bcd#&ZY4er>pH6!N-Ev4n}e zp(U(PVuyIsQh^Oe7H6K>Rh%O3kvM0AXqK&`>{@{fyhjf{=+V*HXd0ZDI_ZEuTdGwQsAHS0|MJWwJ=QxfYU0GFi<50(? z^&VlZ?*amPQg>%D^(|Og^v5}%%k<2x!&m%goLSZOY2W*gT5ET1a-O_Rxy9~TD36KK zezw$(U1xWwF1-h@>m$*Efrt7%vMXE)Z0{08wz!-kF2dkJ870eQ> z6t{$(;+@Qx+99T3C869mCrP?N$ZC;Ad%a-wl=xjqHqkLRR~)D?DEWOfT=3$NY2FU; z{BrG82bvzWJ4bi;M4RlNVdK}kURwVnb7hr5W!$n0Ir1~}GDEUwxceH!J=`$u+=Iu_ z7e2IaoYbdqOXece_Rx(Jr*2|)KQCxuwC%@{tGknocBX7R?sIJJme`*=e+37=T$$Wg zzwNHFR=E8SpU{SloEsxfGx4@vKcX1J`6zp%dEv)|7r$6#k3@;?E)|??RjJm?p)6SW z(Ij4~Lw3UQJQtf^oifpDKH4$;UCMA=cCG{TJ{G4WSU`n2k+PpD|CZvX6QR~LFcKcgT$^}Tvve)JW=WXBt;9=6O*QeRrQ zCbM>tibjCF(8`_8N78eI-mI|6<2z$q&UCB4>6c}tV8g#FBJ;#puFtWyRQ?{Qr@_Nx z?vr?@?eLMXbqXhb?vVI7tGM9nR_(<{qMxdM_SsSC+JBp2!e*T#YkH5J?#<^F>P%tH zzPQpVSwbOf{vZ0;a>i`e8Ih+4S8G4(tiG1m@dF^enw5p zP5I!kf?!>(W8zQ0ce@5puAcs-$<^f4qIK)d7JZ3bUyxXrth;yNr=Hlwt5zJdSKRr7 z|6;@99pc$$3#OL&x>rX={|OXa@!9jD@xMv^N8=Z;Dm+WgjVtHd=*S@TMS;=L#bkrj zl=TsvjnnN`WE@eAubC1gKl!rg^9z2n89CO^{kQ%jC+7>hNurqs+t%ll=7?LAF8cLU z>Q3IOkFtDRJo`Sr-5R>>%-0@=nJ&*BuWo%MxAu*jJI5nclcPI)mmDZO>hmD8w)*%( z-t8`mA^Jj_ITLkuE1b)yOWm9^b#>!5-g74>{bzU>)GibA@3Q{P)|=wVpBvwuu9WX; zxwO}-oIOd#?B@!_0#iYSR+H6*;4^ zX8%<01TT~6&n!t5x-~`9sV(pV(|uvqqhH16yE*2q{QXN%g5hCY-yR0x9Vd=fe}5;` ztfL+HruqH;jt6%Bb$^f9vjzxPPTHr|BdyG@;vUHtwdYEDK;Y$DWns6zTse1l_Uj|- ztj_Gq{=M?jfd>gk{3d^@by}i!OzqN>841xwB2&Bs`UI*(FRWj1G0p$R?0HFfTQ;rD zxLLG!*R1~xk9k}jmMt=#^!dfdpd^W{;h#@GvRpQYQIly?%7O0+9A#DUmKW^}{FJyq zT*=y8c}1ElByXeOq2QN}EgsGH;*Ts)yzY5_(IK0%zq_Y+nZ_kVQ|XJiX zbO~qA4__GCsUsTsP)~gK{_=wG+-Kq}T&s4+vkQbWGn7hguiXE%>tP8W|GQb9*>g9) zJ)nQ)?^k=5wb?&Z|1^8r?rLFx8&A~P24TAES%i4Zd^mV+po4F&i?(&I` z0YX8UGk<=XawTB(t*b6duP!Wqe&K@BOaDiF51eFu!z}%OcP`X0kgW<|%Kg2;<6+zK zyC$K}IKq_-J{Lw-{@q*I&AQ@KRbZaYv5%?satb#@=O#b>r;w@D#<6Dm{snQnKAJN# zynKF9XT>T6kxJV3pfj2aV&>Z%+Hmg)M@HA= zMO?ONg$JI+uXGPMdtOw>t8?OSgX_zk8rK`Jr@EEpJ)N<+y?s(#oWP^kIzkPvv@S5U zTlBQ9%rEbpdM^2*(c^m?!!$Nq_Oi%qoqQ{?*_3t&Z;%eQGFf6=%rkXqT zjoO0L58r(9S^btJ-`c=Ys$s;II8AWN`C|JlZl&$k`-LNUqvRcoJ?-Tkzjtz1thji5 z>R0LD-e(LeODy^~oxW38yuh3D(eFdE=1u;6AULk0|C!0kPj1^k9JH+0{?VCO#nj4l z;@g1($(N4)l00sx;Z-YI5O(VLqrCZ6PyaJWrSDTxVmFJCdd0>qk@xqXlCd3o+_c!@ zFBOV2@}}n5F7=H*%&YLQXyQ?GfwJB4Azz(T8MC=2ZBjQnB$#zVWMTMzXGi@LsF#VtD6#B-hO}1xZE;uTzZn{%7!QBl9z%$Px)!xYUf5xyVthol$Q3`R?kz_ z;F4e#)oeV!^j{;lO+bai%D_lgp~#qD&hCq@Y}W4GsP&^|VaAfC`#5QS@mn?}t#I6)AJKQoXLY0hj2>;b z8`aB{f1h&aII6hZ>|dfPYjpcP7M*q8y|Z|vS1w3Wi2kkQvGSRfZ&ut5Rk5`PpBC_O z&iprV!FlGJ=PcXvi!@vwsOxW&>@`dk+7fOknv-zwcl)jQRlC>N&;Rqv_lAJj8vb{# zfuaS5W`EDWFc&}dN$l@-p@#lRs)cX=CM{b!eezp@^Ey#9q6K=-9`l@F z{-`N2HP+|G#^ZYevzGr_I(ymXgRR>``uy^j8@jWeKe^Q8+mWg%EL=(rs~WZihw87r zvvKYk_P1iK4Qp3iGFW$ElIVMBP9LqE&oAiSdG_hx=KbDhJ2yC7$!z@-mn@dvY9Jf_ zJlwwUh-k$3mUjg)Ub;OlOE+?@oFQ)TlAW)2%E`|LE%JY2ysmd*zYc}~_T=ZvH@{XU-rk%NS+2SHWsKIQ^Z9{uj)vVm z;M;d8A#7hDbIPITuO%L}>Z$%%r3K$8_FgW%l3Yv~82ho+`<_-42%17W}%alk7MpJm_hB zQF$|0qH@JKj(mO7F9)wBXdV_UJay&IpJR`Bg*H6(cx%9!weg`I^XzGJZ|21dU0=O) zzK#)JK>YgRx2a1Gue>|upPJb`N%8j#tGNp*=5Ap(ablBoTs3<~JE!^C{)3E;i(-vz zmrl_tD0|9@>tQO&caAFgg|b-{Z7D$>F$sO1iA=sUyGh&u?Ep`$VeunzPym@5z18-N%_W zxskO{=DJ>5>d$%c;UEP4yqDA~n z<{9}lmnO4?T;eQIYz|;vGy4w1?}X|Hf79)q7&1+ch;8uiIaub>RZ%LQYqNH~pqSLu z)r>!<9Bk!!8h?CgyvWWDZ>3w&U(&dfrf&QGLhD%H!j34frA;TFbTlR=B{rBV9gPsQ zj4PB{@X1CnOkMotKZYo~>nm63XMJ$9I+?dlF?t8%=bayXH-Ed6!SwI=^PmG~Dv#+M z{wMWs!Qzzt|H^+Dm}_0!&a?CA^ObYL>{Ti=-)KL47oCw?ch7D@YTG+0&UC?*zm80= zXxkhvJIA6Wr}MTRXQe>S44D<%59)nRDtNCSFokL2lc}fs*7)uJb?(B3KL_*GtUDIi zuq@(O!y98_op8GU`u$hROS|WNlulW=<5PVSL-9@z&xnU2H=e~Vxve+taceW1-5-Yt znfJS=^-om_H9X8Oy}yI!xNeVn$e!dgJFh+CKeCt8KW-JL(Xv-zBB6m7FKTKWU3B1s z)6!bUv%ge6pPs_}EcLTf*gco^HICdq1!vF53Ld*A^GoW@em#XnFXlJ$+6zuy_Imp* zn_~}tD16b03fq66?7`NQ&6RgHHe9moe8-xSQu19etWK)lu)!++N!!M2hIN$KOXS;?u$4_-(4aqiIrgcj$A%5B3kEW_}5fSpDX^%D}PiKhQu)Ax9b?TAr zMZ8`MyaJ3>ns@roh+8TphSq0ji`t&;IvBFSXR~PUr$;}OS9me)-K!t< zF2U#h>Tgs0Hcab1c<7bO?X=r7d4YNLP3Tkih4{_x9+>B|=$QFiLs z%G7->OUdlTuGXXCMc<@Z6q;|zyZWEEf4|_A?83j^hqWaX9X;-DHQ{TDaP^B4Z9lR* z;+DGLxfDL#^Q=0nW_Zl@u|1hLGs<(n-(q$4(j8rsmd+^=wEmOTZf*OK@#kH>YfEok zlv@5(P=V{1vKWKZGwI~u5H9QPbeCw02VXs(r832S{}Q|-FRE1N!51HuK%wf^a&ztLLC>xXR_H{eYkD_<{6JIWM-q9#@KajbHeWF~y0z9l*Rs!KZ zi=(~t-0{CoANl6|bw5;=E_m24>G#K=xvL#37Vl70dGvH*&{o|k(PyTbvM!Zx-o(*l zR>fj|&vt3Ph=i0m@99Z;%pFWeFS0mlDy}N+JZ~v}>zVKBJN@SO7jV2Ql1xm#$m~kCF^aMxf;)qZc%e|iM;qF za5Ho8Q6BZRlcZ;H-<6QQUV7$rvbag*QBw(l_NH4|Ka!f&K2Mn=BlDT3Iow~y$?fu{ zrFX;?t?s>vnx+%K>rNRfXT03jFFVYWub7GLQd*}acjwA#)r{Ei1yf#WuaA+@Ocvg| z>-ohs+G`dR)crZEA>uw!%Buc#vtDY_gNJkY`Dz)X6s|{X@Lqo_n$_TfJ@4^-+Tl4n zj;C+@%=@FyxK=Ic%+H?i&Gi@me3aUg{d<4fm#4q}GX!>jGgAvHz5jcPj7`pu>Bb^w*t`oISFPTbI`iW7 zMNh)pxaAErf1iKo`+XM2q;1C?XZ~lfns+3*wCSDTf|Z3QgWdl#^n2}_dc}15_6q_Q zP5-0}HMj1Y^8DNaD~AgX&w9^Bu{9j|$dWs4YgT(s*4ewA0vm3Y8`wyT38j86e?LX_ zunWVTM|n$l<~lr+++Sw8M9+5DuNSO!YNm~$yL!~F9dgO?PPfxan){CN)yMC-A3Hsd z1Z~~#%$|9mSkO$!m}j@%#p;=oGmqv!QoW!T@8aBmGyh-Qq!`%r^IW9 zZs^jIl~C2VVQn?(Qm0i`*Uj@@1MS0wotN0j?v;=9z4>K}((ZGe^DE+~WH4^qs5K*hg;|XDUd5sZT?!uq z0`=Vf3a*^=YKCifx?ID;%fhLB^;=e1JX3vS%JjU3N#fA5a;-|Mr-DsI`ENz|*m5Uu z$?xG*5fh)e=j^gutFzZHH?d|HX1ie?U>BUTGVv|<#wT`b9TvXVGL00AD7a9y-XP%W zxA#Z9ij8}vH~VkOpR;UM%k*=6nrFSH1RUSKy4^F`_@DN(uGwan9^Rea+;0%JlWBj5 zId`JdkC;LW*&NBBNrC?v9E}2Jn+7`=SYBaT|3qzp9Piu-v$wn{a4ZhFJLzh}m&e!6 zp4q`Cr`UDiC5uU#Mz<6DH~IR?`A178{cCe&I5H!nc6qLb;QH+=ci-Eeq#*nLhoWw> zYu^3iR~E*-+x&D#-k0p~E8L5eEdRaPnrHUlmkfjLQC()f<#lcA1*JnDHWm8+I8qX) z=)`2Fm@sMYgx)FNc0BmT>bBzDX2B08Zqp0RyieQ?Qd4H8r9W@>!wUSWBF^+kJh`o;>$QDYOPo= zeWxsE>izkd`;PSSFSxVB%{6{rR_wBr;`h8;7W46UIz@>^Ms&vI`Wt=iEq!G8MO8bS zNlR+6bN8ztt)SDlW6rRKMcJ}@E{!>myVWd&C-la&8jUqg75jO@XMNVXJJCaJ=_K2S zVwq>WjpO@68lw9;`#NLRe$?(*xJ^;yTJLX{dxrNvifmvwTE!{*ESLZOOTPaM3wNE& z3j4L$ov5sxVSx=A7K*0fURkp63;{tU4-JEl*YpZV>G=;TTJ zI%_uy??~ddIb!h4==J0aA-{c0o*WU`wc_Z;o{iy#IwDd#Hf!tNIa>E%T0lQj)QT!? z%}sModweqc6?1`w_1vzRsZl%Kx1KIkE#+-JF(b$8yxjuFoe%pYYJ%a_dhtHR9jne}rTC*(rE8&>EBE$M| z`{L~QIZcvIQD62x4b5N7HfufKIyv0{yP_sB6?T^pyvT;A`)zLT<>c6dg{Aarq2uq%F17tWKKVJ-$(wa*om6`cfP!ldfJ^PH}RL-7W4jliP^4} zyL;A#ubOdw@6%bor{tae?&5y`Kf^~Ro&7xgulye=#%Fk)x}G&zL2yZwy`VS4h54&@ zPIph#3T{gL&+sg%#&A{p`O;7}z4<)F%jYa8__NgS^wwvg?K7WWn48&War{Dd;Ax#( zk>?^N%BL_i?B4y?FkavTuNybsT$Ow; zLV0n~)tR0<`dSUcUmW48J@utv)w$DOWETkvzx~5U)1omN$euF?C?5LusD ze@{{C&TAf@KY5|MkBA69Nqm#qvhTS6p7n`$E{o0jS#)Tkh5SmxyoN(H?_%S3KE9VM zQ_hev&v5F=Ij4W``1Zx-@+GGgMjwweqP(5Mf;k8c0HbwS#N zgP(OJCx2_z`sZ_7efOLr+nyzw&*YZ$`{rsNp`i77Mr^se!3wUulMZYTI(&8KenF`~!z!=qB~Qo;qKBp7CSHyljfS)g=$(UxL&=D;&Q z!DCVL>m94ZZ0iceI-E9q3=~yWzutIr=IooD38!V9F39fIH9c0y;I*vvm-n8$Xeo|* zeYfBcO>3{6{B_s4{%BvH_?Q2iip7XKQR+6!t{|DHE>h3P(TkG=OT)_;~i@_qj8;7VHwyZe_m89wfq)MdNy zg??J9#*g`us~XRrNj~<`c4D-SSdZLPt?bLzXZBB+wyN)B0PANXlTA|}XX~$8&Z2DM zGjD2wtlP1+*o!ZhiJMGxDeZDt8h7>dvMDha7a+NySgyJ=Dy-%#`?t=u zoT@lu)6;#&!wVvXBTQ8C9?zBTGUuPhEFo6W`N*TLS2X6po^zewUWR{JQ8wwR!Zr3a z7N(ljllIMCS@T&mI<-jL`jHz$)D!bK;j&YUSvWe|Igb=^ER+pBCb9g;qW=uZ?!4}= z<(EyZWEu zVNs?|!XM|p^+pfhzYIETm%vpe*1@`7=mlS@=8C>cmnJdJ(0ghXu&W`R(SL@;w6*-k z436UIM(@~~SQKX@=b{hsQRx?uhbJ8bpsx))zGXD`~hqJwMYBVk*k>|ai^>K23w z#wz`>n=Z&K?Gn2^>{(jme$Ime93{-ZeCB9f;pVO^Ikj3Q z6zk%A#vjjWJdg3D;6dy7Gk@*~N-lV3tZ!7T?XqXf!Aqu_ch*hLk@(LLe8`e>Wti}; zX3mSbf0xGo>Akr@uZ(VXZF~42U+GUmE_nVDX#z zf7Op`pT9f($nNO>45t>(F)7q^_rLUE@6o3bk&?NmrYhRZ=xNssVfx~-`O{(5>U5Sc zzQqE<{F4i#W?!vHv@UrU|3=`4~&tH&<_o{14IG%`bLM z+q9jpM}C%jZ^|^w*)#0bw|oxRdM36$T_-g6%aOp^W?`X>-CwqTSz!>Mxx|BOY3Zg! zhVLD@wkw`p$F*^s(jeSSsnnuk|5+}O{g-BImy zqV8MQgWBe6ZQVtuOZ870Ub8#@T`?eQYw{1){|vV>_$DlWzhmvvpZ^(-{y0>;r}iTA zwb~iIv(it6*)u)=+I6PbX}@4*Ljvb_iO1L7x3D?~7iTtw)jnK%^m>N*i#Zm3Q&Un( zOT5W|#jWK=liGIN3VBBQT*X&Z9n9$nbKWWfxD z{m;_A+NNcxv`A>3Sk0c1SSz?NtSM}UkLizwR#lb#UJI-48)q%C>tfRVRPvwU>6L=J zw_|?%aZ`w0U%vf?Rp(lPtpUwtlQuqS;i^!zUwbH0XM2j*c8M2Satn?vFlRiRf5g!4 zXqexM-@fYm{xfhE$fsPqezVQ){f7zM=2@Mm1Vs9J|9xsU-u->*SIzt17c}0_X-r=d ze^-I)ju+$a(+z#=)WWCafAw-$uKvN{&7rq5l76KA`}FAX{zo0=t}-DKiU;^F#dGbG z%AX`5Y<)zbAb-WgMG6I8R(6*fWDafHs_|k*LVU(y#cxw$1GV{smNqKfICFCmU*s(Q zJ(^+Lqk28UJLj%#N||vdc=L`J!B~Nro#DR@UWnYp!MM_|vn}za4y*T+R~gKUSMRoa zth4+NXZUmtjqO)<%%A6{$avLcpK=*{d73Ka#iG1dFH6DquuS( zuL~RqJ>92zH{i2uqHfIjq@{c-bf>9LJuj%Cf2A-k$wxGCv)vQxncwcz?PEwx*WYZ+ zw7697UgyLQCuYxCvcjv%@L>JM9X_Sc&sHef?pXS}PjzR$&9B68RV#l_>1{?$`tmi5 zK^OkafBl~!f9~I__2MsU#I~hAuQKQHYFPBaH8OWi|B*KWZtYVWPS5I`^nF`)_$D=t z&yVzbTeloo;KgkhezH(nVH5k4D;m{q#c#EHN`zA!!y2mg)QX2byu&8?TrzRtx8@l$ zR(be%JScu~OrSuO>uPFX$JB-o{}~vn?;dP^#`!AY&lm-_Fb7w@X~c70vF)$95H?OGJz@QN>1{IQ1&`z+Cq!BS<4 z7Y_=2((Wi+Jnb%%K}cBP@zcfzYx0@pA9*P6c%ZmKKK+8ns%;B4RL*iT=ilTn^!Vb% zP%-zEno0M(!gxx$3kn6LJg4UJJ6#R$U;OdZ)h{bm-Z4#0s3($%p6Pir%_6Jz3D?%)-4JndTbIJTdL} zJAtlgs&{5i-&m16%|+lrg!gN)-A78&9&tK+*O+coGyhDk2;01;>~6<>mR-2ucz1{B z_FT7ZjLVNK{q)4<{(pvqC(~|TNod_D|4S`Sp>pBZT{(BQuH9bm7P3fl_o>B8bNB22 zyVSY%l+>JG23t}NrO)1;ve2JhV(F~SAB|cHn(HeMZ(`hhJ7p8YJ~kckq%VKY=53l) zFTCWR{IlQ-6^%M`15Ku$H~%QmWu}+^{L=KW$m0wDGt?;TRjxlNd*RTkz`xqH87yy_ z-ruX=dFb}~m!Xms3R^5A9X~Jl*>y96dH+ipj-xY|?+MM#o&I=zy)&0DW6qN0)20e- zczWaQLxZn*27iuPR9^VcP`EZ#`0CHaD=hpTi_DtZdTR5|(1oRj3nj%LiBA?Zy2*HY zWmD#krmam&MGW2vw~FhDF#I*$9qJq7|7BH6?UyNALwMxcqyJd{XLu^46r;CynaCxM zB@&*YXV&|`=*Am|r`CB0LydVFu zhu+6UIor&uUGop<+1*eYMN>{;9v`z)?|UEDg4 z+^ZMmcFA1kynM;Y?A-Ccyd2E_bAGMfzBDblXnp&Ch9gy3OWAj*U0<+KjrH=EtxJ5Z zyr*4R_`+G=Vc&uiy4Me0fBtfxJ&Wf1Irc{w6Xr?IbU6Aw-uc$v3(LPxlbd&MU;n+B ztuZ#X_aEuq{`Q~Y+@opTTYqht81a&EMOP@lezA_mG394roCiC;Jid^*|S%1rF`}g zuM2L=Oz#Ky9qn5vyX2PfM9VpbA`A`x88!z-uDpJMS!<>HpYw~uo0i|ykMY{$xIX|qrqojJbd=HwS`Yj=m)>T>xWDq}kq{(Z#?@ePlEInA8axN^_5{g=+pl2a=< z>GFc&B3~b8*p)fe3x+uXJ;s5GPN69)RX`U>;Ju815S#tgFN|!q=%!Vsh1a7k_d^w|VcEIn=EnF9F ziZHY*|EQSxzE`!mGq{#ZubS^z+4qktlUTo%^I0jx$uDGClYRR?!_j3Pk>9%I7i{fH z-%)mer9g$-X2r&<#mARKIeYBMGQ3%O*_;2CnrXxSm{Xw@ynA2%s?yNE`J}1X^q5eb z$In%fVGK{bp6Of<_R^J`+9AE|{10aB@Yg=s&tGzX3#yo&$<}$s{?5AB7s?IG`Gs0k zcio)TlR6>v#HrZ%OP&N4UV2eI<@~Ct0dKSE;_9sGMWbb(NSZ zqgeQe|zozmW+~xUR%PTDVfY`?1tt&!rPFtOkxW-MZ z!MLx!evLC5Z}n-foHKVPJ-B+q{Qd=l+>8e8Wvf29Zs7}hx^ix4ea+N{!|q=Un9hAs z{mZ6TyT|*--=)9W8dpDUd3B)cz~`a`qAQbwjwgs6{m*d1J~-R>HpiZgd|Z#8ajn_# z$6?!+x$A;M8$a$iV7ZN7IB}Xf??>ELKA-iv&^sYBrniagSuO9ix-fFt-$fr!nfzyn2xo}ib^c#B z!-kWOo(8_R=sjjg{GNJ6TcQ83p7^`&`m7l&%euX4iZuhdx4Sn^ zT{e3=pPpfNpq1}@)dM{54}JMD_fKcrl^y=#w|;N9nP}Ui$-}v|g8S>H*E94_bF6kf zvhl+aF`4yOwRr-M9u1yiKKZgp^Cq=r$tSM)ZPaXB!E*Zk%BAZiu0vNW1l{yMF)kLh1(?ePU6 zKet5NZ*OtD&1=7YXT48E)E2>$D~fEqF3*^GdU;z!+5^#=a@J#J0=f;NQ}p~EFAYt2 zSt=v0n!>1hQ8(gT8%JpB;jYeaj)xx^76=~wSa_)=bVlXvI-nzvN$b!XIp^?VZFv(H`;v~gIKxUTo#@>`Nc3Cue8C-6-Y z@ls%w7d{uS5|!)pA*}yJU7-HM+lKpY{ae8GHF(CV+b`a&y4U~b=wE@q@mHGIn!+zX zE12pc9QK|*=!dVi*U)4w;Y6}DiG+IJ}Cx%102MMujyb{u2;^_~6T$}}h0tH})i z8FtS5Ui|vHN)(UU$J4W`k8reG8D6-YenqNkYSg~hfuE!Gk5*c>&))U2kNNAIgq}6o zr2^M){^bvE+}Y7^P4!&yBVnz)y#~H57q2*%fA{fw`F73uX$|^|)KZy3=LPCJaNnPy zTca+eRn^gR)#=6GlT}s@2BEWJG}nf_+dNNm+DEgwd-*GCo9?#PUkDW!i)O#-dHi2N zQROUHsIT}}H|FZ}56`KG*B$yvTXt$%;yzi>r{NA#jZoil4yVw}$5?``5sYgVcL zWzBf~IoLPMa;nHhbKa&~4;bD0z4?;bp6;0_!*_XsRD9UZM^VZSrFpN&!B38T;-y6EFMd;MJANyAE zhpm)&+mhe>Nb3oM#f9k;Eaq&IC4|d zfBU}scNf3hcdaR=<*DuB{T0fq;)1@eGI4(Dsv5`d9DeH+_hDI;8o%3@m`)sK))C5; zE4|~faNE3pT}MLN*|i_(ES~FhVwe7tbYG3?LW!m~vLRBrT*o*6XzK3Z5l&tue^PT< z@NuI(^MrOVC*Lw!w?8R9xQ->ju5h-%u7AlTnhWESa^AZ(v_($|z6L`V3qc-IPSHV z)ysd*goqVaOWHj?ga&I0gw1#;ute)_{nNsi+n?TlD}6=gW}x_+X}!HX>lMX)&x*Z1 ze1ZnFAx7NobIx_e$SiwNn5J-cwcyIwxO!yhmE{z z@k`%(MJLjiT#GyZS(a%HV@YM#xi^9Px2W@Pnjs;!eEQ_)*MrWTF<)EPvPNNw#F|t7 z-mLR%7au&`JiF__`6Rl-n0JYw5lsumq{U7bCqfrus+$bwCKR)djk5t zsoxuTrk<%-x%SVsL@tr?{|vnhl1XWy@87Z+I{m&sH)VT%H;I&8p3; z*Jktg4HM&!&N7?#=->q&mK^q#sn(fSy=q+L7&xQ_7gv4ODo$FM@kq)1wnNLw7cc&$ zN_=UG>g`qdBfOW6C?3ncppctrvY!I<@(lp@xXu({=aPPYDm_ zSG6{)UG%^@NRv@k)|9{T!(sM-ZI_v~|1+#eY5o+lv}FBKsb=LJ3Y7<094mIVISN^n zYnDe&@x1VRfhL~Oij{+A{3_r)i zX|css_kJ&bDQls(i$9Em>%i9FMN;~4i_{vYSk7};{hy)QY=O12{`t#o`#;qDie;{O zz4)_S-5;k_ydQUD329HNV?F-aQO{MsrKOosBjLb{sSUZVr#W>4vbT0_zOJUX0xM^vZi@~$rj4{nX(pK;Vkv^cgddD0=z^Kmyj4}RiR{?@;4 z9V64(tH%P?&8|s*#4z#Xzntn*6Ha#?KEC~*dBZB^8Q1tu?PpnkYM=WaX8E1vQeln# zEH_;*HKm`QzOun>su7pb7VnT6tKY|N&U2byR(9u<^A72Dn-;l0T5Cj~X-n<6*p@rv zvw?H?EWuA7-|Bveec+V&qP^k$#l32er#HVA(%K^Y`A2xB*r5*ZN*VYM{8JrNbIH>ubVXOJ2o0(pxHI7(Jt+Ctda60MX z!q-KNcMga3eoq&y{?D-Trg8q;{|p?_iZ7SH|HmlCy}I0{L}bO}h`T<0%6VD>OCO!D zco)5HY1!e|dmHOd3+9C`X-`Q%v~;1&vsm$vycg%6F)8!pE|go?Bq+A4CH8pA!I`Ns zIea>My>D!>GL%lc+QIT}<`i+hBo9rADPJN}nx1a3mS{}0no+h&>4Dh=ZMFD4IWuc+ zY0hH)I?K22xPkD?t(i98xxX1{^{HOTZExde&skX=Wc=bd^Uf9Cuk_ZR?`)VXe%mnG zh5ueyA6wqe{elP9n)ujFaY;Y_=r0aluKEw5Ym5YJSQD%{=Z9r3WJmSbF{r``7)`Q4@!wZ87o`6QO5v29DaXRPdFlW-9Cnk#jF&mDuU z;(s?Ty~Nm1|8CLJN3#oL1tZ!PHyo7J;k(!Wck#^njOFR+29ABslNAt1JGGue(_i9sj&9TZtgfs% z`u&1A1_$H#pZ(>|zADSRs(#HI>HiFE`e%$DE{)AC7Qb^@>z!(p)$4}>!TELx7ua<+ zJ&-#6?CDI$l3hJpio)4hTnwTGG|Ehc()Ff2{m)ReJ#xnLl~Y8YJh}O> zZGZ6hQPh<+>nHbjc2B*h6=yEZTlV|F(a>_MZXT_T0Rc(NcRl~!yrkgTb>8ZuqH%KU z>0d&4;?Dm4&u}2Z*!ROd>kyy$t8^~~e^>2jkEj>wXKIR5@Y$X6E&R-Z3{giTu{Aeu zeM@XqEHXT(uQ_?&!c6{a62Ao-4|Gg%IIN?f?xi3iJMU4-y|g>${A_$01VWf&Rc~?b z54gj-wO$rmF!mU{J}5K z`O|At=lOW!^+F#-mIQpRKF!H{OmoM(Q-VUPBUW9lQ=QqSAGrFUdw^s{+^jnck9JvB zaURYpv9XPD`=k>gbtS{MOYhX~Kfm}KGNq>H{$~ig5O6AI_TRrIywAn86C~OA1w(n? zUa=6}@L=`UIWfsgj>XFQ&NkWH-RLSX%in%e^i_=skJ(KP`S%7)4c__dl!C`rk$T)Y+$Fe}%_xVcxq{=>$q+5BMFyZna?)!s{Ew>NxKo1C(7 z>9kkBBWK=z8uV*w{>uKDzL_$bdpC1xTn_Hw`Mauf`|aiI&r`c0YLrQzZG7yX@VX}tSL#2mM2pB_bt zWXm4eFi*2RaQCal5^lR5=Pa+_*ixMQ{+F|ZWR0NH&ZMLJE06o`bPrrD7=2+{!L6*T z*`NPfzgUp`pP~6u-!eh1py{SiD7j4Sx?jB`O1 zN7v46VS1A7U6pQr^E@ZFJXq$LwA6p{{EV368F8~yr!SOhTfn{F?*s$e)@Sqjqq+6g zOx=6vc6zXS{DGF=Yxaj`AB=ynYRl?S*X!ZCrsiA`6MFZ@ivNo2=zQ|q zv>j2`lC&~zS=prpDQmC0(HPwk5*DGjV3l6nG{p}>*A^LW{A|v|5^-eytzSufoRbSO z`V6l;w&IM*O1iYw;zeuI_V{m4)wCa`X$Yq5RAMleds43Zle^IPc;eGLb%*Ze9QN1| z71gd9J2P}wgVKZfyFQ#+!MrpsFLq{wto?0W(c-Fn`MxOW=-dAp@-Hwjz1+OGV|z^0 z&A!!#E&ug?O?p%_|Kcl#9&_`9J6dE`MfG$|+b$;l<#lL9(?add9XA>GEoYxG>*9l# zXAZFb>s%M|`>^2|4OwlT1to1k`V)=i_oy6sb(rznXHAApi}t@ap5^_={MTufU7`HO zT6r%_AO4;3_qRsfnJ5b>aoHuY>R;d7`z93i;%oi=qXA1kemI@1EPMGDdy$dxdv!T= z)(zoLi%yoDE1sL!J-vPJk+XG@^TpS%_5Jx#M0o@Ellq-)o9n0Uadk2l>$nqPP*mR$ zcJt{DX;Y4~>kB_L<~@(Uu2U*#qc~;9jX0|aR}rbAGm9_1ZfMxL+<{?5t$r_a zDMjy^vkcr{)Ut23?3r}qj?VW}*$>|`32Mrpn0mOL`OLC?FUyTQ+^&AttJITwxcBqa zhXqWRE6y)J`La1)m+{v3-_9*!V)0zlWL~qoM;cmOIFL~)S9q({r{Z3?^VA;8%iQV( zzR^)UamJdN4uO|$R^B-o5U23XG4b-(rb7>!=l!lVQTF~bA=+yDyu=B~&mzO8d+q2E z(_HU(;lir#X|nG5nc*w6ZeBFztZiejpJ5!4^L_gH_pGdWeirj>m+VfPI)~SbOLOC_ zyli{lE018zcz`G}m$NLsb zYD{c>78tknf=^u%uY?hcwD!EB_}7x>)kLFvlc!l7O?j3Qyt6x7ehc#(KDmoh&RcaS zi5qMv^ZhVY-*lq$(rvd?ReImVq#4PxSHqUgn}Ro~9kMs()cgLU>1)4%F4wVTg|=rF)*Vw`p!2My zhIQNN4>B9NX6msPOG##y*Z9;L?ba9l**Bv+##G~)w|o9H!L1BY3U0Sr_sC6s-5_Eq zU0QVQZo;FFUn2uv9~OBi8xy?m+w*k@p^+_*(H zZ|M}tD^lU_%}#$PaO&K;GVTKVr@oJmRA-9K(dQ31(>OKYU*fEVQjGyg;VB0dQ~4CU z!tYbgZb*9d861_F>+c_MFqWfWGGEi`8Ko-x`&TvQt+KOc zyg##eW!&N?r<%371z%NP*%zM~!+3T(SKs~4{u<=@y$)9E;v>efG4r`HlW|dEbq@zp=`1xbvSO!dU-g z|0QkS3)}yGyPA9@+l1SH`j!>JYo~p_@#Xnj?G2i&)dqIcS!VY)?{-_h)7fr1lfiTG zXQ3G#PdgLxJvRC@-y}8WS!I5@10ul%36Ho^e-RhO;UKNyT(gl>9UZ5<2KidrF3{j zHg@aO_TE={o2Rq-w{ugCb7a8GzIe-Z39gAwA9a;o19#a}$8gQs@oIbE=essfK5A-T zv)CiTb6}zSmPehDC9|`F#0qAtI;eHMK=bDDwGY;_Jo~L&w?-)>AT;o1)vEVAXW6=I z966S~Gy353?Ptf4C#zRY3pv{!v@cDQ`@q4t<2U{@7`;gS(OEuARd3C{y?P&|Wq!=w zbcla7L+mq+fJ!~?RTmF_n=&mVCxqMZ4BLah6XG9<9Wwgx#ZWPDhd9@ZXM1PJJo>iw z$+JX8R@tRWE7$V;Otv|?VU^Mb?xqJ^3?)_i`=`y-ajlj(6tSe}cYPysBkQ#9uWxZ^ zY)r23h?yBvR)6L~V97LZNe8Q=4jwg(GNDUZEUjOE@d}kJI6uuWifO0+mc3SMd8)K^ zqW?4SdcD?mSatem(zLeJryZ@E`p#50T&(IA>7V&XvcNy9P_Da8X+KNiRb#!I(MPXv z%$3)-cYpEd8~??^psYoid^$HDuZ(JUe09gb6BG;^0(kE4&MIG3%v{ndEZ9+$vu*M9qVN z>CNkvX{t?gyk%~$Eqv7+79Xhaa^*IjgWhLd(^dNxd@8&9`q9$;f4L-MBX?vLcs(z< zUu>$OU*oo{w9j^~VerCj`U(vT`W#J zEB;UDuZ?sU7mwMO#7xKcOw0lLkJr1F7ipdej>xQc)Zliup3hw}L8c;$BrQ)bop|uHSay`qV#Wtqj15ieOrOsE)|9Vxo^$6BPbmX)t$T`#K7YAl z+N7NxHz$Q-z1E%OvsOizR$pJdBIENJo_E*d+&_xVKJxrY>&!d0avV&@nz$=>@0?_F z^p`2CLd5}2cLP1E$E8=K*>~u=rUu>K!^K(gLO15LU-Z_bi>wVRq;s$BKE7z_AyeC8 z-NqA6vAHRa9|f{4OM3C;qwb?%zGrD{6SjoaF74=-*~q{1nZd^G<~m2Bb|;!}?^uPfr?M-1`!qvdbvTNEMZYA~9Wix9Z2D4Q88!x;6PoXX7q0OYd z+UssC7t~%FRezvoV}P8qQH$lQ4lQ2R)j29fEjC`^K6jmV=z3o9eX>aKgn*+|$&nj> zCUu0LQQYWx+D_4w&nkPy5@u)hFWq;VKFh2s&&TaKq8YHISR>kd*P5@)#>M6riu4{8b&A?_ z3D4;EHC$7i;o+UPtK((AanX5SZ{3ii~o|??aHwJ8P3^t%FBZu zuFkoprsBT!_Tx)4?QFT8vM$RCUneeiG9xM4#%cf5!uK3PP3L$2>^ZyD;rD`P(;`~_ zDoMvrd;C!+>y3)iZl3_d;~$PLU)p%_)$!l|UL}=l-nhvXnlvT)<@7IC=knJckn0xy z_WX8XNP1#_`A4Y^w+p6kHC&dnmm2Lkuf8z1SGRr7sm?vYce~vWyohgZih1ff_eiA4 z59JRHVZUcRpAf~#=o-I(|GhBN?V3YN{g&=roGz-Za7%ld(az+vhus&&9IY{Qop30j z$>GgK4Z+`+ALWWwPW#L{XmC)XEx07`0c&aU57`DKlASdTF%62F9$Eu2AuQgISzmIf=3Y z)$_d=Gq)vts_a@@a(d>2-IcYx*H-MSDkxM(}`)kjg9 z$L6kz)a=QxIizFuBz4c^la?2S_WN0G7r)}=k$SYWbjQR;LhT!TUZl63uZ&Om{gG91 z*7Wx>hBmB+UnXWBF-t$QIp0mx$hC zzrUr*Xk_D^voY3To9oUWo^_KPwch?{EnM%!(47+$cy_a9L3V%|^SJ}5OsBgyshWjq znlc!i+I0Q?rPHg`R2OW~Q=avS>&li5A77bRrJgOhlUZj3cOKxA; zdqqpkdwt4+?Z&DVQOa?PeH;}o*!-GOCH{sQG+O^TCyZr-CTQIh)+PJ*#V@9jioHT#0=2_R5b)*`c zEBdS>ASJ2+5HTiw&$oOn@qv!@MHcydl^s5Dpcv~ z$TM#)YI${`MPnMj#g~hQ76uEJ8s0ARX32Ax>sMKl6=g2E!A&51+oQkEZu+P1IQcPK zee2xQ=sYPdYuhi5EdP7yA{Jj<3#LkaS;ES|@Gx21>BuuN%iPA?lNY}8t~!;w<&)!q z-8^e8lKURVJr}sO>g9QHF{VC#zZ+Z1^Sq`B@I-Bvxp?!=W93~_!adz5g$M~q$;IAh zImMmpbM0A?LC(~ICpM?_etz9>*ZG3S(UWh#EaP79oRiMn{;57Rw5!@n@aISI9rkx! z*1!KVv26N1)vm3RpXmf#t&2VUchUAgi(jU@KKP}dyrH8!&VT97xJ zU{S-4;+R8CyLvzMoZ9wFgH>`}+RvRg+d{6##soCH-@Zkopupl;u&!dvK{-vIet`>? z7q0hv8=kyht{lk*4?n-s;^M9moReIp*}o}s%Go1k z;Y>HC#aew`DEa-XN}+e;_k*uzo_yP7)8bsL#$&td=ij6X-sg8YR(U0`37>Uu%j}sg z{$5K?V8OSxe@7HNT9f+UX^iHVM#OOzoSsiwYXX_lc_6GK+#2dVu=#*ym zRkJCiZRb?8XGg-#%9%BEE_E<^Mvl3}Lt|kFe!~+1-?VtE zKEIgy!t}-Sg8fb=A>~{;>~|DY7wpe)@7}!i{v)f1t-p46B>d)Aic?vkoL{F{6uxYg zsL`3X{QJ)w>b~@OMa4J${|rLC8)b`MUAe1J!ds<#%Ve&Oa`Md_+tZp;nCEXfGqv-w zMEJGl8G(jJU!Pg>F<*{OLdsZCnj1^oBEcvkS{ zO32w?!iNI(FaIfY+Qz}dbcLKr+S0ql)1E50Je+#O{>`1$aUTupjy3*EzFPI`m)0Ax zw^t5$Yn`=!V6#ZwOTiAo8;K96a9iK;`tnHCDt>Ld;nFD{yepuf~>TTAgS04YG{^DM!gS&nH(o(bb z)Ur}G=@N_EzmGcUx_YULdhg%FB(?auft1$DxFCBUM&p9$(-TdZ409#*&$zQosmkSr z$aeW$VaZBTy5DiLDdW*YN73HX!oq9p-d7lyep>Y)I5;P3a`B9h9T`tPi!mI?n>BsS zJhxZMMNfH}%Ej*~DqTCgdBt|ykFCa8CXS-40p~lbd^Jj3>P-Y637&MG+Nvm_`68ft zndIGFfBcMiB0XY`K1<R3{yZi#WRXnWLPzUH76lQawx` z{xeu+L_TDHI5Tg`lNrb7&k0wuyY%)ygP?{B!#3}*E}!33+$t__I~>xFEwwe-_T=3D zjv|RSEJ7*~c**=ufoq0a2-|MUDYdz`eN3Yp&n@f-im>`D#l^0sdA9cGRJQVq zmOU4btUEoUZM(*;M8+nYV?56<_b-kQC=q5ZxGs3&`tgg&MQ{IF_3$m${9P#i?Z@iB zGqmjw%L7-u*$Fm-nwOa3K`Y@<~z(Ra3J@GHt*70bHeXUlv_YP!mv zRqLmj@h3d_m%7*^B6lB$3v=Ew{#?fR=*zh030w01{Qn*m?v?0SK%ucEu!Eko}luq}(Yx>>00me<56 zkxdIYc9v>i*dD%iF*n;I4HxPBOA9k(-QFbu0DU|n6~YiTc#)fNv-*vvt#LjRiYo>sq)@gwS7mD^zyI2 zLVOu~<&Mbw7F(rk#gY{wtMB-FZMV42>!R0^;_VA&{yl$2t8&@ibzylSZma%Gn%<^j zA?l}e)?2$QG3M%p3)R1_)rLCV=JjW-NpstGb=UW_2kR$JUEGkW)RuHO<|r$hA5)|! z+th}x_-99Bw>;vq+VzY>XP@jDL*LVSyBeM(%npAs?G^V!jm%n|J`;B1pYOk%`e4gi zmn!j}Vfl*k9drIJcxhSjpJ5AE=+wg~b&-}*VzbETPx742nt)8C$RD2hPH+Q^4w0$SoPtZ^^fI(Q6?wB%g*!LI~-w~B+9vO|CK4n=EnSI*cr0!V%+lJ_86Cxt#|)3bOBKFTfNmn-dODF$;)TBzC7bobXkAnpK2JV=7fTn+!ChOD@^Ay@!Zb4*?qw55C88K zM_f0S2)G11VNmf}(=zjvTJhyZzLRtt;|Fe;p_|c_>TNv4OYy^GCfK z%POb7_{dqR<59ITsU*g^{I&2~roiIJ_?eBB;znmd)PIrNe(8b(B4TfH= zXXQ~-yq(^}p30e9IB#jN-u$p5HQvj&zkOx<`Fe`8(>62vj&rZ--yRlLKlx>5L8d}W z^zV63*6Dn^{O>cj-#lmao&Ti&Dr|gxCi%LYi`^%^soI;pkA@p-{18um`|5Jkf;l^O z>+N8Bs-(Oizo%Xv_P`3G&MFLBx3A>?&!1;cG#x21I&iMGfW<8~} z?bw5zCqLMnI>NJ9)6Km@mrv%iVW9hRqjf?{tNIrmjScx|pmU-xMqz7^4YsXOB+L+swab$A&%2f24XbCH{2mv)%QX-)?JX{pl@&f=iaKu-c!L zG4o{UDMPNix)*0`6q|LsScRWgZh0HW3#m(YuM1{7to5t>t1KqXrzID5XPN8cBgKlL zvDJ=k&-fOxOeyqPW$t-=lab!yIa{Wzczr=+&RVOAkWlWKb^RUNj%c}TY!LWYzbI<5 z7w7$sG^Ypa--{M37J6{H=~(L7NqhB$)jv$xxG<*X*cP)lQ`R`d8a)W-@Y}i8$*<7VL{r=T4)*UPG5;+53j>ukMQg>^nWh^ZI5rTWz9){Wn%0~nKA)^0qI^ytOP zTg=~@WlvvjjHoO9a^>*TS!=#_>*#XcIQ%-F#mMc;m$R#;{Ix8SI`f^gaQ{==-KybV zY#W75*pK#43TmwCUHMJ7`aeT!#+=;`xo*BXeyL)0-^}RgH>PRFwH|X|T4>@B9LyA* z6B%@%Du3py+Am5MtQ&6bu~I5}w7GC$h|1$5Czl;Rthc#$OXy*rUiKX8qK!=FXQVJL zJd^eCKf{UHb7srzwcEBVBAQh|w9&QdPQj=1tRaVQ^~STPDM&QzoV&+RDPe}MLl>)t zE8~)xE6#tj>bxRj5PkT8%I3qj>QA*cM5I1Ta-Y2@`c%>O7xxmLJZzPjVpIOYd(H9v z_JLC!m(0k~m975sv!mDIU+-r*lfy=TBYr9{71+u5I;^qVHjSks|BrOLxqh$w@=Hg| zew9>)umAh5gW-N%Z*OsKb=3wQ_o)vK9?lM%;aySe8k66 zI6Xxswl0BX;fAOEk>QI3y#tEA{Op&RXJOmF;7UN_mw+RBu~~-kPaNb9OMdHNyXtUG zx4LD?v>k~8Gewi^`4;Zr=J;6SFlX65r^1`dUAAowU42G+4y&YIfareDJ1LH*e`j<& zmuuPg`u0xGh|8RoQ|3?K{CaoMF~6|3`7gCQUKEOF*vR}ots1p^`M3WJY%9a=X1~td zQTX~lgZAPpYgbn&UXYn8y=q?5%|OnRnmd9P-duHp@99M?pYqvXs>8IS_zflY-S6LW z_te@gJEklW$P}7TFqv|qiJ77XXMm|b+`T%+H`t-c&?+% z;U8{kU1xrD6;|x<$u`@|B04?W@Imo@@5c3gCnJ{aKmU8m2l-OLNn1O^SREc85y^S_ zQSb7R6MT#0hl|KUjNi?u<+o)uN#X*Z~qhE&a&Os!!Ewp9mCJr5bTX)RuS_U-;@u?}J+Dc1LsFQn!0NU|7mf3Dom7vurKaB2=X++p zy3~4(UH(7E-Rth2d0+DW>LuQ8pN-`cs!NW{aAq?3R{Q?vU)4vepQ(pjGyLE<@1ohF zOiSx257g$$8{}jy%v|Y~9uYt9uO7Qxy~QWTYwh+I>(BW8YFz&!Vq2@poBs^lyv8}J zq|Rg|)|{Mi_3_0Rd9~1n+7FLEN_{O0ufOoc{ytNZ-j1$0YVX{*Q*#UXeSLoWXvfYy z)s;4V>8aa((5!d+I@O z(WA!W7fa9NTv=_hQ#m4RMb?k0OBdEIe3<9k(=g@X{4e(PK5HNRwd>BwURkd-U(>|v z*3u}U$3c#X7p9$f_V>P5p>Hx<*GEgydvXCmb=_b*Bp zbqXsRyeeBNvI4uOJ?-fh+{-i9Yl1!tv&lQb*;+3jPSs{xsn1iebcu-LZ0FpqN#*jU zmX)a&U!>jjUX^K)nh=^lZ?VGR>jMA!&Kne&*1b8i&Ud>(+k;1}5#b_tTts(ByQ)3? z!1bdmAjG&~*V&J6`4+6L_|MSc-munO4M+=)!fTK_Y2ao5{lXqdQr;XApSZTqH7o?4YC60+-6 zu!zNJDcw1Hj;`RGrMf~||FY~Shg_k>T-OWx65pR+>Lq(;YK#j@@{`afj3o*JWm%tvX4^x^fFR5>!{H2utr zauS>P!`c4Ag3SS+%6a}o>|FQw$eH^VM|^U05`rEbpS*r0^NE?7G3(iXHZ*!|NdM2k z86o=ipSWYM*k4YU?&n7qb=_YSGwsZc?Dic&Ph(Q<{AYMFEA#n^`*~rCuG3cUIm9}p zSR-VrX2Xh*ODE<`TAG*1cS1*W+0ta^g2e_k{t25kWV^TRnQXZHR>Z*v8w#0U%lRIN zFwZxPSktU0_}lYH&c+7bqKTo2?l({B*ep$ZEc)$>)cFM#TeM$gcdhsTcJV*MR71It z{f$pMLgL${Uu{(JOL}(dx7|lQ<9#2!Cjar-P+WhZapTGTQLDuQV~)%XFd*eamU-~nYRkKM zyjU{xm3{2Lv@bteH{EYN%w75Pr>vV{(2vjJVh`iWri4e_j4svFo3SY_m*d3gbTrO@FcUUvjLHdB>UTd#dU>jI0UE zHp?)nXsjG`#ZQur z*-n1r@Ji5Kd~aFv%`?AT{`^wfxTI_6p3`#|P31n2{p-+|ADVG;5*Zte;%wIbRP#$< zI2$SZOSH0S+IgSZARJn zW9{(0miBY%Yx-a6cYch&ro6V-Ic|TV%;o9z*?$-1@YWjy*r>l0UtnBT9{N_WD5J^9XVUjmGC6izsD8=FpE-qFzo3~>wmmpaFMUy;GiSGS z!P_HR*$qujQBjZN-kE=!Rv|K>@#60HT60BKz4vY?3VflpCc5xy)Y^ah<=J)Inbs^T zTeBxsh55~2`-@NC%UPEAzQ0|o%lYv5t;9X`?e}8taYcT<{-aR)rTh;`HTN6#nm;(S zAN}QzwvFJ=Ed9*B`_T8}3#@F6CVt$%$019#(09Maw09liIbxN{x8>%#ERB}?%lzfc z_CwWL^ZSErUNYn*^WGKzY*e+juI2g)l?AI$uD|_D2X{;Aqs zCp1Z#_vXX-&3_XXS;f1pjGijp%vWvoYf59b;jBOAT)QSe?5?iXJO3j5$^FVJwOb!A zi`C)2vrxFL(!_qrgst=boQ!xU+VJw1;Ocpw`H!5MKVkk-GuzyMDXzF)m&;$35ukeE**| zs*;!D+l4;9Xq1iNa*9&la^_EcL`=Z?{(t`&!j3-CdHTft#rg=Z+M4^{InO-WuX3vD znX7bL|I4YJDI$Nh^Gm<9ni?iJcG%SYJ<&Glle}%se}=Yi`yVZyJ1LCw>@ta6K~;@e z9=Vo#_8v0YKC@3L%tT|o;fhz>yQUh3iA{9%qe9-;z_F9)2&{Z@*gZ{R-Z& zcS=?g{;O{b`nv3iU-`#7_T8@U7XKM|{;U-<9Br4I3a%DSVpglDS%b$)uo6RbA$V{~5}KW3^&e15Rw#jOan{5AlVF@NT+#$z*_nKkNzM3 zR7oGH)M5}{5wn>8&uZI<<>%KvU*4X6-1cuwg+kEErIGa)Zxu&;?~H%sbZ5nZU1zG- z+;9KlTlt?MiFIql^GDXbp0n&d?4LiXKeh9V%v|qNGyeWLU06E(-~5!qC%@*b3y$&g zs9*5w>B~pPt7^=@EIVSZml6Kv^FKZFS@xSktlJ)6&s+Ugc0s{!QH!H;cJWc%VO#$* ztUPqm{!;0aUt7igGic)SD9uIx>)BhRvT}V3KC)i}E zwlq!E^o!cf`u2YxnU0nn{L4FS_Gbn&?)~;p8TlPI_NuH6o>{qL`xi~#_V)JoJhQy& z7hTsk|1)d*U-SB>Ldgqj{xi(rZJ$xvweVj;tAqDANXc_G5RqOK8Les9;Fq7H~5S`f9a){eOl9AOC1zDBBUA z^6SIvlzz~$yML;a@^!<#(@?Gum`aoB)3Jo}eFW_Q`b$ZpaXw-O{k zB>w#E>}U6iKMQ2OSzzigORkFN`+L*-u!?)}0ZeHeB68syOD?zMFE;x#oexPDR|}&P z0|SG(f`qHa`^Anbxu!^xIE;b|i#%DM#4u-;W_4p$5L^(%sNe`%z#!6NUlLe3WBzBk zH7^2wohLR-!`7_3sCIMzkBf?DP@TfeTK<87k?re=FJY=p_1=NDudBg<46={_X0mCy zoVZ-|nBr{NWAje9=Wsb_!wPgI3lBU|D(eJ&V%#pj&>cq6Ua8l{{l=Kewxwr z@HEpI{U3Q4KDi!yUGr1(hDN}{8#bDggG@LpY}IEluzc9iFrnqNv_P!H!mp^|gUe)2 z$zJZWj`Oq@mg-(EFMd$^p!uUfqV~zn{f+Y%8O`LZ{Mqv*X1%4Lo?Dwj%(S{HT*jb^ zbIo3|*=1(b^e3OJr?q>=vfSnNY{<+Y98c~b zi~6rUxaalRfyu=4M3u)w$=ByS!wz5DuIzg2*M{W`d!6PzNH=l}Olb;Ga{Sdibpc2R zVH~73;i}x%56=bo&Y3Kc;yu>HZAqJo>yW;BtKF*a@T;Z(7&VU{(o%nw1;Lx6XLfnic8kB3g-^QNa? zF3SWsOnFx6ezV)Q^zhu{XMXMFlsxZb)PB*BfGKFwLJbTII@{j!ubT8d`~6YLO^NEM zFT&#_3b?cjju>oS+_fle)Bd@(3)2%A7$p8P5Sc$27#LX@m|3fT)jydo^~~+QW~$fP zORQ3idmW4!TxYpfM&8P~Rw~n+T-q7Z;9SA*l-2M9nzOKRjRhDOoEd~WdaYJ<^DTYj zdQ9n>f=saJe5U)yK6tKxaHl!1kTL+1*beym)c`hD9S7#QsT zHXMJGc0l_1e}iaMLOk9)oW^U~TE}~Kav;IE?kY%ig zzr3pd-R!9sALJk$I!FB7e}?rSaR!qH#^TdqzFYizmKt@-PbmQl5+XP_Kq|Z>%C6`Z z-MQg9P4Ui++WJWxe?=HzwY2VHhgkQknUg#c7P>PqutaP*j~y*0p0YXUVsQc0%u9zA4m+7BI;b#W_yLa%j1CM84hqG-421_&Hk{=tJj%ep zfM}yR9u=C%$Kb%ppv1rsz=+2fs8j%$ZeZ3BX0j1D!tjWZ>+?wsC0_;x1_?%Z(7Njx zAGcV*C<9hYJYmqpr?P=nVM zF!gMB)U4s$W#9w}Jw}O1&Nj@ADi0cY0uO`Y6s(q5;!}gtA@3d|4u;2PHJA>o1U9l1 zfVF<+lzWyh(%8wcfq}sQEJ8fN>}oRUz@k7Ofx|vFlY4obSTzzrp(kL>tn>1WMPjc= z1UD&deTc;zHVmvP2fIWH`gIzPY8>*`xNsPhgFYXV`PeH_a7^X^g9rnI04eDdq+Lz* zy2NKgRat3KLHYx9Y+KaPJ7AtgVnQh;(aVD{5!PGHbWjS5dFUq}6F_y*U!yXds3qa6tQ>t*gs#zL~lx^|Y)3 zgMwsmWRaiU!2_2s`$X-U=ydSK$JG*DOXQn>mc7@MlHbR!Kw^4= z7|jc6fbhuVO;|hYYt=Vi>0`_OEwc69Q#|c{>GN*!%|zAC5R))Sp^ks=SPe7pa#Vde zxACpa{jG~5tWpn1T%K3J@R7vWN0`lf<3;)NRoYnNZ(U;G&%Z!cm@+Uh7;}~|n4eg$Ga=zenRV`E zmwA!PUa4x`4N#uIQ2KmY{zkwN71A6K*81%`)KU7z>+=E?o-SJ(V!SaW~I0fwy$7?{owV+gt$g%2lc zEaX<$@Tln}E^|s)V3+gSL13Z2D07?-x>C~k`WA~OEGga*F!!%+s=!i?1I(8-B^YGe zz^RGIJ`|>f-wg%tJ8(uU?9JWHasP@w0|W0`^X<&PcVns~T7;XgWLZI6@ub-N)|LhT z874b0a5Fgls6F_dC19}!(Wam)WbV-_H^1+dFh@DcAf&~CiQS!nU0S|?!Rg}r??NOF zbRn4?misq=MRQ>V?$4_*1r1O!-NqiV&|1dC+ zRFUAfP`Cip)&mX9;a5kBEYmMiRFkXr{}Bc~K}H59CMHH^W)>zUCeR2qBZHu#p<|$c zLSkV+!a{?_i5ndbUVQlBV?o1&|F;-87?~Lv?FD|_?T(p{``LS4UCVv`GoG#5Khl_D zTq4V5i+wl9uG9Y3vNCe_Y4^?+g~|!&*}aKp-{167H^yFM>a0tk-d}aw_s|CTVK2T_I0iMKOK;smYg5# z+?vLuw#Ca!rGqbx?UIUkSG>;+Q=+-|D71) z>?V!1#dpL*#Wo$VH1ZZY>-=Y9rtAT3{Vk8gbj~QnJ?$_)BEeBuASUAG_9RbXThOHK zzdl^#y5n}{^yAk#T$xI~&#g0D9{UQ=6Wc(cFFpnOJ8T!(k{`S+r)SdJSPMlE7A)bA+1 z8vaZniy>%p!K(m~PK_Ip{sM9N}K;wA1+v-I_H3+vBW~h^F_C| zS=0ZD-o?%rJQctBxVx-$#bMZAonnPuqmPpD)_@{QC-Bs|yx? zAFfw35xwFRY4M+dG5f;lO?$NiA{+`eUMz7;H=4WV;*NKA26^iiNlH(NxTcqzA`x%d z)F^-b+SRZu#lDjc{AR~iiTF+oeZHdi7?0z!%}fugh2AnwdvW#4$B(SsUIkwnxD>9W z_tbZt@a{fR^<|sm`{E9_`*jO05*)4e?Zp5j3b)ucbH?j>hJZ<;^3=bkJftKZl8E5S!}m~Y5kUk(>rEN$$O=xZ#3_T+nuk5U-c*HY~wu=AYr$Gsi`9|zSD=zYy*d` zZkDOnLnT4iH6M-FbI*Guwz%s@$CbSI^E(=XS1b;#-*HmL)+=Pr{C8YhK}o_DY_D|u zeytN?^%G8SU9~S&tDsQqjm+VD2_+s)>t}9S#>8>qNBFlHjQ>*CS{?rU&^5R~>+=ph z&lw44qNcwHI4u$Qvz)J3uqHZ`L9*pU!Rcd4N;gzLJT_X;nweU`^=s>in9bU*30Di* z#6AkH{m*b`L$9Nvo4J6r-fKJAON`=ajOM@3JldAJ!8sFm=Sv)~IKR3^KA!P2H%4qTgZ1Bqo1DAuYuRH(8G>_TRyk)KzfBt8fk(I1i%FEPz+~9~p{LN{h1*+99VQYItrMkGf z*O%{}+OfW3;@0IA{GEZJmZ|DT)*Q`w++R^Wq4dG2<{72+-`bgGJXU>t|7%nIYa=iFEwS7`rb+GC6fAOU`>GzZ zor@pExQB|Jl*kJa?YP;<^xzEhzDGB{ew?vQb6%Ea$rX0%*p2%cDtf)IKMGs>C-s=N zQbo2f*2x`Sf>u|(4ytv75{i<8?w5uJ4B6>kvJ4(VER~2(8M|r0>9na7cVQS;J zdgWkhjHiyPT+;0h#Z9a`r^WS1aHgMD>IgXVOgrn*ZH>HuXs*>kTeGHW+!j$>@u4rM zk?B$Irmj1Sj!rUUo|nq2_fUGmi5(}T)O;U?i{745$QE+x8SC?a(la-`rk>II{58Ne zs?*o8QcsU3q%cmxvSD4oouWgn1||~@&)hnzC!1-h_FQM}IR`wFX52d>BG6c&R?Lyh z-qk6UIF%*pS^m*zp&8AEg?hOh8aElX8_bZ1IwQXx@`ZyPR(+s45qqnK;8@M{8$=vDhL}v!0j(t`gP_41#7!5eXkN((G=! zY>M4-s4Gz5La)IYZo{r5Zqtq;9^@ryKWvhWLZ`*>yins8;~O~J!LdtN8M z+>j@-DRDNtO!bdvZT=FD`OGP9Y$w_ck8z|}?cjAt=n-0-bY$im z4R>mOx{b4LTbs#2!Rdx=hQflJGaSo7LYC+9$H0hXKN;KmCKwI+W2V7oll`CF0wCFwHvC-a?vQFdH&PN&?5{FxPHZ8d3S#D5XtngB@ zIsQtTW86j2i89(bv1 z&dmoR2Bti$zKt)|#ApaLu?5GKKbZA+(SL?m2g|w(zA9X;Ttz-xu5aA%G(ac9lF zG{PN43`VCiRxMneJ@jZ6JOS#5SFDqf4 zUgUw)^#3A(#qcU8ULow{`QwA0noPN#0VboX?*?wxH>Q9rlje{Ea#C)V4$ zT=&lQotbsI{~2E9%m4e&aQ&`ht|QZx3(|9Da4oXVd{nb^cSEvVf?R@CYIXlU%ViJv z;#9Nc6y*Y^S|;4GOj0=O^KxZyuGd)?xA_b^6n@UtQ(DAW-nq0#_ssf2HMW{Xhk3HD z9$US~+p?ipXgkB(^;`#h-%qrhQgB>8-ZN}*ZaZ6_g1gRU-&sw(@kfIE6a~*4>TzsX zanSF9P)9&k&Dn@GT{juE*wY`{mGAW4(YT>8amVG5{VYsTSI%6VE;)6Dprh`y^eqi4 zeO`?Vu7oIBD7(vfb4(Z9#CoCTsBWZzv`d%nUf&Rt1E%IejqY!>X3iBnwWBX;T4LXG zo~feu4eljgG4hj4>eJHw-od57WO$NG&S;jK#fMynKp7Q|y%k;x8p>yOdWNN}Dilz1 z{oqn`hAmx^)nQ?hMa1f0qs8AGT5oHIURk^Pjq=j=ouRka3JR_4Kf_wMLtwSf0>=bT z^Fo6dSL^v2noi}sK?aM3rUq@A)#!5m@UiKCBV$Nj0MOsn` z2GVI0vs9;?nwwN4x5eT&i&CcUi+MkrB8-<-bVUn@X|Z|C+}O1)LZ4Z5I=?1&;);ds zhusz}IqUdN!O2@%;L)5Tn}mKQ&PcIJjTUCzm}Mbk(y_DIg?n12k-~blat1Bdss=-` zlofMpn?HRBl>I0eZJ5}ZTP12PbuDRy&K!gHnW{ewx+Nz?T;8$bz~vc?JZs9L_oZqr zh!k5aG;e1^tiZ;FQ<*I0xaxZ4@dj~Ji7jMXEOhR~iKOr~!76Kmd}<50Hra73z2V)p zN9exCg&zmSw62tEJ#ES|KT>KKP+WRPG~<}UiXPj(w5OJRVJFi(TnrgZPKN}Yy>!ZJ z>tV}2wLft+I!1TYo^+e_wR9ATev4S$pPYR$Xe&=Jz5?rY(!# z64l$on6fgx^Vr-Y+g3G&T$b!oUN7cluHm?1;;E?jm$z=}-Vydx!<^OV?qQ>kFF4k5 znfW|z{m)Re=xpU10|*E{hr#;5d-VxpGBi5Nqn z8wTG_drf5u5$g#$-KRQ3Dv__;KHG%9mG|IQ^Rq|Rvz|&)pXf8`Qt#x_e-}mVQ&?|5 zyBR9Eeq!+%fne5}K=Iritn1PhMA!UWuc4E{RFJ7%wx&CE1Jjp-n^=NNkBAiV_Dri3 z(F$J>tg>ZsN^Sq9cdR|%JKAncJ$S`c*@7ilq{|@u%nPl|ZIO+$8VV*lhil&16saxn zOysxH9jPg*^N(mv?0K5J@n2f}&zWU{Q-f-%*k*&`KFRAt^9&9bgEtLvi7O0w^%7bu zk8BY$oc&JMPrWXXGQzh;UEuSK#_&cCI{KUM}WGiM6C zBmLX=c8cGjr7L-_obK^bxOMkP@acjpsYiHaPMPPpPFw2OxxBfnF>sEw$+d6jC=2h&R#5cSzc@Q6qcO6SRb?eV5MXW#9$8!Dn!7S8o{@S$Q^5E{mw=-}V1hwFVxhyrjg18p zCLa6%9{XYfjeY&TYg(v1E9=*9!Pp5Qp?7#MT`}r@f<(ul~l{aK>D>-r7HJjGpRwaIbjlyR;+!e%#{d#-d|S zm3=DKKjC%J`_;8`ec)n$=Aa2{mR|j*q#2#qA(0THR(c>Y;o|yzT15_G=A4Q4?^g&F z3r34F)E8)&bhvF0m=41Q}^U^ zHs-Q-w%-1;E4aE-EMtZ_tKmf>nf-T)#X