From fa9b64ed9389d1766e5b33b8b477a1cabb476c16 Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 29 Mar 2025 23:27:46 -0400 Subject: [PATCH] fix: incorrect gpg key and home-manager package location --- flake.lock | 62 ++++++++++++++--------- flake.nix | 1 - home-manager/modules/git/default.nix | 2 +- home-manager/modules/hyprland/default.nix | 2 +- home-manager/nix/home.nix | 12 ----- home-manager/profiles/desktop.nix | 4 +- machines/nix/hardware-configuration.nix | 6 +-- modules/common/common.nix | 3 +- 8 files changed, 47 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index d527f10..caf3549 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1742655702, + "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "type": "github" }, "original": { @@ -176,11 +176,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1742262357, - "narHash": "sha256-6JGR5I4cuFFun3AJKPnMPz6PKUPywIH+AFYROUFRvYQ=", + "lastModified": 1743299372, + "narHash": "sha256-vFuxkHPd+Xpi5Bx1VCyZwYl/BbF83C+KmlbPBNVJvNU=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "53eda8bba79a2c28782734bca51d70ecffb82d74", + "rev": "2ab0a37308559926bddb0009dfcf16a2a5b34e2b", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741865919, - "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1743231893, + "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", "type": "github" }, "original": { @@ -268,6 +268,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -277,11 +293,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742396414, - "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", + "lastModified": 1743288994, + "narHash": "sha256-hUlfAcIUnS8/eSFq+uzOHPZO1p8QgBTAoqhDWzEkUto=", "owner": "nix-community", "repo": "nixvim", - "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", + "rev": "81fdde9fc529e0a5f9ff0d570f31acfe85fd20ac", "type": "github" }, "original": { @@ -300,11 +316,11 @@ ] }, "locked": { - "lastModified": 1741886583, - "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { @@ -356,9 +372,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1743216975, diff --git a/flake.nix b/flake.nix index 90c4770..ef851be 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,6 @@ nixvim.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = "github:fufexan/nix-gaming"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; - zen-browser.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix index 183f808..76d4e61 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -17,7 +17,7 @@ in { user = { name = "Lily Vex"; email = "lesson085@gmail.com"; - signingKey = "Placeholder"; + signingKey = "Lily Vex"; }; commit.gpgsign = true; init.defaultBranch = "main"; diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index 1651a5c..2854dcd 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -58,7 +58,7 @@ in { "$alt_super $super,Q,exit" # Screenshot region "$super SHIFT,S, exec, GRIM_DEFAULT_DIR=${config.home.homeDirectory}/Pictures/Screenshots/ ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | wl-copy " - "$super,T, exec, ghostty" + "$super,T, exec, kitty" "$super, L,exec, hyprlock --immediate" "$super, B,exec, chromium" "$super,F,fullscreen" diff --git a/home-manager/nix/home.nix b/home-manager/nix/home.nix index 44c5b44..b37dd61 100644 --- a/home-manager/nix/home.nix +++ b/home-manager/nix/home.nix @@ -17,12 +17,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../applications/git.nix - ../applications/chromium.nix - ../applications/git.nix ../applications/zsh.nix ../applications/direnv.nix - ../applications/vscode.nix - ../applications/ghostty ../applications/hyprland ../applications/neovim inputs.nixvim.homeManagerModules.nixvim @@ -56,14 +52,6 @@ home = { username = "lily"; homeDirectory = "/home/lily"; - packages = with pkgs; # installs a package - [ - vesktop - inputs.zen-browser.packages."${system}".default - (prismlauncher.override { - jdks = [jdk23 jdk8 jdk17 jdk21]; - }) - ]; }; # Add stuff for your user as you see fit: diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 0118353..3755a57 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, inputs, ...}: { imports = [ ./main.nix ]; @@ -15,5 +15,7 @@ }; home.packages = with pkgs; [ vesktop + inputs.zen-browser.packages."${system}".default + hyfetch ]; } diff --git a/machines/nix/hardware-configuration.nix b/machines/nix/hardware-configuration.nix index 8ca010a..947cd48 100644 --- a/machines/nix/hardware-configuration.nix +++ b/machines/nix/hardware-configuration.nix @@ -8,18 +8,18 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/c42aa8fb-f19a-41eb-9ff3-f77d4c1d7ba7"; + { device = "/dev/disk/by-uuid/352a9d74-fd89-4117-bfde-f7cc6573e6da"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F2AC-C759"; + { device = "/dev/disk/by-uuid/6080-50C4"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/modules/common/common.nix b/modules/common/common.nix index f8dd76f..3e5c2b3 100644 --- a/modules/common/common.nix +++ b/modules/common/common.nix @@ -12,7 +12,7 @@ in { enable = true; enableSSHSupport = true; }; - services.openssh.enable = true; + services.openssh.enable = false; programs.zsh.enable = true; environment.systemPackages = with pkgs; [ git @@ -20,7 +20,6 @@ in { toybox util-linux tmux - ghostty # encryption and filesystem cryptsetup