Compare commits

..

4 Commits

7 changed files with 43 additions and 19 deletions

View File

@@ -5,4 +5,4 @@ if [ "$ARG" = "" ]; then
ARG="boot" ARG="boot"
fi fi
nixos-rebuild "$ARG" --flake . --use-remote-sudo nixos-rebuild "$ARG" --flake . --sudo

30
flake.lock generated
View File

@@ -120,11 +120,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750212636, "lastModified": 1750301575,
"narHash": "sha256-CujXEkwwtFio512OiaNMCrdKPk1czPnIIc4Wyu9vThs=", "narHash": "sha256-gNHJ34A0oK2jRD5fFkVX/Zb3iaiJ32VssnpzGaP4hPc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "78302713c2e102690ca9b531ed36c2c38d2794c9", "rev": "2fab8c74721be21e8e06a95ab35f4e940c93a15e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -213,11 +213,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750127463, "lastModified": 1750304462,
"narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=", "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "28eef8722d1af18ca13e687dbf485e1c653a0402", "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -289,11 +289,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1750195569, "lastModified": 1750270605,
"narHash": "sha256-9x+a8uvRBcOVbs1TRDSo8zOUdmv/kJZzS4n/uqooTyo=", "narHash": "sha256-JfuuBGrM36I7KB9UID5urRvjHWWjFW//gMxQ5g9PrSo=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "f7ce79d983af69c030e8f06f31e35a5058d1bf9e", "rev": "da32eedd0d2c980fc90fe2b5cdd9080cc8c9f51f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -322,11 +322,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1750142220, "lastModified": 1750225787,
"narHash": "sha256-5gUJXh0/mm1YIsLhWgaGitUtGsQvrYRsT4zmGmRHn9M=", "narHash": "sha256-7O/8CChaOhSBSu94McHE0vyH0o+J5R4exq2DDq4zHAg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "e53f8527b0517cf965961ae729b7dd631ed76db5", "rev": "ed14e8da8476d5fde27b14d1dde03256a2f6e11b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -459,11 +459,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750214276, "lastModified": 1750300711,
"narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", "narHash": "sha256-4XHPocwP+66PhxyyObPXfI+Rql4PoGe/xBK791N8I78=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", "rev": "4178888556c15e0a1c57850d2f103ac300a6e9e2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -7,7 +7,8 @@
{ {
imports = [ imports = [
./no-gui.nix ./no-gui.nix
./progs/alacritty.nix # ./progs/alacritty.nix
./progs/ghostty.nix
./progs/emacs.nix ./progs/emacs.nix
# ./progs/gpt4all/gpt4all.nix # ./progs/gpt4all/gpt4all.nix
# ./progs/trezor.nix # - broken # ./progs/trezor.nix # - broken
@@ -162,7 +163,6 @@
}; };
home.sessionVariables = { home.sessionVariables = {
TERMINAL = "alacritty";
BROWSER = "zen"; BROWSER = "zen";
LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath [ LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath [
pkgs.stdenv.cc.cc pkgs.stdenv.cc.cc

View File

@@ -190,6 +190,10 @@ in
# java assembler # java assembler
jasmin jasmin
# used to deploy nix system to server
# (and in the future, desktop)
deploy-rs
] ]
++ rust_pkgs ++ rust_pkgs
++ lsps; ++ lsps;

View File

@@ -1,5 +1,9 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.sessionVariables = {
TERMINAL = "alacritty";
};
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
package = pkgs.alacritty; package = pkgs.alacritty;

View File

@@ -0,0 +1,16 @@
{ pkgs, ... }:
{
# https://mynixos.com/home-manager/option/programs.ghostty
programs.ghostty = {
enable = true;
enableFishIntegration = true;
settings = {
theme = "Adventure";
background-opacity = 0.7;
};
};
home.sessionVariables = {
TERMINAL = "ghostty";
};
}

View File

@@ -133,7 +133,7 @@
"Mod+O".action = toggle-overview; "Mod+O".action = toggle-overview;
# open a terminal # open a terminal
"Mod+T".action = spawn "${pkgs.alacritty}/bin/alacritty"; "Mod+T".action = spawn config.home.sessionVariables.TERMINAL;
# lock the screen # lock the screen
"Mod+X".action = spawn "${pkgs.swaylock}/bin/swaylock"; "Mod+X".action = spawn "${pkgs.swaylock}/bin/swaylock";