diff options
| -rw-r--r-- | flake.lock | 188 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | hosts/nyaan/default.nix | 11 | ||||
| -rw-r--r-- | hosts/nyaan/home.nix | 4 | ||||
| -rw-r--r-- | share/cfg/default.nix | 1 | ||||
| -rw-r--r-- | share/cfg/jujutsu.nix | 39 | ||||
| -rw-r--r-- | share/cfg/waybar.css | 18 | ||||
| -rw-r--r-- | share/home/dev-stuff.nix | 10 | ||||
| -rw-r--r-- | share/home/shell.nix | 2 | ||||
| -rw-r--r-- | share/system/client-common.nix | 12 |
10 files changed, 130 insertions, 159 deletions
@@ -23,17 +23,17 @@ "emacs-overlay": { "inputs": { "nixpkgs": [ - "sorrepkgs", + "xpkgs", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1739610734, - "narHash": "sha256-rmCJ6iUTn5XAE7T4w96a+sRQrHRfnv064NHu+8dVBB4=", + "lastModified": 1774197122, + "narHash": "sha256-eidCp9jr4doBF6v2hPwqZkt8fUtW14w7fqHFVtstR94=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "15fe2e796e097c4fda4ed481401ae80f2b714525", + "rev": "4f7b5653f8845eee7c41c9a029d7bc22aaca4e67", "type": "github" }, "original": { @@ -97,27 +97,27 @@ "type": "github" } }, - "futils": { + "flake-parts_3": { "inputs": { - "systems": "systems" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1722472559, - "narHash": "sha256-HqzEdURUwgCNDpopDC38NbChC0cOyj1L47EP+1aco8k=", - "ref": "refs/heads/main", - "rev": "aaa51589dd772073c6eb48d6b7bd51dc8be3b455", - "revCount": 4, - "type": "git", - "url": "https://git.sorre.xyz/isabella/futils.git" + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" }, "original": { - "type": "git", - "url": "https://git.sorre.xyz/isabella/futils.git" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, - "futils_2": { + "futils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1722472559, @@ -126,11 +126,11 @@ "rev": "aaa51589dd772073c6eb48d6b7bd51dc8be3b455", "revCount": 4, "type": "git", - "url": "https://git.sorre.xyz/miranb/futils" + "url": "https://git.sorre.xyz/isabella/futils.git" }, "original": { "type": "git", - "url": "https://git.sorre.xyz/miranb/futils" + "url": "https://git.sorre.xyz/isabella/futils.git" } }, "gitignore": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774201162, - "narHash": "sha256-th4i3X3P3yikPk3qu1A5DQ40tIztZKvAKPaa9hjXF+U=", + "lastModified": 1774622476, + "narHash": "sha256-lhx5jiMYRaBAkH5MmkWQ+VQjXGjeKIJqnvsPWa9fn40=", "owner": "nix-community", "repo": "home-manager", - "rev": "932ca46013acabbedd13c27dc278e3d043707e46", + "rev": "accd450fcdbb1e1018cd8701b4980b36d57f28f0", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774113359, - "narHash": "sha256-b7/LsPn5uZoFNjGVQ26q+6QPf8Q9IHHmRx+rGLZ8oyY=", + "lastModified": 1774620721, + "narHash": "sha256-QucawBaJ6Rl5JWAXAbpouXM1MsvlzwCsPGl3zOwLtzw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1c4a800bbe0c4cbcf99529fd88286a14450261a8", + "rev": "fb83d584532282f585cd02f3aa513e98b843e7e7", "type": "github" }, "original": { @@ -220,11 +220,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1773130184, - "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=", + "lastModified": 1774616418, + "narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=", "owner": "YaLTeR", "repo": "niri", - "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea", + "rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -264,13 +264,28 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1773964973, - "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", + "lastModified": 1774388614, + "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", + "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", "type": "github" }, "original": { @@ -282,27 +297,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1773964973, + "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -318,11 +333,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1774207541, - "narHash": "sha256-I6P6g9+reKkl5GDElidDk/uySnA6k5vCM+arBbo+ciM=", + "lastModified": 1774616000, + "narHash": "sha256-fPtYDx+6NSvcrsR3kJ/s/4Exc/BRzOkNZT3E1PgL0Io=", "owner": "nix-community", "repo": "nur", - "rev": "876dd755052a387e790f23ac7e88d3772e5e610a", + "rev": "1fb4ca6ac4d9af7bceb2b132e98c0553bbebf8a1", "type": "github" }, "original": { @@ -364,8 +379,8 @@ "nur": "nur", "sops-nix": "sops-nix", "sorre-website": "sorre-website", - "sorrepkgs": "sorrepkgs", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix_2", + "xpkgs": "xpkgs" } }, "sops-nix": { @@ -375,11 +390,11 @@ ] }, "locked": { - "lastModified": 1774154798, - "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=", + "lastModified": 1774303811, + "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170", + "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042", "type": "github" }, "original": { @@ -411,28 +426,6 @@ "url": "https://git.sorre.xyz/isabella/sorre-website.git" } }, - "sorrepkgs": { - "inputs": { - "emacs-overlay": "emacs-overlay", - "futils": "futils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1740323134, - "narHash": "sha256-NsfswF61MhLFianT/5w3f5wmgduKs0YIdxTCUudl8+A=", - "ref": "refs/heads/main", - "rev": "a58bca8abf4c28072cfd95c0036bbf16a1339611", - "revCount": 12, - "type": "git", - "url": "https://git.sorre.xyz/isabella/xpkgs" - }, - "original": { - "type": "git", - "url": "https://git.sorre.xyz/isabella/xpkgs" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -448,21 +441,6 @@ "type": "github" } }, - "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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -504,6 +482,44 @@ "type": "github" } }, + "wrapper-manager": { + "locked": { + "lastModified": 1772780728, + "narHash": "sha256-fCm4sOeTDf3kBtYMmU4OHsviI/oF8rMbPkUMcQf6lw4=", + "owner": "viperML", + "repo": "wrapper-manager", + "rev": "51ad0422b925d830bf4af36979fed51209f79c0a", + "type": "github" + }, + "original": { + "owner": "viperML", + "repo": "wrapper-manager", + "type": "github" + } + }, + "xpkgs": { + "inputs": { + "emacs-overlay": "emacs-overlay", + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "nixpkgs" + ], + "wrapper-manager": "wrapper-manager" + }, + "locked": { + "lastModified": 1774623359, + "narHash": "sha256-0mfkO7oGDKgDfzOzL0j8aD4KVeQ93yTj/s/peu81X38=", + "ref": "refs/heads/main", + "rev": "8cac6bc950b815ee483ca9cfaa2ab9f6002d110f", + "revCount": 24, + "type": "git", + "url": "https://git.sorre.xyz/isabella/xpkgs" + }, + "original": { + "type": "git", + "url": "https://git.sorre.xyz/isabella/xpkgs" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -20,12 +20,10 @@ url = "git+https://git.sorre.xyz/isabella/sorre-website.git"; inputs.nixpkgs.follows = "nixpkgs"; }; - sorrepkgs = { + xpkgs = { url = "git+https://git.sorre.xyz/isabella/xpkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; - nur.url = "github:nix-community/nur"; - niri-flake = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/nyaan/default.nix b/hosts/nyaan/default.nix index d90e930..d2817cb 100644 --- a/hosts/nyaan/default.nix +++ b/hosts/nyaan/default.nix @@ -2,7 +2,6 @@ pkgs, flakeRoot, inputs, - config, ... }: { @@ -43,7 +42,7 @@ # Enable the KDE Plasma Desktop Environment. services.displayManager = { - defaultSession = "niri"; + # defaultSession = "niri"; sddm = { enable = true; wayland.enable = true; @@ -59,10 +58,10 @@ # raised from default 1024 because niri test was failing # systemd.extraConfig = "DefaultLimitNOFILE=4096"; - programs.niri = { - enable = true; - package = pkgs.niri-stable; - }; + # programs.niri = { + # enable = true; + # package = pkgs.niri-stable; + # }; # Configure keymap in X11 services.xserver.xkb = { diff --git a/hosts/nyaan/home.nix b/hosts/nyaan/home.nix index f982160..3a88627 100644 --- a/hosts/nyaan/home.nix +++ b/hosts/nyaan/home.nix @@ -5,7 +5,7 @@ config, ... }: - { +{ home-manager = { useGlobalPkgs = true; useUserPackages = true; @@ -23,7 +23,7 @@ (flakeRoot + /share/home/shell.nix) (flakeRoot + /share/home/gui-tools.nix) # (flakeRoot + /share/home/gaming.nix) - (flakeRoot + /share/home/niri.nix) + # (flakeRoot + /share/home/niri.nix) ]; programs.tofi.enable = true; diff --git a/share/cfg/default.nix b/share/cfg/default.nix index 6b74ae4..c834122 100644 --- a/share/cfg/default.nix +++ b/share/cfg/default.nix @@ -11,7 +11,6 @@ ./shellenv.nix ./fish.nix ./hyprland.nix - ./jujutsu.nix ./emacs.nix ./foot.nix ./zed diff --git a/share/cfg/jujutsu.nix b/share/cfg/jujutsu.nix deleted file mode 100644 index 9904a42..0000000 --- a/share/cfg/jujutsu.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ ... }: -{ - programs.jujutsu.settings = { - user = { - email = "isabella@sorre.xyz"; - name = "Isabella Bastaja"; - }; - ui.paginate = "never"; - signing = { - behavior = "own"; - backend = "gpg"; - key = "isabella@sorre.xyz"; - backends.gpg.allow-expired-keys = false; - }; - git = { - sign-on-push = true; - private-commits = "description(glob:'private:*')"; - write-change-id-header = true; - }; - - # `jj l` shows commits on the working-copy commit's (anonymous) branch - # compared to the `main` branch - aliases.l = [ - "log" - "-r" - "(main..@):: | (main..@)-" - ]; - - aliases.tug = [ - "bookmark" - "move" - "--from" - "heads(::@- & bookmarks())" - "--to" - "@-" - ]; - }; - programs.delta.enableJujutsuIntegration = true; -} diff --git a/share/cfg/waybar.css b/share/cfg/waybar.css index 9bbb802..b17e6d1 100644 --- a/share/cfg/waybar.css +++ b/share/cfg/waybar.css @@ -1,12 +1,12 @@ * { /* `otf-font-awesome` is required to be installed for icons */ font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: 1.1rem; } window#waybar { background-color: rgba(43, 48, 59, 0.5); - border-bottom: 3px solid rgba(100, 114, 125, 0.5); + border-bottom: 2px solid rgba(100, 114, 125, 0.5); color: #ffffff; transition-property: background-color; transition-duration: 0.5s; @@ -27,7 +27,7 @@ window#waybar.chromium { button { /* Use box-shadow instead of border so the text isn't offset */ - box-shadow: inset 0 -3px transparent; + box-shadow: inset 0 -2px transparent; /* Avoid rounded borders under each button name */ border: none; border-radius: 0; @@ -36,7 +36,7 @@ button { /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ button:hover { background: inherit; - box-shadow: inset 0 -3px #ffffff; + box-shadow: inset 0 -2px #ffffff; } #workspaces button { @@ -51,7 +51,7 @@ button:hover { #workspaces button.focused { background-color: #64727d; - box-shadow: inset 0 -3px #ffffff; + box-shadow: inset 0 -2px #ffffff; } #workspaces button.urgent { @@ -60,7 +60,7 @@ button:hover { #mode { background-color: #64727d; - box-shadow: inset 0 -3px #ffffff; + box-shadow: inset 0 -2px #ffffff; } #clock, @@ -85,7 +85,7 @@ button:hover { } #window { - margin: 0 4px; + margin: 0 2px; } #clock { @@ -121,7 +121,7 @@ button:hover { } #power-profiles-daemon { - padding-right: 15px; + padding-right: 1.25rem; } #power-profiles-daemon.performance { @@ -222,7 +222,7 @@ label:focus { color: #740864; padding: 0 5px; margin: 0 5px; - min-width: 16px; + min-width: 1.25rem; } #keyboard-state { diff --git a/share/home/dev-stuff.nix b/share/home/dev-stuff.nix index 9c5baa0..53012ad 100644 --- a/share/home/dev-stuff.nix +++ b/share/home/dev-stuff.nix @@ -1,4 +1,7 @@ -{ pkgs, ... }: +{ + pkgs, + ... +}: let python = pkgs.python313.withPackages ( python-pkgs: with python-pkgs; [ @@ -84,7 +87,10 @@ in }; programs.git.enable = true; - programs.jujutsu.enable = true; + programs.jujutsu = { + enable = true; + package = pkgs.sorre.jujutsu; + }; services.emacs.enable = true; programs.helix = { enable = true; diff --git a/share/home/shell.nix b/share/home/shell.nix index c0d4f84..c91f956 100644 --- a/share/home/shell.nix +++ b/share/home/shell.nix @@ -8,7 +8,7 @@ }; home.packages = [ - pkgs.nur.repos.sorre.lightnovel-crawler + pkgs.sorre.lightnovel-crawler ] ++ builtins.attrValues { inherit (pkgs) diff --git a/share/system/client-common.nix b/share/system/client-common.nix index 8cdff36..4f4223c 100644 --- a/share/system/client-common.nix +++ b/share/system/client-common.nix @@ -12,15 +12,7 @@ nixpkgs = { overlays = [ inputs.niri-flake.overlays.niri - (final: prev: { - nur = import inputs.nur { - nurpkgs = prev; - pkgs = prev; - repoOverrides = { - sorre = import inputs.sorrepkgs { pkgs = prev; }; - }; - }; - }) + inputs.xpkgs.overlays.default ]; config.allowUnfree = true; }; @@ -65,7 +57,7 @@ automatic = true; persistent = true; randomizedDelaySec = "15min"; - options = ''--delete-older-than 7d''; + options = "--delete-older-than 7d"; }; networking = { |