From 9d9e8f26d5fe98bca8cdfe824e4a79e291d0e974 Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sun, 20 Oct 2024 10:10:07 +0000 Subject: [PATCH] feat: add keepassxc conf --- flake.lock | 20 ++--------- flake.nix | 5 ++- home/graphical/default.nix | 1 + home/graphical/keepassxc.nix | 30 ++++++++++++++++ home/graphical/swww.nix | 2 +- home/terminal/neovim/default.nix | 42 ++--------------------- hosts/marr/hardware-configuration.nix | 49 +++++++++++++++++---------- 7 files changed, 73 insertions(+), 76 deletions(-) create mode 100644 home/graphical/keepassxc.nix diff --git a/flake.lock b/flake.lock index 1fb0c28..1490f7e 100644 --- a/flake.lock +++ b/flake.lock @@ -390,22 +390,6 @@ "type": "indirect" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nysh": { "inputs": { "nixpkgs": [ @@ -506,7 +490,9 @@ "rustypaste": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixpkgs" + ], "rustypasteRepo": "rustypasteRepo" }, "locked": { diff --git a/flake.nix b/flake.nix index 0e79e92..8a8671a 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - rustypaste.url = "git+https://git.ccnlc.eu/Nydragon/flakey-rustypaste.git"; + rustypaste = { + url = "git+https://git.ccnlc.eu/Nydragon/flakey-rustypaste.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/home/graphical/default.nix b/home/graphical/default.nix index da57e3e..81323e7 100644 --- a/home/graphical/default.nix +++ b/home/graphical/default.nix @@ -7,5 +7,6 @@ ./fuzzel.nix ./gammastep.nix # default because I need to protect my peepers ./swww.nix + ./keepassxc.nix ]; } diff --git a/home/graphical/keepassxc.nix b/home/graphical/keepassxc.nix new file mode 100644 index 0000000..34c593b --- /dev/null +++ b/home/graphical/keepassxc.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: +let + ini = pkgs.formats.ini { }; +in +{ + home.file."keepassxc" = { + enable = true; + + source = ini.generate "keepassxc.ini" { + General = { + BackupBeforeSave = true; + ConfigVersion = 2; + UseAtomicSaves = false; + }; + Browser = { + Enabled = true; + }; + GUI = { + ColorPasswords = true; + MinimizeOnClose = true; + MinimizeOnStartup = true; + MinimizeToTray = true; + ShowTrayIcon = true; + TrayIconAppearance = "colorful"; + }; + }; + + target = ".config/keepassxc/keepassxc.ini"; + }; +} diff --git a/home/graphical/swww.nix b/home/graphical/swww.nix index a62c866..3cbaf43 100644 --- a/home/graphical/swww.nix +++ b/home/graphical/swww.nix @@ -24,7 +24,7 @@ Service = { Type = "oneshot"; - ExecStart = "${pkgs.swww}/bin/swww img ${self + "/assets/landscape-pink-paskel.jpg"}"; + ExecStart = "${pkgs.swww}/bin/swww img ${self + "/assets/landscape-pink-pastel.jpg"}"; }; }; diff --git a/home/terminal/neovim/default.nix b/home/terminal/neovim/default.nix index baacfbf..0a893c2 100644 --- a/home/terminal/neovim/default.nix +++ b/home/terminal/neovim/default.nix @@ -1,50 +1,12 @@ -{ pkgs, ... }: +{ pkgs, inputs', ... }: { programs.neovim = { defaultEditor = true; + package = inputs'.neovim.packages.default; viAlias = true; vimAlias = true; enable = true; withPython3 = false; withRuby = false; - extraPackages = with pkgs; [ - lua - - # Language Servers - rust-analyzer - #nixd - nil - pyright - bash-language-server - lua-language-server - zls - typescript - nodePackages_latest.typescript-language-server - superhtml - - kdePackages.qtdeclarative # QML formatter - - # Formatter - python311Packages.black # Python formatter - clang-tools - nodePackages_latest.prettier # JSON, JS, TS formatter - yamlfmt # YAML formatter - taplo # TOML formatter - rustfmt # Rust formatter - shfmt # Shell, Bash etc. - nixfmt-rfc-style - stylua # lua formatter - - # Misc - ripgrep - rustc - cargo - nodejs_22 - clang - tree-sitter - fd - luajitPackages.luarocks - wl-clipboard - ]; }; } diff --git a/hosts/marr/hardware-configuration.nix b/hosts/marr/hardware-configuration.nix index 0b63a72..d7de952 100644 --- a/hosts/marr/hardware-configuration.nix +++ b/hosts/marr/hardware-configuration.nix @@ -1,34 +1,49 @@ # 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, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "vmd" + "nvme" + "rtsx_pci_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/1cd96fc2-b17d-4927-8301-53347f311f21"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/1cd96fc2-b17d-4927-8301-53347f311f21"; + fsType = "ext4"; + }; boot.initrd.luks.devices."luks-514b439f-cc98-46a6-9ca5-a4776c9840f8".device = "/dev/disk/by-uuid/514b439f-cc98-46a6-9ca5-a4776c9840f8"; + boot.initrd.luks.devices."luks-c9dd8398-8b01-4d4d-9911-b0f1ed25fdc6".device = "/dev/disk/by-uuid/c9dd8398-8b01-4d4d-9911-b0f1ed25fdc6"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5CCE-7DB8"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/95451266-9dc2-42f0-9bae-28dd7c75224f"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/5CCE-7DB8"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/95451266-9dc2-42f0-9bae-28dd7c75224f"; } + ]; # 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