From 24efa5183a4e82a8118cf6d2ae3097f9643eb852 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 23 Feb 2025 12:47:42 -0500 Subject: [PATCH 1/3] disable mako, add kotlin vscode extension, add ssh alias for github --- home/codium.nix | 65 +++++++++++++++++++++-------------------- home/yt/common.nix | 5 ++++ home/yt/ytnix.nix | 16 ---------- hosts/ytnix/default.nix | 2 +- 4 files changed, 40 insertions(+), 48 deletions(-) diff --git a/home/codium.nix b/home/codium.nix index 10aaffb..f6c9a04 100644 --- a/home/codium.nix +++ b/home/codium.nix @@ -3,40 +3,43 @@ programs.vscode = { enable = true; package = pkgs.vscodium; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; mutableExtensionsDir = false; - extensions = - # if unfree - # with pkgs.vscode-marketplace; - with pkgs.open-vsx; [ - vscodevim.vim - jnoortheen.nix-ide - github.github-vscode-theme - rust-lang.rust-analyzer - shd101wyy.markdown-preview-enhanced - ]; - userSettings = { - "workbench.colorTheme" = "GitHub Dark Default"; - "files.autoSave" = "afterDelay"; - "nix.enableLanguageServer" = true; - "nix.serverPath" = "nil"; - "editor.fontFamily" = "IBM Plex Mono"; - "editor.fontSize" = 16; - "editor.wordWrap" = "on"; + profiles.default = { + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; + extensions = + # if unfree + # with pkgs.vscode-marketplace; + with pkgs.open-vsx; [ + vscodevim.vim + jnoortheen.nix-ide + github.github-vscode-theme + rust-lang.rust-analyzer + shd101wyy.markdown-preview-enhanced + fwcd.kotlin + ]; + userSettings = { + "workbench.colorTheme" = "GitHub Dark Default"; + "files.autoSave" = "afterDelay"; + "nix.enableLanguageServer" = true; + "nix.serverPath" = "nil"; + "editor.fontFamily" = "IBM Plex Mono"; + "editor.fontSize" = 16; + "editor.wordWrap" = "on"; - # vim mode settings - "vim.handleKeys" = { - "" = false; # file tree toggle + # vim mode settings + "vim.handleKeys" = { + "" = false; # file tree toggle + }; + "vim.normalModeKeyBindings" = [ + { + "before" = [ ";" ]; + "after" = [ ":" ]; + "silent" = true; + } + ]; + "workbench.startupEditor" = "none"; }; - "vim.normalModeKeyBindings" = [ - { - "before" = [ ";" ]; - "after" = [ ":" ]; - "silent" = true; - } - ]; - "workbench.startupEditor" = "none"; }; }; } diff --git a/home/yt/common.nix b/home/yt/common.nix index 11d8c7c..b7c586e 100644 --- a/home/yt/common.nix +++ b/home/yt/common.nix @@ -58,6 +58,11 @@ }; help.autocorrect = 1; "mergetool \"vimdiff\"".cmd = "nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'"; + url = { + "ssh://git@github.com/" = { + insteadOf = "https://github.com/"; + }; + }; }; }; programs.ripgrep.enable = true; diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 7221f5c..a7f9e52 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -148,22 +148,6 @@ programs.waybar.enable = true; programs.feh.enable = true; - services.mako = { - enable = false; - backgroundColor = "#1a1a1a"; - defaultTimeout = 5000; - borderSize = 0; - borderRadius = 10; - font = "DejaVu Sans Mono 11"; - padding = "10"; - textColor = "#ffffff"; - extraConfig = '' - [urgency=high] - background-color=#c00000 - border-color=#ff0000 - ''; - }; - xdg.configFile = { rofi.source = ../rofi; waybar.source = ../waybar; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 30a6015..d6bd53e 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -153,7 +153,7 @@ git python3 wl-clipboard - mako + # mako # sway config uses this tree kitty borgbackup From 0250624887b1bb3a496a4012b5dd3ca2ad02b67b Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 23 Feb 2025 13:08:07 -0500 Subject: [PATCH 2/3] clean overlays and install java --- home/yt/ytnix.nix | 3 ++- hosts/chunk/conduwuit.nix | 4 +--- hosts/ytnix/default.nix | 5 +++++ overlay/default.nix | 8 +------- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index a7f9e52..2f4374b 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -94,7 +94,7 @@ lm_sensors sshfs gopls - anki + anki-bin trezorctl trezor-agent q @@ -143,6 +143,7 @@ )) telegram-desktop jadx + gradle ]; programs.waybar.enable = true; diff --git a/hosts/chunk/conduwuit.nix b/hosts/chunk/conduwuit.nix index 99d3958..3a6638f 100644 --- a/hosts/chunk/conduwuit.nix +++ b/hosts/chunk/conduwuit.nix @@ -1,9 +1,7 @@ -{ inputs, ... }: +{ ... }: { services.conduwuit = { enable = true; - package = - inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised; settings.global = { port = [ 8448 ]; server_name = "cything.io"; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index d6bd53e..0fd41cf 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -427,4 +427,9 @@ services.envfs.enable = true; programs.kdeconnect.enable = true; programs.dconf.enable = true; + + programs.java = { + enable = true; + binfmt = true; + }; } diff --git a/overlay/default.nix b/overlay/default.nix index 6d532cf..6f577ac 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,7 +1,6 @@ { inputs }: let overlays = [ - ./conduwuit ./attic ]; importedOverlays = map (m: import m) overlays; @@ -15,12 +14,7 @@ importedOverlays stable = inputs.nixpkgs-stable; in { - # bitwarden-cli = pkgFrom stable "bitwarden-cli"; - # roundcube = pkgFrom stable "roundcube"; - # lldb = pkgFrom stable "lldb"; - # calibre = pkgFrom stable "calibre"; - # nil = inputs.nil.packages.${prev.system}.nil; - # anki = pkgFrom inputs.anki "anki-bin"; + conduwuit = inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised; } ) ] From 21325633a98a8068ae8c3cb0890a211591ebba32 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 23 Feb 2025 13:12:47 -0500 Subject: [PATCH 3/3] flake update Signed-off-by: cy --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 63155ba..b808228 100644 --- a/flake.lock +++ b/flake.lock @@ -578,11 +578,11 @@ ] }, "locked": { - "lastModified": 1740245535, - "narHash": "sha256-65Jt61DGE5kVMFut8JLH7Zw8FwxiZV3dTHtHbjtf9mk=", + "lastModified": 1740318342, + "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=", "owner": "nix-community", "repo": "home-manager", - "rev": "7ceacd98a9fc99743ae7d9a5c0a4ea7c72314da6", + "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca", "type": "github" }, "original": { @@ -699,11 +699,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1740242292, - "narHash": "sha256-TqB+T5xMpJceNghzPuEG10eo6G+n60J12YOo/xG2kF8=", + "lastModified": 1740318097, + "narHash": "sha256-lCRwHfZqpXO/Q98WCTD0eOWvKpA2J4ANLxrDzd3aWJw=", "ref": "refs/heads/main", - "rev": "184922de1915e2920ebd8b59e072dd41f968d52c", - "revCount": 17447, + "rev": "aaab224bea76cc6882884f9223b4bec2a781ebd4", + "revCount": 17460, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -779,11 +779,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740219878, - "narHash": "sha256-t/kNZLTDelJDRAWaLdfeG97IpqaHjnt/oO9priALSa4=", + "lastModified": 1740326457, + "narHash": "sha256-C1tiPRIXI6Z5vd3pz26/JQ/p+VaG2eKD6PNk8ZqFW1E=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "964d99464ac8330927db693f827027c16a3a3b76", + "rev": "23b0234ac1b03709a0cec40e84d293f083859dc9", "type": "github" }, "original": { @@ -812,11 +812,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1740117926, - "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "lastModified": 1740251548, + "narHash": "sha256-53kgDwNYEPIZadX5SEk7+OoTXycHm1QUF7x2XCoo9+U=", "owner": "YaLTeR", "repo": "niri", - "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "rev": "bca65452882e1e616045e21a0a9a4a0b7024239b", "type": "github" }, "original": { @@ -1043,11 +1043,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1739923778, - "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", + "lastModified": 1740162160, + "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", + "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740215764, - "narHash": "sha256-wzBbGGZ6i1VVBA/cDJaLfuuGYCUriD7fwsLgJJHRVRk=", + "lastModified": 1740301968, + "narHash": "sha256-eDAiNagpMExcLoSIgjdef2ZYyvjuy1VTF8r9OZXCMGc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8465e233b0668cf162c608a92e62e8d78c1ba7e4", + "rev": "b7fe81518095c48a8ba94fc7cfe5c0fc8370851b", "type": "github" }, "original": { @@ -1330,11 +1330,11 @@ ] }, "locked": { - "lastModified": 1740191166, - "narHash": "sha256-WqRxO1Afx8jPYG4CKwkvDFWFvDLCwCd4mxb97hFGYPg=", + "lastModified": 1740277845, + "narHash": "sha256-NNU0CdiaSbAeZ8tpDG4aFi9qtcdlItRvk8Xns9oBrVU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "74a3fb71b0cc67376ab9e7c31abcd68c813fc226", + "rev": "f933070c29f9c1c5457447a51903f27f76ebb519", "type": "github" }, "original": { @@ -1426,11 +1426,11 @@ ] }, "locked": { - "lastModified": 1740188781, - "narHash": "sha256-3FDg6k9kQXq5M6ZHc2f9KsPydvWBtqacU9lWA7nIFYI=", + "lastModified": 1740275623, + "narHash": "sha256-LQ9hq3hKwWqm+dzBhgsIkr2KO6Bb0aU+yO/TtI7hXXo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ba52a14c907e0cece9734e0ff59c3c742b6b1075", + "rev": "35ff5dce04469e7b4e56a9d997e5201bfce52ae3", "type": "github" }, "original": {