From 361f9a7e63b4a0171618d33dd4e9767b6263256f Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Thu, 10 Apr 2025 20:29:37 -0700 Subject: [PATCH] test signing 2 --- flake.lock | 106 ++++++++++++++++---------------- hosts/desktop/configuration.nix | 25 ++++++-- hosts/desktop/home.nix | 2 + hosts/shared/packages.nix | 3 - 4 files changed, 76 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 2c3cfc8..484198f 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1742213273, - "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", + "lastModified": 1743265529, + "narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", + "rev": "1d2dbd72c2bbaceab031c592d4810f744741d203", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1743350051, - "narHash": "sha256-QtVfBQe5VBnRPP5ustegPlsTdV/SZzt8akOIN5Hlwjk=", + "lastModified": 1743496612, + "narHash": "sha256-emPWa5lmKbnyuj8c1mSJUkzJNT+iJoU9GMcXwjp2oVM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "eaff8219d629bb86e71e3274e1b7915014e7fb22", + "rev": "73d59580d01e9b9f957ba749f336a272869c42dd", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1743438213, - "narHash": "sha256-ZZDN+0v1r4I1xkQWlt8euOJv5S4EvElUCZMrDjTCEsY=", + "lastModified": 1743998782, + "narHash": "sha256-gckmtwW/H0jEM1Y8G3wBLfr2nJvwBdjuqnjKNV0lcQY=", "owner": "nix-community", "repo": "home-manager", - "rev": "ccd7df836e1f42ea84806760f25b77b586370259", + "rev": "c15ab0ce0dbe64843358a3081b09ed35144dfd65", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1743197357, - "narHash": "sha256-w1CHlBl4vlX5WedroZGyx0IyRD6uSgk+73SgEhIRBEA=", + "lastModified": 1743896382, + "narHash": "sha256-yYLBCDGOpsrMW1cMYUd1B0AWx86puv75Bn+T+TGsyRU=", "owner": "StevenBlack", "repo": "hosts", - "rev": "7e4a962196ce45df2be829fea57dc356f84dafbb", + "rev": "37a200a82d7a7d9a6598d870825a30f581632016", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1743437607, - "narHash": "sha256-EEUFIq/btzh8RZ/dv69PXvC5c7ythmCYlDOzH7vriAk=", + "lastModified": 1743975687, + "narHash": "sha256-k21wOvAEzCLHIUsVG551y6cMxmQ7sXQLOtlxQXV09xk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4c987b20e28362410d0c9f9a37bafd6f128b0a2c", + "rev": "51838fb5f5b5b03bca99b324fb1f6494d3854f89", "type": "github" }, "original": { @@ -449,11 +449,11 @@ ] }, "locked": { - "lastModified": 1743339740, - "narHash": "sha256-G6a7R/gb1xH0yI2uevTmDpxZf6rvMh1lOu0gYrqVu5U=", + "lastModified": 1743950622, + "narHash": "sha256-8qjDapcQeDqxQUIm5gA0x6XZtowV/14bOs3K0tCSMoU=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "6dca4ece21864e329394b81cfc767778089097e2", + "rev": "be6b9875dd5c586fb401d294bb98c31973849651", "type": "github" }, "original": { @@ -474,11 +474,11 @@ ] }, "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", + "lastModified": 1743714874, + "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", + "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", "type": "github" }, "original": { @@ -596,11 +596,11 @@ ] }, "locked": { - "lastModified": 1741534688, - "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", + "lastModified": 1743950287, + "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", + "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", "type": "github" }, "original": { @@ -655,11 +655,11 @@ "pnpm2nix": "pnpm2nix" }, "locked": { - "lastModified": 1742927915, - "narHash": "sha256-lhTv0kAe9qvowcWVt2pxEKLcdVg2HcMYZMvqxWlDx7E=", + "lastModified": 1743984107, + "narHash": "sha256-4847SrchEPDB9CEZME64E41adIygA/pkoQyRGXNymq0=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "edb548c9fb005a4eed89f2ef72f49b97baa67282", + "rev": "f3eb24ebb4c68becb4d28a88ae95bcbd50ec8b66", "type": "github" }, "original": { @@ -695,11 +695,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1743254817, - "narHash": "sha256-Kmw/BG4Ns/5YL1GE5u75T8s2hF3c4QhuIoHWGsQ5dMI=", + "lastModified": 1743876182, + "narHash": "sha256-qfiVewr5huupheLqStX60JSbjBEm9/PDncLQXE0dsXo=", "owner": "madsbv", "repo": "nix-options-search", - "rev": "6cb84b29ea3c83df2a7a847cd42ff4ece9385dea", + "rev": "f52dc6986161570a2ffffdf337c88b503e9a58fb", "type": "github" }, "original": { @@ -718,11 +718,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1743419774, - "narHash": "sha256-oZfx6GN9vBR5hr+CWl17ontcfeLBw0l834tj80QLwFY=", + "lastModified": 1743949616, + "narHash": "sha256-L7rN47O8cc/LrYlWtZOKuVYuYQ8VWPlUeAaMVhxQu5o=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "4f659ef4b5b63c260ba3a2241e93355d82821f1c", + "rev": "e765d8c0340d38c1544dcfc6cae829ed2582075e", "type": "github" }, "original": { @@ -734,8 +734,8 @@ "nixpkgs": { "locked": { "lastModified": 0, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", - "path": "/nix/store/alzxn3hjisc84hrlv44x6hni48crww26-source", + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "path": "/nix/store/9qd2bi98nh9yd4axm9zr16zln01w62q3-source", "type": "path" }, "original": { @@ -745,11 +745,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743367904, - "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", + "lastModified": 1743703532, + "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", + "rev": "bdb91860de2f719b57eef819b5617762f7120c70", "type": "github" }, "original": { @@ -776,11 +776,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -824,11 +824,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -938,11 +938,11 @@ ] }, "locked": { - "lastModified": 1743388531, - "narHash": "sha256-OBcNE+2/TD1AMgq8HKMotSQF8ZPJEFGZdRoBJ7t/HIc=", + "lastModified": 1743906877, + "narHash": "sha256-Thah1oU8Vy0gs9bh5QhNcQh1iuQiowMnZPbrkURonZA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "011de3c895927300651d9c2cb8e062adf17aa665", + "rev": "9d00c6b69408dd40d067603012938d9fbe95cfcd", "type": "github" }, "original": { @@ -958,11 +958,11 @@ ] }, "locked": { - "lastModified": 1743388531, - "narHash": "sha256-OBcNE+2/TD1AMgq8HKMotSQF8ZPJEFGZdRoBJ7t/HIc=", + "lastModified": 1743993291, + "narHash": "sha256-u8GHvduU1gCtoFXvTS/wGjH1ouv5S/GRGq6MAT+sG/k=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "011de3c895927300651d9c2cb8e062adf17aa665", + "rev": "0cb3c8979c65dc6a5812dfe67499a8c7b8b4325b", "type": "github" }, "original": { @@ -1124,11 +1124,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1743381265, - "narHash": "sha256-ZlTYtON6d7emqp5TUUKwDMvGTWp5/TLUqzT3nG3zmis=", + "lastModified": 1743899701, + "narHash": "sha256-qbaGVwPyUGmmRh+u1EY+bFKKiBC2CDfuE7E9uGj1Iuk=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "ac26537dd011db2e8790d6b805b0c8a148b0b48d", + "rev": "51f156aa0220947c6712b5846bf440136fd551db", "type": "github" }, "original": { diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 795a7bf..dfa2ada 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -226,12 +226,20 @@ }; # Enable the X11 windowing system. - services.xserver.enable = true; - services.xserver.displayManager.startx.enable = true; + # services.xserver.enable = true; + # services.xserver.displayManager.startx.enable = true; # Enable the KDE Plasma Desktop Environment. # services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; + # services.desktopManager.plasma6.enable = true; + + ### Cosmic stuff + + environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; + + systemd.packages = [pkgs.observatory]; + + systemd.services.monitord.wantedBy = ["multi-user.target"]; services.desktopManager.cosmic.enable = true; services.displayManager.cosmic-greeter.enable = true; @@ -308,12 +316,21 @@ programs.gnupg.agent = { enable = true; enableSSHSupport = true; + pinentryPackage = pkgs.pinentry-curses; }; # List services that you want to enable: # Enable the OpenSSH daemon. - services.openssh.enable = true; + services.openssh = { + enable = true; + ports = [22]; + settings = { + PasswordAuthentication = true; + UseDns = true; + X11Forwarding = true; + }; + }; programs.kdeconnect.enable = true; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 182497e..769bb9e 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -42,9 +42,11 @@ in { path-of-building wineWowPackages.stable winetricks + (prismlauncher.override {gamemodeSupport = true;}) #window manager stuff wofi + xorg.xauth #linux tools legcord pavucontrol diff --git a/hosts/shared/packages.nix b/hosts/shared/packages.nix index b8002ba..d78350e 100644 --- a/hosts/shared/packages.nix +++ b/hosts/shared/packages.nix @@ -101,9 +101,6 @@ with pkgs; [ go coq - #gaming - prismlauncher - #browsers tor firefox