This commit is contained in:
2024-11-24 13:19:18 -05:00
parent b4106472e3
commit 555a049637
7 changed files with 82 additions and 71 deletions

View File

@@ -54,11 +54,11 @@
]
},
"locked": {
"lastModified": 1731778696,
"narHash": "sha256-qQYeHamLt0z00G5MTSSxaTw/9zGdebEeYj4MDL+nOCI=",
"lastModified": 1732397793,
"narHash": "sha256-2jaf/zkug22hzlldm1PKdKJLVKgdjVXbf47SF+5mroU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d154a557da07645aaea3b3375317c234cf2eed82",
"rev": "92fef254a9071fa41a13908281284e6a62b9c92e",
"type": "github"
},
"original": {
@@ -79,11 +79,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1731726258,
"narHash": "sha256-hCybwO9VTRC34wG/dE7trehhAkNI0abuQYEd3ebOXgw=",
"lastModified": 1732366896,
"narHash": "sha256-dQrHznGma8aWeBESRUCc1onWYoGrM35GDl/uwEB7eG8=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "8fa219c123e66b7812748a8c380770b7b714bf29",
"rev": "3131d857c946c75557f5b6fb99a113b6949ea04d",
"type": "github"
},
"original": {
@@ -95,16 +95,16 @@
"niri-stable": {
"flake": false,
"locked": {
"lastModified": 1731164272,
"narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=",
"lastModified": 1731483594,
"narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "9d8f640503819ff1905c9040d3c7910a50400bbd",
"rev": "75c79116a7e40cbc0e110ce0cdd500e896458679",
"type": "github"
},
"original": {
"owner": "YaLTeR",
"ref": "v0.1.10",
"ref": "v0.1.10.1",
"repo": "niri",
"type": "github"
}
@@ -112,11 +112,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1731575130,
"narHash": "sha256-V+bIsYXshtdMv7Ycw1Y/xVfKdWVywXuqHHII7FgV6dg=",
"lastModified": 1732363756,
"narHash": "sha256-/E2aRhcvlH2PkkpC2n79UCMZyIkQKWfG4m//UHkeNgU=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "1a0612cbfd0abee0796efa86470226686ae78f21",
"rev": "9c7e8d04d27d2f914ad3e9a54c64b64c34aea4d4",
"type": "github"
},
"original": {
@@ -127,11 +127,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1731319897,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github"
},
"original": {
@@ -143,11 +143,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1731652201,
"narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=",
"lastModified": 1731797254,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"type": "github"
},
"original": {
@@ -174,11 +174,11 @@
]
},
"locked": {
"lastModified": 1731724228,
"narHash": "sha256-3R48B+BVeZ8IWsXF7TdRm441RsdJt21yQ5ZgxuNTXYc=",
"lastModified": 1732328983,
"narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "f6c4c2a7b8969c2b172847b3ef474e0d3bd8bdce",
"rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72",
"type": "github"
},
"original": {
@@ -222,11 +222,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1731123454,
"narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=",
"lastModified": 1732233710,
"narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab",
"rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1",
"type": "github"
},
"original": {

View File

@@ -60,7 +60,6 @@
mpv
mumble
system76-keyboard-configurator
mission-center
#jellyfin
finamp # music player
@@ -96,8 +95,28 @@
puddletag
epiphany
mcaselector
];
programs.zed-editor = {
enable = true;
userSettings = {
ui_font_size = 16;
buffer_font_size = 16;
theme = {
mode = "system";
light = "Gruvbox Dark Hard";
dark = "One Dark";
};
};
extensions = [
"nix"
"sql"
"CSV"
];
};
# make chromium-based stuff use wayland
home.file.".config/chromium-flags.conf".text = "--ozone-platform-hint=auto";

View File

@@ -13,6 +13,7 @@
];
home.stateVersion = "24.11";
home.enableNixpkgsReleaseCheck = false;
home.packages = with pkgs; [
# hex viewer

View File

@@ -6,13 +6,13 @@
}:
{
programs.niri = {
package = pkgs.niri-unstable;
package = pkgs.niri-stable;
settings = {
prefer-no-csd = true;
# environment = {
# DISPLAY = ":0";
# };
environment = {
DISPLAY = ":0";
};
# skip the hotkey menu thingy
hotkey-overlay.skip-at-startup = true;
@@ -54,13 +54,13 @@
];
}
# {
# command = [
# "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite"
# # (builtins.toString config.programs.niri.settings.environment.DISPLAY)
# ":0"
# ];
# }
{
command = [
"${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite"
# (builtins.toString config.programs.niri.settings.environment.DISPLAY)
":0"
];
}
];
window-rules = [
@@ -88,9 +88,7 @@
binds = with config.lib.niri.actions; {
# Application launcher
"Mod+Space".action = spawn [
"${pkgs.rofi-wayland}/bin/rofi"
"-show"
"combi"
"${pkgs.fuzzel}/bin/fuzzel"
];
# open a terminal

View File

@@ -28,6 +28,8 @@
# used by /etc/nixos logic to launch niri
config.programs.niri.package
xwayland-satellite-unstable
];
services.blueman-applet.enable = true;
@@ -49,16 +51,6 @@
package = pkgs.dunst;
};
# rofi for application launcher
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
extraConfig = {
modi = "window,drun,ssh,combi";
combi-modi = "window,drun,ssh";
};
};
age.secrets.borg-laptop-password = {
file = ./secrets/borg-laptop-password.age;
path = "${homeDirectory}/.secrets/borg_bak_pass";