diff --git a/flake.lock b/flake.lock index b4c7f98..b0fc213 100644 --- a/flake.lock +++ b/flake.lock @@ -189,39 +189,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -637,41 +604,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1737234286, - "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", - "rev": "079528098f5998ba13c88821a2eca1005c1695de", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_2", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742943028, - "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", - "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" - } - }, "nixpak": { "inputs": { "flake-parts": [ @@ -833,11 +765,10 @@ "hyprland": "hyprland", "impermanence": "impermanence", "lanzaboote": "lanzaboote", - "lix-module": "lix-module", "nixpkgs": "nixpkgs_2", "quickshell": "quickshell", "schizofox": "schizofox", - "systems": "systems_4" + "systems": "systems_3" } }, "rust-overlay": { @@ -890,7 +821,7 @@ "nixpak": "nixpak", "nixpkgs": "nixpkgs_3", "searx-randomizer": "searx-randomizer", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1744892989, @@ -945,21 +876,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -974,7 +890,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", diff --git a/flake.nix b/flake.nix index 64012ac..28699fc 100644 --- a/flake.nix +++ b/flake.nix @@ -13,23 +13,21 @@ }) pkgsFor; - formatter = eachSystem (system: pkgsFor.${system}.alejandra); + formatter.x86_64-linux = inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra; - packages = - lib.mapAttrs ( - system: pkgs: { - inherit - (import ./packages { - inherit pkgs; - helix = inputs.helix.packages.${system}.default; - }) - fish - wrapped-helix - kakoune - ; - } - ) - pkgsFor; + packages = eachSystem ( + system: { + inherit + (import ./packages rec { + pkgs = pkgsFor.${system}; + helix = inputs.helix.packages.${pkgs.system}.default; + }) + fish + wrapped-helix + kakoune + ; + } + ); apps = eachSystem (system: let inherit (inputs.self.packages.${system}) fish wrapped-helix; @@ -74,10 +72,5 @@ # Mismatched system dependencies will lead to crashes and other issues. inputs.nixpkgs.follows = "nixpkgs"; }; - - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; } diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index cf0502c..655f67f 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -36,7 +36,7 @@ in { udisks2.enable = true; }; - virtualisation.docker.enable = false; + virtualisation.docker.enable = true; meta = { mainUser.gitSigningKey = ""; diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix index ca3d742..9559ac9 100644 --- a/hosts/temperance/programs.nix +++ b/hosts/temperance/programs.nix @@ -43,6 +43,7 @@ in { logiops mpv nautilus + nextcloud-client nheko nicotine-plus obsidian diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index fff3d61..5568d7b 100644 --- a/modules/programs/gui/foot.nix +++ b/modules/programs/gui/foot.nix @@ -18,7 +18,7 @@ locked-title = "no"; font = "Iosevka Nerd Font:size=14"; - font-bold = "Iosevka Nerd Font:size=14:style=Bold"; + font-bold = "Iosevka Nerd Font:size=14"; line-height = 20; letter-spacing = 0; diff --git a/modules/services/owncloud/module.nix b/modules/services/owncloud/module.nix index 0239704..2d7974e 100644 --- a/modules/services/owncloud/module.nix +++ b/modules/services/owncloud/module.nix @@ -30,19 +30,19 @@ in { # User = "cr"; # Group = "cr"; - # Keyringmode = "shared"; - # DevicePolicy = "closed"; - # PrivateDevices = true; - # PrivateTmp = true; - # ProtectClock = true; - # ProtectControlGroups = true; - # ProtectControlGroup = true; - # ProtectKernelLogs = true; - # ProtectKernelModules = true; - # ProtectKernelTunables = true; + Keyringmode = "shared"; + DevicePolicy = "closed"; + PrivateDevices = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectControlGroup = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; - # ProtectSystem = "strict"; - # SystemCallFilter = "~@clock @cpu-emulation @debug @obsolete @module @mount @raw-io @reboot @swap @privileged"; + ProtectSystem = "strict"; + SystemCallFilter = "~@clock @cpu-emulation @debug @obsolete @module @mount @raw-io @reboot @swap @privileged"; }; }; }; diff --git a/modules/system/nix/module.nix b/modules/system/nix/module.nix index 69e8b78..4f0d67a 100644 --- a/modules/system/nix/module.nix +++ b/modules/system/nix/module.nix @@ -12,11 +12,10 @@ in { imports = [ ./documentation.nix # nixos documentation ./nixpkgs.nix # global nixpkgs configuration - inputs.lix-module.nixosModules.default ]; nix = { - # package = pkgs.lix; + package = pkgs.lix; # fuck channels, no thanks channel.enable = mkForce false; @@ -99,7 +98,6 @@ in { "nix-command" # experimental nix commands "cgroups" # allow nix to execute builds inside cgroups "repl-flake" # nh os repl needs this on lix - "pipe-operator" ]; # Ensures that the result of Nix expressions is fully determined by diff --git a/modules/wms/wayland/hyprland/binds.nix b/modules/wms/wayland/hyprland/binds.nix index 860ed20..ed9c3ff 100644 --- a/modules/wms/wayland/hyprland/binds.nix +++ b/modules/wms/wayland/hyprland/binds.nix @@ -31,7 +31,7 @@ in { "$mainMod, RETURN, exec, foot" "$mainMod, Q, killactive" "$mainMod, F, fullscreen, 0" - "$mainMod, D, exec, ${getExe' inputs.quickshell.packages.${pkgs.stdenv.system}.default "quickshell"} msg launcher open" + "$mainMod, D, exec, ${pkgs.procps}/bin/pkill fuzzel || ${getExe pkgs.fuzzel}" "$mainMod, SPACE, togglefloating, active" "$mainMod ALT, L, exec, ${getExe pkgs.hyprlock}" diff --git a/modules/wms/wayland/hyprland/decorations.nix b/modules/wms/wayland/hyprland/decorations.nix index 2355693..5d75710 100644 --- a/modules/wms/wayland/hyprland/decorations.nix +++ b/modules/wms/wayland/hyprland/decorations.nix @@ -5,7 +5,7 @@ _: { rounding = 10; rounding_power = 3; blur = { - enabled = true; + enabled = false; size = 3; passes = 2; }; @@ -19,13 +19,13 @@ _: { animations = { enabled = true; }; - animation = [ - "windows, 1, 4, dupa, popin" - "windowsOut, 1, 4, dupa, slide" - "border, 1, 15, default" - "fade, 1, 10, default" - "workspaces, 1, 5, dupa, slidevert" - ]; + animation = [ + "windows, 1, 4, dupa, popin" + "windowsOut, 1, 4, dupa, slide" + "border, 1, 15, default" + "fade, 1, 10, default" + "workspaces, 1, 5, dupa, slidevert" + ]; cursor = { hide_on_key_press = true; @@ -59,11 +59,5 @@ _: { "center, class: ^(code), title: ^(Open*)" "float, class:^(org.keepassxc.KeePassXC)$" ]; - - layerrule = [ - "blur, shell:launcher" - "ignorezero, shell:launcher" - "animation popin 90%, shell:launcher" - ]; }; } diff --git a/packages/helix.nix b/packages/helix.nix index c084885..305dbaa 100644 --- a/packages/helix.nix +++ b/packages/helix.nix @@ -31,7 +31,6 @@ tinymist, typescript-language-server, vscode-langservers-extracted, - simple-completion-language-server, helix, ... }: let @@ -137,12 +136,6 @@ auto-format = true; language-servers = ["dprint" "typescript-language-server"]; } - { - name = "jjdescription"; - scope = "source.jjdescription"; - file-types = ["jjdescription"]; - language-servers = ["scls"]; - } { name = "json"; formatter = mark "json"; @@ -151,11 +144,10 @@ name = "markdown"; auto-format = true; formatter = mark "md"; - language-servers = ["scls" "marksman"]; } { name = "nix"; - language-servers = ["nil" "scls"]; + language-servers = ["nil"]; } { name = "qml"; @@ -216,10 +208,7 @@ rust-analyzer = { config = { - check = { - command = "clippy"; - extraArgs = ["--" "-W" "clippy::pedantic" "-W" "clippy::nursery" "-W" "clippy::perf"]; - }; + check.command = "clippy"; cargo.features = "all"; }; }; @@ -266,20 +255,6 @@ config.nil.formatting.command = ["${getExe alejandra}" "-q"]; }; - scls = { - command = getExe simple-completion-language-server; - config = { - max_completion_items = 100; # set max completion results len for each group: words, snippets, unicode-input - feature_words = true; # enable completion by word - feature_snippets = true; # enable snippets - snippets_first = true; # completions will return before snippets by default - snippets_inline_by_word_tail = false; # suggest snippets by WORD tail, for example text `xsq|` become `x^2|` when snippet `sq` has body `^2` - feature_unicode_input = false; # enable "unicode input" - feature_paths = false; # enable path completion - feature_citations = false; # enable citation completion (only on `citation` feature enabled) - }; - }; - typescript-language-server = { command = lib.getExe typescript-language-server; args = ["--stdio"];