mirror of
https://github.com/Theaninova/TheaninovOS.git
synced 2025-12-12 11:36:20 +00:00
Compare commits
2 Commits
11ce7be6ff
...
f899bd1cb5
| Author | SHA1 | Date | |
|---|---|---|---|
|
f899bd1cb5
|
|||
|
b01574822a
|
54
flake.lock
generated
54
flake.lock
generated
@@ -43,11 +43,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736143030,
|
"lastModified": 1738453229,
|
||||||
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
|
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
|
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -129,11 +129,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738448366,
|
"lastModified": 1739845242,
|
||||||
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
|
"narHash": "sha256-rNMXpDubNWGLTs45MuoH9YHtXfXye/fn2u4YMSTPt9I=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
|
"rev": "5cfbf5cc37a3bd1da07ae84eea1b828909c4456b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -150,11 +150,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738407251,
|
"lastModified": 1738878603,
|
||||||
"narHash": "sha256-IDrc1qvFolaEDST/dWKgDcmJsemlfP4Yw6kh5O9TMVs=",
|
"narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "055c67056d87577a39af4144ad5eadb093cfb97d",
|
"rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -221,11 +221,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738277753,
|
"lastModified": 1738743987,
|
||||||
"narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=",
|
"narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9",
|
"rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -236,11 +236,11 @@
|
|||||||
},
|
},
|
||||||
"nix-flatpak": {
|
"nix-flatpak": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734128415,
|
"lastModified": 1739444422,
|
||||||
"narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=",
|
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
|
||||||
"owner": "gmodena",
|
"owner": "gmodena",
|
||||||
"repo": "nix-flatpak",
|
"repo": "nix-flatpak",
|
||||||
"rev": "8bdc2540da516006d07b04019eb57ae0781a04b3",
|
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -252,11 +252,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738410390,
|
"lastModified": 1739736696,
|
||||||
"narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
|
"narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
|
"rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -281,11 +281,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738468832,
|
"lastModified": 1739751913,
|
||||||
"narHash": "sha256-+YOdIULLio6C6mlZvW3cg1oHLLbuNh0Hx82zFTaP9SM=",
|
"narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "8104356af6536df366eea4b8bcc409320323b959",
|
"rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -304,11 +304,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737924095,
|
"lastModified": 1738508923,
|
||||||
"narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=",
|
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "search",
|
"repo": "search",
|
||||||
"rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18",
|
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -364,11 +364,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738070913,
|
"lastModified": 1738680491,
|
||||||
"narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=",
|
"narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "bebf27d00f7d10ba75332a0541ac43676985dea3",
|
"rev": "64dbb922d51a42c0ced6a7668ca008dded61c483",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
angular.enable = true;
|
angular.enable = true;
|
||||||
c = {
|
c = {
|
||||||
enable = true;
|
enable = true;
|
||||||
cppcheck = true;
|
# cppcheck = true;
|
||||||
};
|
};
|
||||||
css = {
|
css = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -102,8 +102,8 @@
|
|||||||
always_show = true,
|
always_show = true,
|
||||||
},
|
},
|
||||||
show_all_diags_on_cursorline = false,
|
show_all_diags_on_cursorline = false,
|
||||||
enable_on_insert = true,
|
enable_on_insert = false,
|
||||||
enable_on_select = true,
|
enable_on_select = false,
|
||||||
severity = {
|
severity = {
|
||||||
vim.diagnostic.severity.ERROR,
|
vim.diagnostic.severity.ERROR,
|
||||||
vim.diagnostic.severity.WARN,
|
vim.diagnostic.severity.WARN,
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ in
|
|||||||
cmd = [
|
cmd = [
|
||||||
"clangd"
|
"clangd"
|
||||||
"--offset-encoding=utf-16"
|
"--offset-encoding=utf-16"
|
||||||
|
"--clang-tidy"
|
||||||
];
|
];
|
||||||
settings.InlayHints = {
|
settings.InlayHints = {
|
||||||
Designators = true;
|
Designators = true;
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.desktops.hyprland;
|
cfg = config.desktops.hyprland;
|
||||||
homeConfig = config.home-manager.users.${username};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.desktops.hyprland = {
|
options.desktops.hyprland = {
|
||||||
@@ -50,14 +49,6 @@ in
|
|||||||
Wants = [ "network-online.target" ];
|
Wants = [ "network-online.target" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
/*
|
|
||||||
programs.zsh.initExtraFirst = # sh
|
|
||||||
''
|
|
||||||
if uwsm check may-start; then
|
|
||||||
exec uwsm start hyprland-uwsm.desktop > ${homeConfig.xdg.configHome}/uwsm.log 2> ${homeConfig.xdg.configHome}/uwsm.err
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
*/
|
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services = {
|
systemd.services = {
|
||||||
@@ -65,81 +56,6 @@ in
|
|||||||
after = [ "network-online.target" ];
|
after = [ "network-online.target" ];
|
||||||
wants = [ "network-online.target" ];
|
wants = [ "network-online.target" ];
|
||||||
};
|
};
|
||||||
/*
|
|
||||||
greetd.serviceConfig = {
|
|
||||||
Type = "idle";
|
|
||||||
StandardInput = "tty";
|
|
||||||
StandardOutput = "journal";
|
|
||||||
StandardError = "journal";
|
|
||||||
TTYReset = "yes";
|
|
||||||
TTYVHangup = "no";
|
|
||||||
TTYVTDisallocate = "no";
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
"uwsm-display-manager" = {
|
|
||||||
description = "UWSM Display Manager";
|
|
||||||
conflicts = [ "getty@tty1.service" ];
|
|
||||||
after = [
|
|
||||||
"systemd-user-sessions.service"
|
|
||||||
"plymouth-quit-wait.service"
|
|
||||||
"getty@tty1.service"
|
|
||||||
];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "simple";
|
|
||||||
IgnoreSIGPIPE = "no";
|
|
||||||
SendSIGHUP = "yes";
|
|
||||||
TimeoutStopSec = "30s";
|
|
||||||
KeyringMode = "shared";
|
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "5";
|
|
||||||
StartLimitBurst = "5";
|
|
||||||
StartLimitInterval = "30";
|
|
||||||
};
|
|
||||||
restartIfChanged = false;
|
|
||||||
script = ''
|
|
||||||
${pkgs.sudo}/bin/sudo -u ${username} --login ${
|
|
||||||
lib.getExe (
|
|
||||||
pkgs.writeShellApplication {
|
|
||||||
name = "start-hyprland";
|
|
||||||
text = ''
|
|
||||||
${pkgs.kbd}/bin/chvt 2
|
|
||||||
exec ${pkgs.util-linux}/bin/agetty -o '-p -f -- \u' --noclear --autologin ${username} %I "$TERM" StandardOutput=null StandardError=journal
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
aliases = [ "display-manager.service" ];
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
"hyprtty" = {
|
|
||||||
description = "Start Hyprland";
|
|
||||||
conflicts = [ "getty@tty1.service" ];
|
|
||||||
after = [
|
|
||||||
"sysinit.target"
|
|
||||||
"initrd-switch-root.service"
|
|
||||||
"systemd-udev-trigger.service"
|
|
||||||
"seatd.service"
|
|
||||||
"systemd-logind.service"
|
|
||||||
];
|
|
||||||
wants = [
|
|
||||||
"systemd-udev-trigger.service"
|
|
||||||
"seatd.service"
|
|
||||||
"systemd-logind.service"
|
|
||||||
];
|
|
||||||
unitConfig.ConditionPathExists = "/home/${username}";
|
|
||||||
onFailure = [ "emergency.target" ];
|
|
||||||
serviceConfig.Type = "simple";
|
|
||||||
preStart = "+${pkgs.coreutils}/bin/rm -f /run/nologin";
|
|
||||||
script = "-${pkgs.util-linux}/bin/agetty -o '-p -f -- \\u' --noclear --autologin ${username} %I $TERM StandardOutput=null StandardError=journal";
|
|
||||||
wantedBy = [
|
|
||||||
"graphical.target"
|
|
||||||
"initrd-switch-root.service"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
@@ -155,33 +71,11 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# https://github.com/sjcobb2022/nixos-config/blob/70fb548b961c19e9855d2de86ee9569a7a88d976/hosts/common/optional/greetd.nix#L23C1-L33C2
|
|
||||||
/*
|
|
||||||
systemd.services = {
|
|
||||||
greetd.serviceConfig = {
|
|
||||||
Type = "idle";
|
|
||||||
StandardInput = "tty";
|
|
||||||
StandardOutput = "tty";
|
|
||||||
StandardError = "journal"; # Without this errors will spam on screen
|
|
||||||
# Without these bootlogs will spam on screen
|
|
||||||
TTYReset = true;
|
|
||||||
TTYVHangup = true;
|
|
||||||
TTYVTDisallocate = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
seatd = {
|
seatd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = username;
|
user = username;
|
||||||
};
|
};
|
||||||
/*
|
|
||||||
getty = {
|
|
||||||
autologinUser = username;
|
|
||||||
extraArgs = [ "--noclear" ];
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
kmscon = {
|
kmscon = {
|
||||||
enable = true;
|
enable = true;
|
||||||
hwRender = true;
|
hwRender = true;
|
||||||
@@ -189,32 +83,15 @@ in
|
|||||||
greetd = {
|
greetd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
greeterManagesPlymouth = false;
|
greeterManagesPlymouth = false;
|
||||||
#vt = 1;
|
|
||||||
settings = {
|
settings = {
|
||||||
initial_session = {
|
initial_session = {
|
||||||
command = "uwsm start ${pkgs.hyprland}/share/wayland-sessions/hyprland.desktop" # > ${homeConfig.xdg.configHome}/uwsm.log 2> ${homeConfig.xdg.configHome}/uwsm.err"
|
command = "uwsm start ${pkgs.hyprland}/share/wayland-sessions/hyprland.desktop";
|
||||||
/*
|
|
||||||
lib.getExe (
|
|
||||||
pkgs.writeShellApplication {
|
|
||||||
name = "start-hyprland";
|
|
||||||
text = ''
|
|
||||||
chvt 1
|
|
||||||
exec uwsm start hyprland-uwsm.desktop > ${homeConfig.xdg.configHome}/uwsm.log 2> ${homeConfig.xdg.configHome}/uwsm.err
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
)
|
|
||||||
*/
|
|
||||||
;
|
|
||||||
user = username;
|
user = username;
|
||||||
};
|
};
|
||||||
default_session = {
|
default_session = {
|
||||||
command = "${lib.getExe pkgs.greetd.tuigreet} --asterisks --remember --user-menu --cmd 'uwsm start hyprland-uwsm.desktop'";
|
command = "${lib.getExe pkgs.greetd.tuigreet} --asterisks --remember --user-menu --cmd 'uwsm start hyprland-uwsm.desktop'";
|
||||||
user = username;
|
user = username;
|
||||||
};
|
};
|
||||||
terminal = {
|
|
||||||
#vt = lib.mkForce 2;
|
|
||||||
#switch = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
dbus = {
|
dbus = {
|
||||||
@@ -222,7 +99,6 @@ in
|
|||||||
implementation = "broker";
|
implementation = "broker";
|
||||||
};
|
};
|
||||||
pcscd.enable = true;
|
pcscd.enable = true;
|
||||||
# nautilus on non-gnome
|
|
||||||
gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
};
|
};
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user