diff --git a/flake.lock b/flake.lock index 35af11f0..70bbe0bf 100644 --- a/flake.lock +++ b/flake.lock @@ -683,17 +683,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1753191145, - "narHash": "sha256-Oao4ouyTAPXzuywI3wW1JuFnwdraVvg1TsjSTTXWRWE=", - "ref": "refs/heads/main", - "rev": "72cad8918b21343ee55e14d7c2f1eeff1874ee91", - "revCount": 18178, - "type": "git", - "url": "https://git.lix.systems/lix-project/lix" + "lastModified": 1753223229, + "narHash": "sha256-tkT4aCZZE6IEmjYotOzKKa2rV3pGpH3ZREeQn7ACgdU=", + "rev": "7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a.tar.gz?rev=7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" } }, "lix-module": { @@ -706,15 +704,16 @@ ] }, "locked": { - "lastModified": 1751909859, - "narHash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=", - "ref": "refs/heads/main", - "rev": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f", - "revCount": 150, + "lastModified": 1753282722, + "narHash": "sha256-KYMUrTV7H/RR5/HRnjV5R3rRIuBXMemyJzTLi50NFTs=", + "ref": "release-2.93", + "rev": "46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873", + "revCount": 149, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, "original": { + "ref": "release-2.93", "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" } diff --git a/flake.nix b/flake.nix index 1be201e2..0342d629 100644 --- a/flake.nix +++ b/flake.nix @@ -24,12 +24,12 @@ }; }; lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module"; + url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.lix = { - url = "git+https://git.lix.systems/lix-project/lix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #inputs.lix = { + # url = "git+https://git.lix.systems/lix-project/lix"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; }; systems.url = "github:nix-systems/default"; # TODO: https://github.com/catppuccin/nix/issues/601 diff --git a/home/profiles/graphical/obsidian.nix b/home/profiles/graphical/obsidian.nix index 4101b8ed..bb7351d6 100644 --- a/home/profiles/graphical/obsidian.nix +++ b/home/profiles/graphical/obsidian.nix @@ -1,5 +1,23 @@ _: { programs.obsidian = { enable = true; + + vaults."Notes".enable = true; + + defaultSettings = { + app = { + vimMode = true; + showUnsupportedFiles = true; + showLineNumber = true; + livePreview = false; + readableLineLength = true; + }; + appearance = { + monospaceFontFamily = "Iosevka,Consolas"; + textFontFamily = "Ubuntu Sans"; + interfaceFontFamily = "Monaspace Krypton"; + baseFontSize = 16; + }; + }; }; } diff --git a/home/profiles/graphical/packages.nix b/home/profiles/graphical/packages.nix index b8e120c8..a81f5af4 100644 --- a/home/profiles/graphical/packages.nix +++ b/home/profiles/graphical/packages.nix @@ -8,8 +8,9 @@ htop # Mail - #thunderbird + thunderbird + aseprite # Chat tdesktop # Telegram dino # XMPP diff --git a/home/profiles/neovim/default.nix b/home/profiles/neovim/default.nix index 755cbb06..0a63faac 100644 --- a/home/profiles/neovim/default.nix +++ b/home/profiles/neovim/default.nix @@ -63,6 +63,10 @@ in { nvim-notify # Session management resession-nvim + # obsidian vault support for neovim + obsidian-nvim + # commentry + vim-commentary # tree sitter (pkgs.vimPlugins.nvim-treesitter.withPlugins (_: with pkgs.tree-sitter-grammars; [ diff --git a/home/profiles/shell/bat.nix b/home/profiles/shell/bat.nix new file mode 100644 index 00000000..8bdc0899 --- /dev/null +++ b/home/profiles/shell/bat.nix @@ -0,0 +1,3 @@ +_: { + programs.bat.enable = true; +} diff --git a/home/profiles/shell/git.nix b/home/profiles/shell/git.nix index 1104bcec..7848f33e 100644 --- a/home/profiles/shell/git.nix +++ b/home/profiles/shell/git.nix @@ -13,6 +13,9 @@ inherit (tree.home.user.data) userName userEmail; package = pkgs.gitAndTools.gitFull; enable = true; + delta = { + enable = true; + }; extraConfig = { init = {defaultBranch = "main";}; protocol.gcrypt.allow = "always"; diff --git a/home/profiles/shell/packages.nix b/home/profiles/shell/packages.nix index 7f45fef7..35af1ef2 100644 --- a/home/profiles/shell/packages.nix +++ b/home/profiles/shell/packages.nix @@ -11,8 +11,6 @@ file # command monitoring pv - # cat but better - bat # sed replacement sd # sops diff --git a/modules/home/konawall.nix b/modules/home/konawall.nix index be358139..1c5fe047 100644 --- a/modules/home/konawall.nix +++ b/modules/home/konawall.nix @@ -2,6 +2,7 @@ inherit (lib.options) mkOption mkEnableOption mkPackageOption; inherit (lib.types) submodule path nullOr; inherit (lib.modules) mkIf; + inherit (lib.meta) getExe'; cfg = config.programs.konawall-py; in { options.programs.konawall-py = { @@ -31,7 +32,7 @@ in { After = ["graphical-session.target" "network-online.target"]; }; Service = { - ExecStart = "${cfg.package}/bin/konawall"; + ExecStart = "${getExe' cfg.package "gui"}"; Restart = "on-failure"; RestartSec = "1s"; EnvironmentFile = cfg.environmentFile; diff --git a/nixos/profiles/gaming/heroic.nix b/nixos/profiles/gaming/heroic.nix new file mode 100644 index 00000000..fa6a171b --- /dev/null +++ b/nixos/profiles/gaming/heroic.nix @@ -0,0 +1,3 @@ +{ pkgs, ... }: { + environment.systemPackages = [ pkgs.heroic ]; +} diff --git a/nixos/profiles/graphical/fonts.nix b/nixos/profiles/graphical/fonts.nix index 02de72b0..374d2750 100644 --- a/nixos/profiles/graphical/fonts.nix +++ b/nixos/profiles/graphical/fonts.nix @@ -8,6 +8,7 @@ corefonts vistafonts open-dyslexic + ubuntu-sans ]; enableDefaultPackages = true; fontDir.enable = true; diff --git a/systems/goliath.nix b/systems/goliath.nix index c594c525..e49f9aa6 100644 --- a/systems/goliath.nix +++ b/systems/goliath.nix @@ -69,7 +69,7 @@ _: let konawall-py.settings = { source = "e621"; tags = [ - "-rating:s" + "rating:s" #"-male/male" "-overweight_male" "-five_nights_at_freddy's"