diff --git a/flake.lock b/flake.lock index 9950639..8cd1162 100644 --- a/flake.lock +++ b/flake.lock @@ -74,22 +74,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -167,24 +151,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -199,27 +165,6 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" - }, - "locked": { - "lastModified": 1737430029, - "narHash": "sha256-z55IQogW9z4HhVeT55LlCUFKbYD5O5aLMnU5cX1WTto=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "5cb2fa6f7594202b12a2603bf32094aa75b1bf0e", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -362,7 +307,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" @@ -392,7 +337,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, @@ -509,22 +454,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -540,7 +469,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_2": { "locked": { "lastModified": 1737299813, "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", @@ -556,26 +485,10 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "home-manager": "home-manager_2", @@ -602,7 +515,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -634,7 +547,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1731363552, @@ -654,7 +567,6 @@ "inputs": { "disko": "disko", "flake-parts": "flake-parts", - "ghostty": "ghostty", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "niri": "niri", @@ -742,21 +654,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": { "inputs": { "nixpkgs": [ @@ -830,31 +727,6 @@ "repo": "xwayland-satellite", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": "flake-utils", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1ff46a7..6942dfe 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,6 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - ghostty.url = "github:ghostty-org/ghostty"; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR }; @@ -115,7 +114,6 @@ overlays = [ inputs.niri.overlays.niri inputs.rust-overlay.overlays.default - inputs.ghostty.overlays.default ] ++ import ./overlay; }; in diff --git a/home/foot.nix b/home/foot.nix index ce7cb0c..2df77bc 100644 --- a/home/foot.nix +++ b/home/foot.nix @@ -17,32 +17,40 @@ blink = "yes"; blink-rate = 500; beam-thickness = 1.5; - color = "161821 c6c8d1"; }; mouse = { hide-when-typing = "yes"; }; colors = { - foreground = "c6c8d1"; background = "161821"; - regular0 = "1e2132"; - regular1 = "e27878"; - regular2 = "b4be82"; - regular3 = "e2a478"; - regular4 = "84a0c6"; - regular5 = "a093c7"; - regular6 = "89b8c2"; - regular7 = "c6c8d1"; + foreground = "c6c8d1"; + + selection-background = "1e2132"; + selection-foreground = "c6c8d1"; + + regular0 = "161821"; bright0 = "6b7089"; + + regular1 = "e27878"; bright1 = "e98989"; + + regular2 = "b4be82"; bright2 = "c0ca8e"; + + regular3 = "e2a478"; bright3 = "e9b189"; + + regular4 = "84a0c6"; bright4 = "91acd1"; + + regular5 = "a093c7"; bright5 = "ada0d3"; + + regular6 = "89b8c2"; bright6 = "95c4ce"; + + regular7 = "c6c8d1"; bright7 = "d2d4de"; - selection-foreground = "161821"; - selection-background = "c6c8d1"; }; key-bindings = { diff --git a/home/ghostty.nix b/home/ghostty.nix deleted file mode 100644 index cbde83e..0000000 --- a/home/ghostty.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ ... }: { - programs.ghostty = { - enable = true; - enableZshIntegration = true; - clearDefaultKeybinds = true; - settings = { - theme = "iceberg-dark"; - font-family = "IBM Plex Mono"; - font-size = "12"; - window-decoration = false; - confirm-close-surface = false; - keybind = [ - "ctrl+q=quit" - "ctrl+shift+c=copy_to_clipboard" - ]; - }; - }; -} diff --git a/home/irssi.nix b/home/irssi.nix deleted file mode 100644 index 65da469..0000000 --- a/home/irssi.nix +++ /dev/null @@ -1,18 +0,0 @@ -{...}: { - programs.irssi = { - enable = true; - networks.liberachat = { - nick = "cy7"; - server = { - address = "irc.libera.chat"; - port = 6697; - autoConnect = true; - }; - channels = { - nixos.autoJoin = true; - linux.autoJoin = true; - rust.autoJoin = true; - }; - }; - }; -} diff --git a/home/niri/default.nix b/home/niri/default.nix index fdc7418..af7b3ba 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -6,7 +6,7 @@ }: let wallpaper = "${./nixos-c-book.png}"; - terminal = "ghostty"; + terminal = "foot"; menu = [ "fuzzel" "-w" @@ -93,7 +93,6 @@ in app-id = "anki"; title = "^Browse"; } - { app-id = "com.mitchellh.ghostt"; } ]; default-column-width.proportion = .5; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index e200eab..2fa8d16 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -7,8 +7,6 @@ ./common.nix ../foot.nix ../niri - ../irssi.nix - ../ghostty.nix ]; home = { username = "yt"; @@ -42,13 +40,6 @@ }; }; - home.pointerCursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern"; - gtk.enable = true; - x11.enable = true; - }; - home.packages = with pkgs; [ firefox ungoogled-chromium @@ -56,6 +47,7 @@ bitwarden-desktop bitwarden-cli fastfetch + discord nwg-look kdePackages.gwenview kdePackages.okular