From d312b9e29902300209bbe0ea3be4f60d1bf17540 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Tue, 22 Oct 2024 01:13:11 +0200 Subject: [PATCH] 228 current 2024-10-22 01:13:05 24.05.20241019.a9b86fc 6.11.4 * --- flake.lock | 24 ++++++++++++------------ hosts/crocoite/crocoite.nix | 2 +- modules/pkg_mgrmnt/flatpak.nix | 4 ++++ modules/sec_auth/firejail.nix | 11 +++++++++++ modules/sec_auth/ssh.nix | 2 +- modules/software/software.nix | 6 ++++-- modules/wm_and_de/hyprland.nix | 18 ++++++++++++++---- 7 files changed, 47 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 3cb63bb..72fd283 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1728416205, - "narHash": "sha256-t30gsrwiBc2oBsd89DwdsVZuEbMT5ed81PYY57CIOJE=", + "lastModified": 1729453639, + "narHash": "sha256-L19R5CXCfTU9IFs9FAaYhDiteegfhJQMiAHLfls4Pdw=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "d65dbf59900de4beaaaba8b42a15994f8433c1bc", + "rev": "68bc646058386e2ffbd9d78d79d6558e684f6b8c", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729509737, + "narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1729307008, + "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix index d236a4a..d2c40c4 100644 --- a/hosts/crocoite/crocoite.nix +++ b/hosts/crocoite/crocoite.nix @@ -58,7 +58,7 @@ ../../modules/pkg_mgrmnt/store_pkg_file.nix ../../modules/software/nix-helper/index.nix - ../../modules/software/nix-helper/doc.nix + #../../modules/software/nix-helper/doc.nix ../../modules/software/nix-helper/nix-ld.nix ../../modules/software/browser/firefox.nix diff --git a/modules/pkg_mgrmnt/flatpak.nix b/modules/pkg_mgrmnt/flatpak.nix index 64400d5..1f9afdb 100644 --- a/modules/pkg_mgrmnt/flatpak.nix +++ b/modules/pkg_mgrmnt/flatpak.nix @@ -54,6 +54,10 @@ origin = "flathub"; appId = "dev.vencord.Vesktop"; } # More usable discord for linux + { + origin = "flathub"; + appId = "io.github.Soundux"; + } # More usable discord for linux #"com.obsproject.Studio" #this is another way to write it ]; diff --git a/modules/sec_auth/firejail.nix b/modules/sec_auth/firejail.nix index 1d23d1e..935d869 100644 --- a/modules/sec_auth/firejail.nix +++ b/modules/sec_auth/firejail.nix @@ -33,6 +33,17 @@ ]; }; + nuclear = { + executable = "${pkgs.nuclear}/bin/nuclear"; + profile = "${pkgs.firejail}/etc/firejail/nuclear.profile"; + extraArgs = [ + # Enforce dark mode + "--env=GTK_THEME=Adwaita:dark" + # Enable system notifications + "--dbus-user.talk=org.freedesktop.Notifications" + ]; + }; + brave = { executable = "${pkgs.brave}/bin/brave"; profile = "${pkgs.firejail}/etc/firejail/brave.profile"; diff --git a/modules/sec_auth/ssh.nix b/modules/sec_auth/ssh.nix index 4501430..6613cc3 100644 --- a/modules/sec_auth/ssh.nix +++ b/modules/sec_auth/ssh.nix @@ -8,7 +8,7 @@ # This is using a rec (recursive) expression to set and access XDG_BIN_HOME within the expression # For more on rec expressions see https://nix.dev/tutorials/first-steps/nix-language#recursive-attribute-set-rec - environment.sessionVariables = rec { + environment.sessionVariables = { SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/ssh-agent"; }; diff --git a/modules/software/software.nix b/modules/software/software.nix index 605821b..7daee2c 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -3,8 +3,8 @@ inputs, ... }: let - unstable_list = [ - inputs.nixpkgs-unstable.legacyPackages."x86_64-linux".neovim + unstable_list = with inputs.nixpkgs-unstable.legacyPackages."x86_64-linux"; [ + neovim ]; in { # also opens the TCP and UDP port from 1714 to 1764 @@ -57,6 +57,7 @@ in { file unzip tmux + ripgrep qemu home-manager @@ -64,6 +65,7 @@ in { mumble amberol_wrapper amberol + nuclear mpv zathura feh diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix index 7c71e16..6d8310b 100644 --- a/modules/wm_and_de/hyprland.nix +++ b/modules/wm_and_de/hyprland.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = false; @@ -17,17 +21,23 @@ ]; }; }; - # Enable the hyprland window manager with additions programs = { hyprland = { enable = true; xwayland.enable = true; systemd.setPath.enable = true; + #package = pkgs.unstable.hyprland; + }; + hyprlock = { + enable = true; + #package = pkgs.unstable.hyprlock; }; - hyprlock.enable = true; }; - services.hypridle.enable = true; + services.hypridle = { + enable = true; + #package = pkgs.unstable.hypridle; + }; # for mounting stuff, also needs a auth agent like lxqt.lxqt-policykit services.gvfs.enable = true;