diff --git a/configurations/desktop/home.nix b/configurations/desktop/home.nix index d6440824..3524de1a 100644 --- a/configurations/desktop/home.nix +++ b/configurations/desktop/home.nix @@ -92,7 +92,7 @@ programs.bash.shellAliases = { nixos-rebuild-system-flake-switch = "sudo nixos-rebuild switch --flake /etc/nixos#desktop"; - nixos-rebuild-system-flake-build = "sudo nixos-rebuild build --flake /etc/nixos#desktop"; + nixos-rebuild-system-flake-boot = "sudo nixos-rebuild boot --flake /etc/nixos#desktop"; }; } diff --git a/configurations/laptop/home.nix b/configurations/laptop/home.nix index e6a80d11..b1705193 100644 --- a/configurations/laptop/home.nix +++ b/configurations/laptop/home.nix @@ -50,11 +50,12 @@ programs.bash.shellAliases = { nixos-rebuild-system-flake-switch = "sudo nixos-rebuild switch --flake /etc/nixos#laptop"; - nixos-rebuild-system-flake-build = "sudo nixos-rebuild build --flake /etc/nixos#laptop"; + nixos-rebuild-system-flake-boot = "sudo nixos-rebuild boot --flake /etc/nixos#laptop"; }; home.sessionVariables = { - EDITOR = "emacsclient -c"; + # EDITOR = "emacsclient -c"; + EDITOR = "nvim"; }; } diff --git a/flake.lock b/flake.lock index 049e7735..7f508c9e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "apple-fonts": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "ny": "ny", "sf-arabic": "sf-arabic", "sf-armenian": "sf-armenian", @@ -26,28 +28,6 @@ "type": "github" } }, - "blue-build": { - "inputs": { - "flake-schemas": "flake-schemas", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1746218021, - "narHash": "sha256-Rz2zEAwYkpPtOiX7+LSJnXoJUhkZBq2Xm2CUTMzmd6A=", - "owner": "blue-build", - "repo": "cli", - "rev": "f8950b3477d5fa70250e6cb89726e320f9f1b0e5", - "type": "github" - }, - "original": { - "owner": "blue-build", - "repo": "cli", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -81,30 +61,16 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1697467827, - "narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=", - "rev": "764932025c817d4e500a8d2a4d8c565563923d29", - "revCount": 29, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.2/018b3da8-4cc3-7fbb-8ff7-1588413c53e2/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A.tar.gz" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -120,11 +86,11 @@ ] }, "locked": { - "lastModified": 1746243165, - "narHash": "sha256-DQycVmlyLQNLjLJ/FzpokVmbxGQ8HjQQ4zN4nyq2vII=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0962eeeabfb8127713f859ec8a5f0e86dead0f2", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { @@ -135,7 +101,9 @@ }, "musnix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1741303672, @@ -163,11 +131,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1746142190, - "narHash": "sha256-t36K3TWLMRWoGyjYyo+H8bBquDcp4orZqNZVagWNjwY=", + "lastModified": 1748286492, + "narHash": "sha256-14bRczJErvDIyeHlOrdMcqGwW2VPUnyZCbuTFu8L/wE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "af701c1c16c289b1b14f333d844b4f756308d244", + "rev": "88f4c38ccaf73691e738c758f149009d3266d0bd", "type": "github" }, "original": { @@ -196,11 +164,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1746124654, - "narHash": "sha256-LmhkAt2KLvf8lp+kEUQuTFmmv7iXO8IkwwSaPasfXJw=", + "lastModified": 1748151941, + "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", "owner": "YaLTeR", "repo": "niri", - "rev": "6c9705dd4b2eaba25f024d1a3efd7943fd393632", + "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", "type": "github" }, "original": { @@ -213,15 +181,17 @@ "inputs": { "flake-parts": "flake-parts", "flake-root": "flake-root", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746212243, - "narHash": "sha256-BKrQIdolNE09l94dNXHp7UWjtyvijjJy+JcdnEIRydg=", + "lastModified": 1746955667, + "narHash": "sha256-VgVbPqZl8S09EGWFmgX++aFsz0Z7VmskSJGBXFE4eEs=", "owner": "nix-community", "repo": "nixd", - "rev": "0cd3cf83e32fc7791b7e9e994064cd666f79d441", + "rev": "7d19dfe5b65035aa255b83147375fdd8257459b9", "type": "github" }, "original": { @@ -232,11 +202,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740828860, - "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -260,16 +230,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -290,53 +260,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1740695751, - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1744174375, - "narHash": "sha256-oxI9TLgnQbQ/WL0tIwVSIooLbXq4PW1QUhf5aQmXFgk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ef3a956f697525883b77192cbe208233ea0f8f79", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "ny": { "flake": false, "locked": { @@ -352,35 +275,13 @@ "root": { "inputs": { "apple-fonts": "apple-fonts", - "blue-build": "blue-build", "home-manager": "home-manager", "musnix": "musnix", "niri": "niri", "nixd": "nixd", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "blue-build", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709086241, - "narHash": "sha256-3QHK5zu/5XOa+ghBeKzvt+/BLdEPjw/xDNLcpDfbkmg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5d56056fb905ff550ee61b6ebb6674d494f57a9e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable_2", + "yt-x": "yt-x" } }, "sf-arabic": { @@ -523,11 +424,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1745730655, - "narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=", + "lastModified": 1748057133, + "narHash": "sha256-t9XPqehcZYDh4YVDq6w/c/L+MhoE/9MIQSYTQOwMwp8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153", + "rev": "572fa4a2bfe920daacdefc7e564b49115413306a", "type": "github" }, "original": { @@ -535,6 +436,27 @@ "repo": "xwayland-satellite", "type": "github" } + }, + "yt-x": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742708823, + "narHash": "sha256-KjMYMDkFjY+I0qJbZuJv+YMg7/9gyR3SRw/UKLv1MTA=", + "owner": "Benexl", + "repo": "yt-x", + "rev": "0d1ead815c0c116530000d048922d50e712c9184", + "type": "github" + }, + "original": { + "owner": "Benexl", + "repo": "yt-x", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3fb068e1..6bec323b 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - blue-build = { - url = "github:blue-build/cli"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # blue-build = { + # url = "github:blue-build/cli"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; niri = { url = "github:sodiboo/niri-flake"; @@ -22,22 +22,32 @@ nixd = { url = "github:nix-community/nixd"; + inputs.nixpkgs.follows = "nixpkgs"; }; musnix = { url = "github:musnix/musnix"; + inputs.nixpkgs.follows = "nixpkgs"; }; - apple-fonts = { - url = "github:Lyndeno/apple-fonts.nix"; - }; + yt-x = { + url = "github:Benexl/yt-x"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - #emacs-overlay = { - # url = "github:nix-community/emacs-overlay"; - #}; + apple-fonts = { + url = "github:Lyndeno/apple-fonts.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + #emacs-overlay = { + # url = "github:nix-community/emacs-overlay"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; #xwayland-satellite-flake = { # url = "github:cspark-development/xwayland-satellite-flake"; + # inputs.nixpkgs.follows = "nixpkgs"; #}; }; diff --git a/global-home.nix b/global-home.nix index 60f50b8c..5aa9bbdc 100644 --- a/global-home.nix +++ b/global-home.nix @@ -257,8 +257,8 @@ fi ]; home.sessionVariables = { - EDITOR = "emacsclient -c"; - # EDITOR = "nvim"; + # EDITOR = "emacsclient -c"; + EDITOR = "nvim"; # Dotnet path not found fix DOTNET_ROOT = "${pkgs.dotnet-sdk}"; diff --git a/global.nix b/global.nix index 41292ad1..948b35fc 100644 --- a/global.nix +++ b/global.nix @@ -89,7 +89,7 @@ in # Normal (unstable) packages with pkgs; [ - inputs.blue-build.packages.${pkgs.system}.bluebuild + #inputs.blue-build.packages.${pkgs.system}.bluebuild python-with-my-packages nix-prefetch-scripts @@ -214,6 +214,9 @@ element-desktop # cinny-desktop freetube + inputs.yt-x.packages."${system}".default + chafa + #ytfzf (pidgin.override { plugins = [ @@ -275,7 +278,8 @@ MIDIVisualizer kdePackages.kdenlive - vlc + # vlc + mpv # unityhub veracrypt boxbuddy @@ -286,7 +290,7 @@ # kdePackages.k3b # xfce.xfburn ffmpeg - ventoy-full + # ventoy-full qbittorrent krita @@ -434,8 +438,8 @@ DOTNET_ROOT = "${pkgs.dotnet-sdk}"; # Set neovim to be used instead of less for viewing manpages - # MANPAGER = "nvim +Man!"; - MANPAGER = "emacsclient -c"; + MANPAGER = "nvim +Man!"; + # MANPAGER = "emacsclient -c"; # Nicer terminal prompt PS1="\[\e[0;36m\]\u\[\e[0m\]@\[\e[0;33m\]\h\[\e[0m\]:\[\e[0;35m\]\w\[\e[0m\] \$ "; diff --git a/modules/nixos/cspark-desktop-exwm/module.nix b/modules/nixos/cspark-desktop-exwm/module.nix index c5b783ce..6b9ba085 100644 --- a/modules/nixos/cspark-desktop-exwm/module.nix +++ b/modules/nixos/cspark-desktop-exwm/module.nix @@ -148,7 +148,8 @@ in }; environment.sessionVariables = { - EDITOR="emacsclient -c"; + # EDITOR="emacsclient -c"; + EDITOR="nvim"; QT_QPA_PLATFORMTHEME = "qt6ct"; SDL_VIDEODRIVER = "x11,windows"; _JAVA_AWT_WM_NONREPARENTING = "1"; @@ -156,7 +157,8 @@ in SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass"; }; environment.variables = { - EDITOR="emacsclient -c"; + # EDITOR="emacsclient -c"; + EDITOR="nvim"; QT_QPA_PLATFORMTHEME = "qt6ct"; SDL_VIDEODRIVER = "x11,windows"; _JAVA_AWT_WM_NONREPARENTING = "1"; diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix index 7b73d80a..0d88b08c 100644 --- a/modules/nixos/cspark-desktop-niri/home.nix +++ b/modules/nixos/cspark-desktop-niri/home.nix @@ -22,6 +22,7 @@ in "niri/config.kdl".source = ./resources/home-manager/.config/niri/config.kdl; "mako/config".source = ./resources/home-manager/.config/mako/config; "foot/foot.ini".source = ./resources/home-manager/.config/foot/foot.ini; + "ghostty/config".source = ./resources/home-manager/.config/ghostty/config; "networkmanager-dmenu/config.ini".source = ./resources/home-manager/.config/networkmanager-dmenu/config.ini; }; @@ -80,7 +81,8 @@ fi ]; home.sessionVariables = { - TERM = "foot"; + # TERM = "foot"; + TERM = "ghostty"; QT_QPA_PLATFORM = "wayland"; QT_QPA_PLATFORMTHEME = "qt6ct"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix index bac70c6f..9384a6f5 100644 --- a/modules/nixos/cspark-desktop-niri/module.nix +++ b/modules/nixos/cspark-desktop-niri/module.nix @@ -22,7 +22,8 @@ in swaylock # Locking swayidle # Idle Detection (For locking) swaybg # Set background wallpaper - foot # Terminal Emulator + #foot # Terminal Emulator + ghostty # Terminal Emulator fuzzel # Application Launcher - Wayland wdisplays # Manage wayland displays wlr-randr # Manage wayland displays - xrandr clone @@ -47,7 +48,8 @@ in (writeShellScriptBin "niri-start-session" '' - export TERM="foot" + # export TERM="foot" + export TERM="ghostty" export QT_QPA_PLATFORM="wayland" export QT_QPA_PLATFORMTHEME="qt6ct" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" @@ -154,7 +156,8 @@ in }; environment.sessionVariables = { - TERM = "foot"; + # TERM = "foot"; + TERM = "ghostty"; QT_QPA_PLATFORM = "wayland"; QT_QPA_PLATFORMTHEME = "qt6ct"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; @@ -170,7 +173,8 @@ in DISPLAY = ":0"; }; environment.variables = { - TERM = "foot"; + # TERM = "foot"; + TERM = "ghostty"; QT_QPA_PLATFORM = "wayland"; QT_QPA_PLATFORMTHEME = "qt6ct"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/ghostty/config b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/ghostty/config new file mode 100644 index 00000000..7954c16b --- /dev/null +++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/ghostty/config @@ -0,0 +1,11 @@ +font-family = SFMono Nerd Font +font-size = 18.5 +theme = GruvboxLight +cursor-style = block +# adjust-cell-height = 35% +# background = #000000 +# background-opacity = 0.65 +window-padding-balance = false +copy-on-select = clipboard +confirm-close-surface = false +initial-command = bash -c 'nvim +terminal && bash' diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl index 6063f4bc..5e4cf2b9 100644 --- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl +++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl @@ -298,7 +298,8 @@ binds { Alt+Shift+Slash { show-hotkey-overlay; } // Suggested binds for running programs: terminal, app launcher, screen locker. - Alt+Return { spawn "foot"; } + //Alt+Return { spawn "foot"; } + Alt+Return { spawn "ghostty"; } Alt+D { spawn "fuzzel-xwayland"; } Super+L { spawn "swaylock"; } Ctrl+Alt+P { spawn "fuzzel-pass"; }