From 6b1ad394afd974a69ef67c5c760ff4f4b1af8fdc Mon Sep 17 00:00:00 2001 From: KeksNino Date: Sat, 15 Aug 2026 17:20:38 +0200 Subject: [PATCH] remove yazi as drag and drop has been merged + misc changes --- flake.lock | 76 +++++++++++++++++++++++++ flake.nix | 12 +++- hosts/desktop/configuration.nix | 11 +++- hosts/desktop/home-manager/programs.nix | 58 +++++++++---------- hosts/desktop/packages.nix | 1 + modules/programs/nixvim/neovim.nix | 15 ++++- temp.nix | 22 ------- 7 files changed, 139 insertions(+), 56 deletions(-) delete mode 100644 temp.nix diff --git a/flake.lock b/flake.lock index dcf18cb..ec7720f 100644 --- a/flake.lock +++ b/flake.lock @@ -37,6 +37,47 @@ "type": "github" } }, + "assella": { + "inputs": { + "assella-src": "assella-src", + "nixpkgs": [ + "nixpkgs" + ], + "steam-src": "steam-src", + "vdf-src": "vdf-src" + }, + "locked": { + "lastModified": 1786443600, + "narHash": "sha256-YNq3EhUlQq+dnkpiVFHKgdw3a5HIFLnSQy5TMpxrVCM=", + "owner": "UltimatePlayer97", + "repo": "ASSella-nix", + "rev": "a4f8b5d64b4e181f69ae7aa79188da34e487ff5a", + "type": "github" + }, + "original": { + "owner": "UltimatePlayer97", + "repo": "ASSella-nix", + "rev": "a4f8b5d64b4e181f69ae7aa79188da34e487ff5a", + "type": "github" + } + }, + "assella-src": { + "flake": false, + "locked": { + "lastModified": 1786287819, + "narHash": "sha256-2J9MjmbNg+uhuxKIAT9IpOp4A6AxA1tDt2UZKlAJaH0=", + "owner": "niwia", + "repo": "ASSella", + "rev": "b0b323d89d0a727ac4448ff95f5021a7811908cc", + "type": "github" + }, + "original": { + "owner": "niwia", + "ref": "v2.5.8", + "repo": "ASSella", + "type": "github" + } + }, "bcdl-free": { "inputs": { "nixpkgs": [ @@ -888,6 +929,7 @@ }, "root": { "inputs": { + "assella": "assella", "bcdl-free": "bcdl-free", "gsr-ui": "gsr-ui", "home-manager": "home-manager", @@ -946,6 +988,23 @@ "type": "github" } }, + "steam-src": { + "flake": false, + "locked": { + "lastModified": 1775241569, + "narHash": "sha256-tJ/iLuDe3y3v1wcCsHzQoVhcpT7GC+zUh2ZXbhevI7k=", + "owner": "solsticegamestudios", + "repo": "steam", + "rev": "1373e885f26bb636225443787f54d4082283e5f3", + "type": "github" + }, + "original": { + "owner": "solsticegamestudios", + "repo": "steam", + "rev": "1373e885f26bb636225443787f54d4082283e5f3", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1007,6 +1066,23 @@ "type": "github" } }, + "vdf-src": { + "flake": false, + "locked": { + "lastModified": 1726204017, + "narHash": "sha256-MGhzIAy5uLulb57oz6OZ7pHFweHIDxi0WyjnPfGsA/k=", + "owner": "solsticegamestudios", + "repo": "vdf", + "rev": "fb88ea7e38a85476743f5601b0c80d5715034623", + "type": "github" + }, + "original": { + "owner": "solsticegamestudios", + "repo": "vdf", + "rev": "fb88ea7e38a85476743f5601b0c80d5715034623", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 4de9767..d23a33b 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,6 @@ }; zen-browser.url = "github:0xc000022070/zen-browser-flake"; xremap-flake.url = "github:xremap/nix-flake"; - yazi.url = "github:sxyazi/yazi"; millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; bcdl-free = { url = "git+https://git.pizzasucht.net/KeksNino/free-bandcamp-downloader"; @@ -29,6 +28,10 @@ url = "https://github.com/NixOS/nixpkgs/pull/548762.diff"; flake = false; }; + assella = { + url = "github:UltimatePlayer97/ASSella-nix/a4f8b5d64b4e181f69ae7aa79188da34e487ff5a"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -38,7 +41,6 @@ zen-browser, xremap-flake, sls-steam, - yazi, millennium, gsr-ui, bcdl-free, @@ -46,6 +48,7 @@ hyprsplit, nix-flatpak, nixpkgs-patcher, + assella, ... }@inputs: let @@ -75,7 +78,10 @@ { nixpkgs.overlays = [ millennium.overlays.default - yazi.overlays.default + ]; + + environment.systemPackages = [ + assella.packages.${system}.default ]; home-manager.users.user = import ./hosts/desktop/home-manager/home.nix; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index cf1f79f..72e3d6b 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -55,7 +55,7 @@ ]; networking.hostName = "nixos-desktop"; - networking.firewall.enable = false; + networking.firewall.enable = true; networking.networkmanager.enable = true; # Set your time zone. @@ -137,6 +137,7 @@ programs.steam = { enable = true; + protontricks.enable = true; extraCompatPackages = with pkgs; [ proton-ge-bin ]; package = pkgs.steam.override { extraEnv = { @@ -174,6 +175,14 @@ alsa.support32Bit = true; pulse.enable = true; jack.enable = true; + extraConfig.pipewire."92-no-crackling" = { + "context.properties" = { + "pulse.min.req" = 48000; + "default.clock.quantum" = 2048; + "default.clock.min-quantum" = 256; + "default.clock.max-quantum" = 4096; + }; + }; }; security.pam.loginLimits = [ diff --git a/hosts/desktop/home-manager/programs.nix b/hosts/desktop/home-manager/programs.nix index c877b7e..d011176 100644 --- a/hosts/desktop/home-manager/programs.nix +++ b/hosts/desktop/home-manager/programs.nix @@ -1,37 +1,37 @@ { pkgs, ... }: { + programs = { + distrobox.enable = true; + cava.enable = true; + equibop.enable = true; + prismlauncher.enable = true; + uv.enable = true; + satty.enable = true; + mpvpaper.enable = true; + obsidian.enable = true; + gcc.enable = true; + mpv.enable = true; + imv.enable = true; + librewolf.enable = true; + java.enable = true; - programs.distrobox.enable = true; - services.podman.enable = true; + rofi = { + enable = true; + plugins = [ pkgs.rofi-calc ]; + }; - programs.distrobox.settings = { - container_user_custom_home = "$HOME/distrobox"; + pywal = { + enable = true; + package = pkgs.pywal16; + }; }; - programs.rofi.enable = true; - programs.rofi.plugins = [ pkgs.rofi-calc ]; - - services.polkit-gnome.enable = true; - services.cliphist.enable = true; - services.udiskie.enable = true; - programs.cava.enable = true; - programs.equibop.enable = true; - services.awww.enable = true; - services.mpdris2.enable = true; - programs.prismlauncher.enable = true; - programs.uv.enable = true; - programs.satty.enable = true; - programs.mpvpaper.enable = true; - programs.obsidian.enable = true; - programs.gcc.enable = true; - programs.mpv.enable = true; - programs.imv.enable = true; - programs.librewolf.enable = true; - - programs.pywal = { - enable = true; - package = pkgs.pywal16; + services = { + podman.enable = true; + polkit-gnome.enable = true; + cliphist.enable = true; + udiskie.enable = true; + awww.enable = true; + mpdris2.enable = true; }; - - programs.java.enable = true; } diff --git a/hosts/desktop/packages.nix b/hosts/desktop/packages.nix index bcc6e5c..30d2e5e 100644 --- a/hosts/desktop/packages.nix +++ b/hosts/desktop/packages.nix @@ -72,6 +72,7 @@ unrar croc hyprlandPlugins.csgo-vulkan-fix + bs-manager ]; fonts.packages = with pkgs; [ diff --git a/modules/programs/nixvim/neovim.nix b/modules/programs/nixvim/neovim.nix index 5aea00e..c111ae1 100644 --- a/modules/programs/nixvim/neovim.nix +++ b/modules/programs/nixvim/neovim.nix @@ -1,6 +1,7 @@ { nixvim, pkgs, + config, ... }: { @@ -107,7 +108,19 @@ enable = true; highlight.enable = true; indent.enable = true; - settings.ensure_installed = "all"; + grammarPackages = with config.programs.nixvim.plugins.treesitter.package.builtGrammars; [ + bash + json + lua + markdown + nix + regex + rust + python + toml + xml + yaml + ]; }; gitsigns.enable = true; nvim-autopairs = { diff --git a/temp.nix b/temp.nix deleted file mode 100644 index 56708ed..0000000 --- a/temp.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - programs.nixvim.lsp = { - servers = { - lua_ls.enable = true; - nixd = { - enable = true; - config = { - formatting.command = [ "nixfmt" ]; - nixpkgs.expr = "import { }"; - options = - let - flake = "(builtins.getFlake \"/home/user/nix-config/\")"; - in - { - nixos.expr = "${flake}.nixosConfigurations.desktop.options"; - home_manager.expr = "${flake}.nixosConfigurations.desktop.options.home-manager.users.type.getSubOptions []"; - }; - }; - }; - }; - }; -}