cspark
/
Personal-NixOS-Configuration
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update nix flake and switch back to foot terminal on niri

This commit is contained in:
Curt Spark 2025-08-18 16:28:30 +01:00
parent 4e0a480b1e
commit 9e25daebc7
4 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
flake.lock
View File

@ -104,11 +104,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754174776, "lastModified": 1755491080,
"narHash": "sha256-Sp3FRM6xNwNtGzYH/HByjzJYHSQvwsW+lDMMZNF43PQ=", "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e6e2f43a62b7dbc8aa8b1adb7101b0d8b9395445", "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -149,11 +149,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1754098183, "lastModified": 1755424351,
"narHash": "sha256-xiDTiBJlApXRiuTmOrdGaiJzs33lIdQepyCI8r9hy5w=", "narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "f2a7b326dc420360a66a542f2262081763f0f9ab", "rev": "9aa137af01f05386e5bb5050e983750017007a66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -182,11 +182,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1753983552, "lastModified": 1755419373,
"narHash": "sha256-xnPPjASWt4/u+GmRdrHADBKKSCtIhTFY53CSKM+Xtfk=", "narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "91b6a111cf228fadaabba706d8f4d155efc63b3a", "rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,11 +226,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1754193386, "lastModified": 1755049973,
"narHash": "sha256-FHD7fXA77RIF0J/eQHL0MS2+E3sZeiKN1BWC2UpY6xE=", "narHash": "sha256-gvaob2uIa06gTuBSsw+F94GeFihVaeA2FlvIVDBvthQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixd", "repo": "nixd",
"rev": "89332c35fe968902f582e5c1a3b409f6da5f9315", "rev": "52322139bb3ea930c2504a5a4ab9232fa40284c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -241,11 +241,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1753939845, "lastModified": 1755186698,
"narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "94def634a20494ee057c76998843c015909d6311", "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -269,11 +269,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1754028485, "lastModified": 1755274400,
"narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "59e69648d345d6e8fef86158c555730fa12af9de", "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -539,11 +539,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1752338000, "lastModified": 1755219541,
"narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", "narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "ba78881a68182ce338041846164cbfed0d70935c", "rev": "5a184d435927c3423f0ad189ea2b490578450fb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -560,11 +560,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753976832, "lastModified": 1755370120,
"narHash": "sha256-efMn3Eq+D0E9oNkNE3gMILewkP07H+/aIAv7i1nLQpk=", "narHash": "sha256-kiwCuAABiKawjK8g0Gun/NYeYx6oIA9RnkldJqGqNM0=",
"owner": "Benexl", "owner": "Benexl",
"repo": "yt-x", "repo": "yt-x",
"rev": "5e7d1bab53dfec99c7e04f2f25fcd11188057d20", "rev": "852dd0b3ebd5859e379e3a501582190b624ef2e9",
"type": "github" "type": "github"
}, },
"original": { "original": {

65
global.nix
View File

@ -101,6 +101,7 @@
wget wget
efibootmgr efibootmgr
ntfs3g ntfs3g
htop-vim
# Programming Stuff, language servers etc # Programming Stuff, language servers etc
gcc gcc
@ -225,42 +226,42 @@
chafa chafa
#ytfzf #ytfzf
(pidgin.override { #(pidgin.override {
plugins = [ # plugins = [
# purple-discord updated to 2024-11-23 from 2021-10-17 # # purple-discord updated to 2024-11-23 from 2021-10-17
(purple-discord.overrideAttrs (oldAttrs: { # (purple-discord.overrideAttrs (oldAttrs: {
src = fetchFromGitHub { # src = fetchFromGitHub {
owner = "EionRobb"; # owner = "EionRobb";
repo = "purple-discord"; # repo = "purple-discord";
rev = "c5dfbe0e1fd7de1f2adbf672f653f67e39686044"; # rev = "c5dfbe0e1fd7de1f2adbf672f653f67e39686044";
sha256 = "BJuw2F+7twEK8ukEwxsMhDcyVkSS6tK8iJ8uM5kygB8="; # sha256 = "BJuw2F+7twEK8ukEwxsMhDcyVkSS6tK8iJ8uM5kygB8=";
}; # };
buildInputs = oldAttrs.buildInputs ++ [ nss qrencode ]; # buildInputs = oldAttrs.buildInputs ++ [ nss qrencode ];
})) # }))
# Switch to updated fork by BenWiederhake # # Switch to updated fork by BenWiederhake
(tdlib-purple.overrideAttrs (oldAttrs: { # (tdlib-purple.overrideAttrs (oldAttrs: {
patches = []; # patches = [];
src = fetchFromGitHub { # src = fetchFromGitHub {
owner = "BenWiederhake"; # owner = "BenWiederhake";
repo = "tdlib-purple"; # repo = "tdlib-purple";
rev = "43e6cc2f14ccd08171b1515f6216f4bbf84eed80"; # rev = "43e6cc2f14ccd08171b1515f6216f4bbf84eed80";
sha256 = "Uq8yfz6UM+U296nFnZtRuUGHdcNoTCHev6GcWTy+Ys0="; # sha256 = "Uq8yfz6UM+U296nFnZtRuUGHdcNoTCHev6GcWTy+Ys0=";
}; # };
meta = with lib; { # meta = with lib; {
homepage = "https://github.com/BenWiederhake/tdlib-purple"; # homepage = "https://github.com/BenWiederhake/tdlib-purple";
description = "libpurple Telegram plugin using tdlib"; # description = "libpurple Telegram plugin using tdlib";
license = licenses.gpl2Plus; # license = licenses.gpl2Plus;
maintainers = with maintainers; [ sikmir ]; # maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix; # platforms = platforms.unix;
broken = false; # broken = false;
}; # };
})) # }))
]; # ];
}) #})
# pidginPackages.tdlib-purple # pidginPackages.tdlib-purple
lutris lutris

4
modules/nixos/cspark-desktop-niri/home.nix
View File

@ -92,8 +92,8 @@ fi
]; ];
home.sessionVariables = { home.sessionVariables = {
# TERM = "foot"; TERM = "foot";
TERM = "ghostty"; # TERM = "ghostty";
QT_QPA_PLATFORM = "wayland"; QT_QPA_PLATFORM = "wayland";
QT_QPA_PLATFORMTHEME = "qt6ct"; QT_QPA_PLATFORMTHEME = "qt6ct";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";

16
modules/nixos/cspark-desktop-niri/module.nix
View File

@ -22,8 +22,8 @@ in
swaylock # Locking swaylock # Locking
swayidle # Idle Detection (For locking) swayidle # Idle Detection (For locking)
swaybg # Set background wallpaper swaybg # Set background wallpaper
#foot # Terminal Emulator foot # Terminal Emulator
ghostty # Terminal Emulator #ghostty # Terminal Emulator
fuzzel # Application Launcher - Wayland fuzzel # Application Launcher - Wayland
wdisplays # Manage wayland displays wdisplays # Manage wayland displays
wlr-randr # Manage wayland displays - xrandr clone wlr-randr # Manage wayland displays - xrandr clone
@ -49,8 +49,8 @@ in
(writeShellScriptBin "niri-start-session" (writeShellScriptBin "niri-start-session"
'' ''
# export TERM="foot" export TERM="foot"
export TERM="ghostty" # export TERM="ghostty"
export QT_QPA_PLATFORM="wayland" export QT_QPA_PLATFORM="wayland"
export QT_QPA_PLATFORMTHEME="qt6ct" export QT_QPA_PLATFORMTHEME="qt6ct"
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
@ -157,8 +157,8 @@ in
}; };
environment.sessionVariables = { environment.sessionVariables = {
# TERM = "foot"; TERM = "foot";
TERM = "ghostty"; # TERM = "ghostty";
QT_QPA_PLATFORM = "wayland"; QT_QPA_PLATFORM = "wayland";
QT_QPA_PLATFORMTHEME = "qt6ct"; QT_QPA_PLATFORMTHEME = "qt6ct";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
@ -174,8 +174,8 @@ in
DISPLAY = ":0"; DISPLAY = ":0";
}; };
environment.variables = { environment.variables = {
# TERM = "foot"; TERM = "foot";
TERM = "ghostty"; # TERM = "ghostty";
QT_QPA_PLATFORM = "wayland"; QT_QPA_PLATFORM = "wayland";
QT_QPA_PLATFORMTHEME = "qt6ct"; QT_QPA_PLATFORMTHEME = "qt6ct";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";