diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..211e56c --- /dev/null +++ b/.envrc @@ -0,0 +1,3 @@ +SSH_AUTH_SOCK=/tmp/ssh-XXXXXXIm9FPa/agent.4751; export SSH_AUTH_SOCK; +SSH_AGENT_PID=4752; export SSH_AGENT_PID; +echo Agent pid 4752; diff --git a/flake.lock b/flake.lock index 800264d..0e21c68 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1757385184, - "narHash": "sha256-LCxtQn9ajvOgGRbQIRUJgfP7clMGGvV1SDW1HcSb0zk=", + "lastModified": 1757920978, + "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "26993d87fd0d3b14f7667b74ad82235f120d986e", + "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1756426754, - "narHash": "sha256-EVJDo/KjdGtvJKelVPoL92TsPNrqnOJUnaLTIqP+F0o=", - "rev": "f4bdddf0fdaabc68546cf561c5343b83d95d2466", + "lastModified": 1757791852, + "narHash": "sha256-G7QPn4gnKeXuecVfiglVSUqxufgB4Z4dlO/1zygXsBA=", + "rev": "8981fb5a18ae15f664b27fde437dce3e17030874", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f4bdddf0fdaabc68546cf561c5343b83d95d2466.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8981fb5a18ae15f664b27fde437dce3e17030874.tar.gz?rev=8981fb5a18ae15f664b27fde437dce3e17030874" }, "original": { "type": "tarball", @@ -99,7 +99,7 @@ "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3f09a5eb772e02d98bb8878ab687d5b721f00d16.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3f09a5eb772e02d98bb8878ab687d5b721f00d16.tar.gz?rev=3f09a5eb772e02d98bb8878ab687d5b721f00d16" }, "original": { "type": "tarball", @@ -112,11 +112,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757427959, - "narHash": "sha256-p0i07rLfAMzJWYfsjFOXEtIWeS1EGVxJaCi9gfyCwRE=", + "lastModified": 1757937573, + "narHash": "sha256-B+MT526k5th4x22h213/CgzdkKWIaeaa0+Y0uuCkH/I=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "785f1b67b6c53de088f640f2a7da50ca4b2d7161", + "rev": "134e117c969f42277f1c5e60c8fbcac103c2c454", "type": "github" }, "original": { @@ -128,11 +128,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757347588, - "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -178,18 +178,19 @@ "inputs": { "nixpkgs": "nixpkgs_3", "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix_2", + "pyproject-nix": "pyproject-nix", "uv2nix": "uv2nix" }, "locked": { - "path": "./system/extras/pydev/", + "lastModified": 1, + "narHash": "sha256-wBVLwFjGszsaibW+oPRSRFq6vzKPxSmfsh1evEQ56Ow=", + "path": "/nix/store/287fy1a3bmc2xzhxj470ssn8xp5r183g-source/system/extras/pydev", "type": "path" }, "original": { - "path": "./system/extras/pydev/", + "path": "/nix/store/287fy1a3bmc2xzhxj470ssn8xp5r183g-source/system/extras/pydev", "type": "path" - }, - "parent": [] + } }, "pyproject-build-systems": { "inputs": { @@ -197,7 +198,10 @@ "pydev", "nixpkgs" ], - "pyproject-nix": "pyproject-nix", + "pyproject-nix": [ + "pydev", + "pyproject-nix" + ], "uv2nix": [ "pydev", "uv2nix" @@ -218,28 +222,6 @@ } }, "pyproject-nix": { - "inputs": { - "nixpkgs": [ - "pydev", - "pyproject-build-systems", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755886095, - "narHash": "sha256-oMQ1YERKqiac28LB1cKjl4d0gjvK98SbGejFMfK0WGE=", - "owner": "nix-community", - "repo": "pyproject.nix", - "rev": "7ea903d50c20d4d3ea45ccaad7ee0d21996780c9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "pyproject.nix", - "type": "github" - } - }, - "pyproject-nix_2": { "inputs": { "nixpkgs": [ "pydev", diff --git a/home-manager/autumn/bundles/langs.nix b/home-manager/autumn/bundles/langs.nix index a785ecc..c338591 100644 --- a/home-manager/autumn/bundles/langs.nix +++ b/home-manager/autumn/bundles/langs.nix @@ -7,6 +7,8 @@ ember-cli ember-language-server fish-lsp + gcc + libgcc gleam kdlfmt lessc @@ -15,6 +17,8 @@ nimlangserver odin ols + # python314 + python313 ruby rubyPackages_3_4.solargraph ruff @@ -23,6 +27,8 @@ superhtml ty vscode-langservers-extracted + vala + vala-language-server yaml-language-server ]; } diff --git a/home-manager/autumn/home.nix b/home-manager/autumn/home.nix index 988868c..18ea07b 100644 --- a/home-manager/autumn/home.nix +++ b/home-manager/autumn/home.nix @@ -13,7 +13,6 @@ obsidian htop gnumake - python314Full eza fm felix diff --git a/home-manager/packages/river/river.nix b/home-manager/packages/river/river.nix index 130dcbb..c28a6a1 100644 --- a/home-manager/packages/river/river.nix +++ b/home-manager/packages/river/river.nix @@ -20,15 +20,13 @@ in settings = { spawn = [ #set wallpaper - # "swaybg --image ~/Downloads/wp.jpg" - # set gaps on wideriver "~/login-wm-setup.sh" + # set gaps on wideriver "~/login-wm-setup-2.sh" ]; output-layout = "wideriver"; rule-add = "ssd"; - border-color-focused = "0x7fbbb3"; - border-color-unfocusd = "0xd3c6aa"; + border-color-urgent = "0xe67e80"; map = { normal = { # spawn binds @@ -36,6 +34,7 @@ in "Super R" = "spawn fuzzel"; "Super E" = "spawn fm"; "Super B" = "spawn obsidian"; + "Super Escape" = "spawn \"swaylock --screenshots --clock --indicator --indicator-radius 250 --indicator-thickness 12 --effect-blur 7x5 --ring-color 7fbbb3 --line-color d3c6aa --inside-color 2b3339 --separator-color 83c092\""; # format changes "Super U" = "${cmd} \"--layout left\""; @@ -45,12 +44,12 @@ in "Super N" = "${cmd} \"--layout monocle\""; "Super M" = "${cmd} \"--layout wide\""; - # globals "Alt Q" = "close"; "Super+Shift E" = "exit"; "Super+Shift Return" = "zoom"; "Super F" = "toggle-fullscreen"; + "Super+Shift F" = "toggle-float"; #movement "Super J" = "focus-view next"; diff --git a/system/defaults/services.nix b/system/defaults/services.nix index f71f6be..fb11487 100644 --- a/system/defaults/services.nix +++ b/system/defaults/services.nix @@ -12,5 +12,6 @@ }; openssh.enable = true; flatpak.enable = true; + cron.enable = true; }; } diff --git a/system/extras/pydev/flake.nix b/system/extras/pydev/flake.nix index 13a2a89..ab5ffd2 100644 --- a/system/extras/pydev/flake.nix +++ b/system/extras/pydev/flake.nix @@ -13,7 +13,7 @@ }; pyproject-build-systems = { url = "github:pyproject-nix/build-system-pkgs"; - inputs.pyproject-nex.follows = "pyproject-nix"; + inputs.pyproject-nix.follows = "pyproject-nix"; inputs.uv2nix.follows = "uv2nix"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix index 34173d3..1c86e0b 100644 --- a/system/yukigekko/configuration.nix +++ b/system/yukigekko/configuration.nix @@ -24,7 +24,7 @@ time.timeZone = "${timezone}"; - programs.river.enable = true; + programs.river-classic.enable = true; xdg.portal = { enable = true; config.common.default = "*"; @@ -68,7 +68,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - vim + vim pavucontrol nh docker @@ -76,6 +76,9 @@ podman skopeo buildkit + tree + swaylock-effects + code-cursor-fhs ]; virtualisation.containers.policy = {