diff --git a/flake.lock b/flake.lock index 1168cce..fd7d351 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1727156717, - "narHash": "sha256-Ef7UgoTdOB4PGQKSkHGu6SOxnTiArPHGcRf8qGFC39o=", + "lastModified": 1725377834, + "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", "owner": "nix-community", "repo": "disko", - "rev": "c61e50b63ad50dda5797b1593ad7771be496efbb", + "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1726523340, - "narHash": "sha256-Av5mdR2lAGUVdA6DJ8Anon3/FZg3DX4gl1Ff72rCpKU=", + "lastModified": 1722526955, + "narHash": "sha256-fFS8aDnfK9Qfm2FLnQ8pqWk8FzvFEv5LvTuZTZLREnc=", "owner": "nix-community", "repo": "dream2nix", - "rev": "b76c529f377100516c40c5b6e239a4525fdcabe0", + "rev": "3fd4c14d3683baac8d1f94286ae14fe160888b51", "type": "github" }, "original": { @@ -250,11 +250,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1727111745, - "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", + "lastModified": 1726985855, + "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=", "owner": "nix-community", "repo": "home-manager", - "rev": "21c021862fa696c8199934e2153214ab57150cb6", + "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d", "type": "github" }, "original": { @@ -484,11 +484,11 @@ }, "impermanence": { "locked": { - "lastModified": 1727198257, - "narHash": "sha256-/qMVI+SG9zvhLbQFOnqb4y4BH6DdK3DQHZU5qGptehc=", + "lastModified": 1725690722, + "narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=", "owner": "nix-community", "repo": "impermanence", - "rev": "8514fff0f048557723021ffeb31ca55f69b67de3", + "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5", "type": "github" }, "original": { @@ -542,11 +542,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1726905313, - "narHash": "sha256-jsOyXonevsNaKxM9burYc2S4JVle+VMCJ8+AAp0MDCc=", + "lastModified": 1725846500, + "narHash": "sha256-8tzJO3PllVPc0RYE0OfXVWlgTiJxKH1nzXsQLGyFRJ4=", "ref": "refs/heads/main", - "rev": "5f298f74c92402a8390b01c736463b17b36277e3", - "revCount": 16254, + "rev": "c14486ae8d3bbc862c625d948a6b2f4dc0927d5b", + "revCount": 16226, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -567,11 +567,11 @@ ] }, "locked": { - "lastModified": 1726631249, - "narHash": "sha256-b2rMO8+jKjY55d8uynX7FjV4NIPu/WzPux0kWOAzwoo=", + "lastModified": 1725836728, + "narHash": "sha256-dCbHCwqrzcHlEsRilMX+KM3IfRV46ieGqDyAD3GgCSs=", "ref": "refs/heads/main", - "rev": "b0e6f359500d66670cc16f521e4f62d6a0a4864e", - "revCount": 110, + "rev": "353b25f0b6da5ede15206d416345a2ec4195b5c8", + "revCount": 107, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -583,11 +583,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1726960027, - "narHash": "sha256-BJe+6Gpqu98Mhi1oAfrJK25SZvvQgfYqpmLaXvXgQ9g=", + "lastModified": 1725601293, + "narHash": "sha256-PLk1m0ZukClV+qrszd6WaNclpge8zGsSBTOAwYB9es4=", "owner": "NixOS", "repo": "mobile-nixos", - "rev": "a386813d9ec46fa32e51488f7d48c0e1bde77f8e", + "rev": "672f8299e484301994858d9220921309f631d616", "type": "github" }, "original": { @@ -652,11 +652,11 @@ ] }, "locked": { - "lastModified": 1727003835, - "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", + "lastModified": 1725628909, + "narHash": "sha256-xI0OSqPHcs/c/utJsU0Zvcp1VhejMI9mgwr68uHHlPs=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", + "rev": "76559183801030451e200c90a1627c1d82bb4910", "type": "github" }, "original": { @@ -691,11 +691,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1727040444, - "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "type": "github" }, "original": { @@ -897,16 +897,15 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1726745986, + "narHash": "sha256-xB35C2fpz7iyNcj9sn0a+wM2C4CQ6DGTn5VUHogstYs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "268bb5090a3c6ac5e1615b38542a868b52ef8088", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1276,11 +1275,11 @@ ] }, "locked": { - "lastModified": 1727098951, - "narHash": "sha256-gplorAc0ISAUPemUNOnRUs7jr3WiLiHZb3DJh++IkZs=", + "lastModified": 1725271838, + "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "35dfece10c642eb52928a48bee7ac06a59f93e9a", + "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 001eca4..79dd5bc 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,9 @@ inputs = { flakeParts.url = "github:hercules-ci/flake-parts"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # FIXME remove constraint + nixpkgs.url = "github:NixOS/nixpkgs"; + # nixpkgsForSisko.url = "github:NixOS/nixpkgs/0e74ca98a74bc7270d28838369593635a5db3260"; nixosHardware.url = "github:NixOS/nixos-hardware"; homeManager = { url = "github:nix-community/home-manager"; diff --git a/hmModules/foot/default.nix b/hmModules/foot/default.nix index e8ac8d3..620d5f8 100644 --- a/hmModules/foot/default.nix +++ b/hmModules/foot/default.nix @@ -14,7 +14,6 @@ lib.mkMerge [ login-shell = "yes"; dpi-aware = "no"; horizontal-letter-offset = "1"; - pad = "1x1"; font = let size = "13"; diff --git a/hmModules/freecad/default.nix b/hmModules/freecad/default.nix deleted file mode 100644 index ef86027..0000000 --- a/hmModules/freecad/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.freecad-wayland ]; -} diff --git a/hmModules/git/default.nix b/hmModules/git/default.nix index 8b1dfd4..fcec555 100644 --- a/hmModules/git/default.nix +++ b/hmModules/git/default.nix @@ -27,6 +27,8 @@ in user.signingKey = "/home/${username}/.ssh/id_rsa"; gpg.format = "ssh"; commit.gpgsign = true; + + core.editor = "emacsclient"; }; userName = config.name; diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index 32f4a8f..d1e8fc4 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -8,18 +8,6 @@ { programs.bat.enable = true; - programs.ranger = { - enable = true; - settings = { - "preview_images" = true; - "preview_images_method" = "sixel"; - }; - }; - - programs.fzf.enable = true; - - programs.ripgrep.enable = true; - programs.direnv = { enable = true; config = { @@ -28,10 +16,12 @@ nix-direnv.enable = true; }; - programs.lsd = { - enable = false; - enableAliases = true; - }; + # programs.exa = { + # enable = false; + # enableAliases = true; + # }; + + # programs.fzf.enable = false; programs.vim.enable = true; @@ -60,32 +50,169 @@ }; }; + # programs.starship = { + # enable = false; + # settings = { + # character = { + # success_symbol = "[👌](bold green)"; + # error_symbol = "[🤌](bold red)"; + # }; + # nix_shell = { + # symbol = "❄ "; + # }; + # }; + # }; + + # Playing with it sometimes + # programs.nushell = { + # enable = false; + # configFile.text = '' + # let carapace_completer = {|spans| + # carapace $spans.0 nushell $spans | from json + # } + # let-env config = { + # show_banner: false + # ls: { + # use_ls_colors: true # use the LS_COLORS environment variable to colorize output + # clickable_links: true # enable or disable clickable links. Your terminal has to support links. + # } + # rm: { + # always_trash: true # always act as if -t was given. Can be overridden with -p + # } + # cd: { + # abbreviations: true # allows `cd s/o/f` to expand to `cd some/other/folder` + # } + # table: { + # mode: compact # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other + # index_mode: always # "always" show indexes, "never" show indexes, "auto" = show indexes when a table has "index" column + # trim: { + # methodology: wrapping # wrapping or truncating + # wrapping_try_keep_words: true # A strategy used by the 'wrapping' methodology + # truncating_suffix: "..." # A suffix used by the 'truncating' methodology + # } + # } + # history: { + # max_size: 10000 # Session has to be reloaded for this to take effect + # sync_on_enter: true # Enable to share history between multiple sessions, else you have to close the session to write history to file + # file_format: "plaintext" # "sqlite" or "plaintext" + # } + # completions: { + # case_sensitive: false # set to true to enable case-sensitive completions + # quick: true # set this to false to prevent auto-selecting completions when only one remains + # partial: true # set this to false to prevent partial filling of the prompt + # algorithm: "fuzzy" # prefix or fuzzy + # external: { + # enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up my be very slow + # max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options + # completer: $carapace_completer # check 'carapace_completer' above as an example + # } + # } + # filesize: { + # metric: true # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard) + # format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, zb, zib, auto + # } + # buffer_editor: "${config.programs.helix.package}/bin/helix" + # } + # ''; + # }; + programs.fish = { enable = true; - shellInit = - '' - fish_vi_key_bindings - '' - + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) '' - export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path}) - ''; + shellInit = lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) '' + export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path}) + ''; shellAliases = { "cat" = "bat"; }; }; + # programs.zsh = { + # enable = false; # Playing xswith fish at the moment + # enableAutosuggestions = true; + # enableCompletion = true; + # enableSyntaxHighlighting = true; + # enableVteIntegration = true; + # autocd = true; + # oh-my-zsh = { + # enable = true; + # plugins = [ + # "ag" + # "cabal" + # "colored-man-pages" + # "colorize" + # "command-not-found" + # "fzf" + # "git" + # "nomad" + # "pass" + # "python" + # "sudo" + # "terraform" + # "thefuck" + # ]; + # }; + # plugins = [ + # { + # name = "fzf-tab"; + # src = pkgs.fetchFromGitHub { + # owner = "Aloxaf"; + # repo = "fzf-tab"; + # rev = "c2b4aa5ad2532cca91f23908ac7f00efb7ff09c9"; + # sha256 = "sha256-gvZp8P3quOtcy1Xtt1LAW1cfZ/zCtnAmnWqcwrKel6w="; + # }; + # } + # { + # name = "fzf-tab"; + # src = pkgs.fetchFromGitHub { + # owner = "Aloxaf"; + # repo = "fzf-tab"; + # rev = "c2b4aa5ad2532cca91f23908ac7f00efb7ff09c9"; + # sha256 = "sha256-gvZp8P3quOtcy1Xtt1LAW1cfZ/zCtnAmnWqcwrKel6w="; + # }; + # } + # { + # name = "fast-syntax-highlighting"; + # src = pkgs.fetchFromGitHub { + # owner = "zdharma-continuum"; + # repo = "fast-syntax-highlighting"; + # rev = "13d7b4e63468307b6dcb2dadf6150818f242cbff"; + # sha256 = "sha256-AmsexwVombgVmRvl4O9Kd/WbnVJHPTXETxBv18PDHz4="; + # }; + # } + # ]; + # shellAliases = { + # "cat" = "bat"; + # "em" = "TERM=wezterm emacsclient -nw"; + # }; + # loginExtra = "[[ -z $DISPLAY && $TTY = /dev/tty1 ]] && exec dbus-run-session Hyprland"; + # envExtra = '' + # # [ $TERM = "dumb" ] && unsetopt zle && PS1='$ ' # for Emacs TRAMP mode + # ''; + # initExtra = '' + # export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path}) + + # # Don't enable VIM emulation when in Emacs + # [[ -z $INSIDE_EMACS ]] && source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh + + # # When enabling starship, home-manager add an `initExtra` rule to disable it when in Emacs but not with VTerm, + # # since I use also `eat` besides `vterm` the following line is needed + # [[ "$INSIDE_EMACS" =~ "eat" ]] && eval "$(${config.home.profileDirectory}/bin/starship init zsh)" + # ''; + # }; + home.packages = with pkgs; [ thefuck + htop-vim + bottom dig.dnsutils lsof + zsh-completions + nix-zsh-completions comma - ffmpeg-headless - jless - nix-melt - jq - yq-go + carapace # used by nushell + neovim ] ++ (lib.optionals (builtins.elem hostname [ diff --git a/hmModules/tremotesf/default.nix b/hmModules/tremotesf/default.nix index 82c1336..a3569a1 100644 --- a/hmModules/tremotesf/default.nix +++ b/hmModules/tremotesf/default.nix @@ -7,9 +7,7 @@ home.packages = [ pkgs.tremotesf ]; systemd.user.services.tremotesf = { - Install.WantedBy = [ - "waybar.service" - ]; + Install.WantedBy = [ "graphical-session.target" ]; Unit = { Description = "tremotesf"; diff --git a/hmModules/zmkbatx/default.nix b/hmModules/zmkbatx/default.nix index 0070092..b7f9065 100644 --- a/hmModules/zmkbatx/default.nix +++ b/hmModules/zmkbatx/default.nix @@ -8,6 +8,7 @@ systemd.user.services.zmkBATx = { Install.WantedBy = [ + "graphical-session.target" "waybar.service" ]; @@ -16,7 +17,7 @@ }; Service = { - ExecStart = "sleep 5 && ${lib.getExe pkgs.zmkBATx}"; + ExecStart = lib.getExe pkgs.zmkBATx; Restart = "on-failure"; RestartSec = 3; }; diff --git a/hosts/default.nix b/hosts/default.nix index 480c37d..400f3ce 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -97,7 +97,6 @@ extraModules = with inputs; [ disko.nixosModules.disko impermanence.nixosModules.impermanence - lix-module.nixosModules.default ]; secrets = { "sisko-wireguard-private-key" = { }; diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index be7d2f8..def7e50 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -85,7 +85,6 @@ "vscode-server" "zk" "catppuccin" - "freecad" ]; extraGroups = [ ]; backupPaths = [ ]; diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix index 8341327..79ef8fe 100644 --- a/hosts/sisko/default.nix +++ b/hosts/sisko/default.nix @@ -21,7 +21,14 @@ "invidious" "searx" "rock5b-samba" + # "paperless" + # "restic" + # "syncthing" + # "minio" + # # "matrix" "forgejo" + # # "jellyfin" + # "immich" "prometheus" "grafana" "prometheus-exporters" @@ -29,6 +36,7 @@ "promtail" "garmin-collector" "restic" + # "immich" "atuin" ] ++ [ diff --git a/modules/immich/default.nix b/modules/immich/default.nix index be7e905..21d8bd5 100644 --- a/modules/immich/default.nix +++ b/modules/immich/default.nix @@ -1,6 +1,10 @@ +{ config, ... }: +let + nixpkgsImmich = builtins.getFlake "github:NixOS/nixpkgs/c0ee4c1770aa1ef998c977c4cc653a07ec95d9bf"; +in { - containers.immich = { - nixpkgs = builtins.getFlake "github:NixOS/nixpkgs/51296fce6f2b33717f710788af4e134aa7ff0e58"; + containers.nextcloud = { + nixpkgs = nixpkgsImmich; autoStart = true; privateNetwork = true; # hostAddress = "192.168.100.10"; diff --git a/modules/xdg/default.nix b/modules/xdg/default.nix index c1aa55a..0a07d40 100644 --- a/modules/xdg/default.nix +++ b/modules/xdg/default.nix @@ -3,18 +3,15 @@ xdg = { portal = { enable = true; - configPackages = with pkgs; [ - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland - ]; extraPortals = with pkgs; [ - xdg-desktop-portal-wlr xdg-desktop-portal-gtk xdg-desktop-portal-hyprland ]; - xdgOpenUsePortal = true; - wlr.enable = true; + config.common.default = "*"; }; }; + + environment.sessionVariables = { + GTK_USE_PORTAL = "1"; + }; } diff --git a/packages/spotify-adblocked/default.nix b/packages/spotify-adblocked/default.nix index f44acea..94df5c9 100644 --- a/packages/spotify-adblocked/default.nix +++ b/packages/spotify-adblocked/default.nix @@ -15,7 +15,7 @@ let rev = "5a3281dee9f889afdeea7263558e7a715dcf5aab"; hash = "sha256-UzpHAHpQx2MlmBNKm2turjeVmgp5zXKWm3nZbEo0mYE="; }; - cargoHash = "sha256-wPV+ZY34OMbBrjmhvwjljbwmcUiPdWNHFU3ac7aVbIQ="; + cargoSha256 = "sha256-wPV+ZY34OMbBrjmhvwjljbwmcUiPdWNHFU3ac7aVbIQ="; patchPhase = '' substituteInPlace src/lib.rs \