sys update
This commit is contained in:
1 parent
d10680b777
commit
5167fd426e
9 files changed
+63
-45
No files matched your search
Generated
+26
-26
@@ -62,11 +62,11 @@
|
||||
"zon2nix": "zon2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747089579,
|
||||
"narHash": "sha256-rKlX/y9w7sH9+IFcMcU9UqM6UoDTth6ktyuh8Epdtdc=",
|
||||
"lastModified": 1748009746,
|
||||
"narHash": "sha256-ycF9T9pZKiA2pqNt4BztsQK6qf+L4EYE2f7fgE3fG9w=",
|
||||
"owner": "ghostty-org",
|
||||
"repo": "ghostty",
|
||||
"rev": "6984b1ec481ddaff6386f163b178af060a74d01b",
|
||||
"rev": "26a42fac0ec8f612a3ddce60bab9842c79a2756a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -82,16 +82,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747020534,
|
||||
"narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
|
||||
"lastModified": 1747556831,
|
||||
"narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
|
||||
"rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.11",
|
||||
"ref": "release-25.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -103,11 +103,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747138802,
|
||||
"narHash": "sha256-Ou4zV3OskaDKlkuiM2VT+1w/xceXoZ5RRM4ZuW7n5+I=",
|
||||
"lastModified": 1748065210,
|
||||
"narHash": "sha256-dFqlLNW6UW19m0vg5FHWLH2G2LGkqYyPs/4YqfoZMoM=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "f88be00227161a1e9369a1d199f452dd5d720feb",
|
||||
"rev": "acd6aa5a9065c6695212be313e06f08f7184cb25",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -142,11 +142,11 @@
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747134561,
|
||||
"narHash": "sha256-aMmu9e2uH7rLCuGn46EpjlRRA7ialRK1IZXu53UAR4s=",
|
||||
"lastModified": 1748084900,
|
||||
"narHash": "sha256-XxVAY/U3qloh2gCy8T8aBj6lXu6DOAX5wH7cTg1QSkE=",
|
||||
"owner": "lilyinstarlight",
|
||||
"repo": "nixos-cosmic",
|
||||
"rev": "b5009fbd6ac6f1e550b00c9b8539548d7b678c01",
|
||||
"rev": "d01c1a4044129f6eddb944f4d71a84e07c139eba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -157,11 +157,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1747129300,
|
||||
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
|
||||
"lastModified": 1747900541,
|
||||
"narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "e81fd167b33121269149c57806599045fd33eeed",
|
||||
"rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -173,11 +173,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1746904237,
|
||||
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
|
||||
"lastModified": 1747744144,
|
||||
"narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
|
||||
"rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -205,16 +205,16 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1746957726,
|
||||
"narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
|
||||
"lastModified": 1747953325,
|
||||
"narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
|
||||
"rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.11",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -239,11 +239,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747103809,
|
||||
"narHash": "sha256-a3Yk+CoFmNw7V8J/si/AM8WuI/qTxQhiJpuQ7HFl774=",
|
||||
"lastModified": 1748054080,
|
||||
"narHash": "sha256-rwFiLLNCwkj9bqePtH1sMqzs1xmohE0Ojq249piMzF4=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "fe36c63649875f391949e8b2ec33949d0cd8aa95",
|
||||
"rev": "2221d8d53c128beb69346fa3ab36da3f19bb1691",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
systems.url = "github:nix-systems/default";
|
||||
# Nixpkgs
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||
# Cosmic
|
||||
nixos-cosmic = {
|
||||
url = "github:lilyinstarlight/nixos-cosmic";
|
||||
@@ -19,7 +19,7 @@
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main";
|
||||
# Home manager
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-24.11";
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# Macos
|
||||
|
||||
+3
-2
@@ -5,6 +5,7 @@ let
|
||||
zshFunctions = zshFWBook + "/functions.sh";
|
||||
openPorts = [
|
||||
8000
|
||||
8001
|
||||
];
|
||||
in
|
||||
{
|
||||
@@ -24,7 +25,6 @@ in
|
||||
laptop-power-mgr.enable = true;
|
||||
amdgpu.enable = true;
|
||||
};
|
||||
common.pritunl.enable = true;
|
||||
desktop = {
|
||||
enable = true;
|
||||
cosmic.enable = false;
|
||||
@@ -171,7 +171,7 @@ in
|
||||
# Kernel
|
||||
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||
# Add Functions
|
||||
home-manager.users.${user.name}.programs.zsh.initExtra = ''
|
||||
home-manager.users.${user.name}.programs.zsh.initContent = ''
|
||||
source ${zshFunctions}
|
||||
'';
|
||||
environment.localBinInPath = true;
|
||||
@@ -217,6 +217,7 @@ in
|
||||
"api.me.internal"
|
||||
];
|
||||
"127.0.0.1" = [
|
||||
"fwbook"
|
||||
"auth.me.internal"
|
||||
"me.internal"
|
||||
"me.local"
|
||||
|
||||
@@ -19,6 +19,7 @@ in
|
||||
kubectl
|
||||
kubectx
|
||||
htop
|
||||
duf
|
||||
];
|
||||
};
|
||||
programs = (programsModule {
|
||||
|
||||
@@ -20,7 +20,8 @@
|
||||
};
|
||||
lsd = {
|
||||
enable = true;
|
||||
enableAliases = true;
|
||||
enableBashIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
starship = {
|
||||
enable = true;
|
||||
@@ -28,6 +29,10 @@
|
||||
enableBashIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
settings = {
|
||||
env_var = {
|
||||
variable = "SHELL";
|
||||
default = "unknown shell";
|
||||
};
|
||||
kubernetes = {
|
||||
disabled = false;
|
||||
};
|
||||
@@ -51,6 +56,9 @@
|
||||
sudo = {
|
||||
disabled = false;
|
||||
};
|
||||
memory_usage = {
|
||||
disabled = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
nushell = {
|
||||
@@ -67,7 +75,15 @@
|
||||
};
|
||||
zsh = {
|
||||
enable = true;
|
||||
autosuggestion.enable = true;
|
||||
autosuggestion = {
|
||||
enable = true;
|
||||
strategy = [
|
||||
"match_prev_cmd"
|
||||
"history"
|
||||
"completion"
|
||||
];
|
||||
};
|
||||
syntaxHighlighting.enable = true;
|
||||
};
|
||||
zellij = {
|
||||
enable = true;
|
||||
|
||||
@@ -11,7 +11,7 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
hardware.pulseaudio.enable = false;
|
||||
services.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
|
||||
@@ -11,7 +11,7 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
hardware.pulseaudio.enable = false;
|
||||
services.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
alsa.enable = true;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
users.users.root = {
|
||||
shell = pkgs.nushell;
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
users.users.${config.skyg.user.name} = {
|
||||
shell = pkgs.nushell;
|
||||
shell = pkgs.zsh;
|
||||
isNormalUser = true;
|
||||
description = config.skyg.user.name;
|
||||
extraGroups = [
|
||||
|
||||
@@ -32,15 +32,15 @@ in
|
||||
switch-to-workspace-left = [ "<Super>Left" ];
|
||||
switch-to-workspace-right = [ "<Super>Right" ];
|
||||
};
|
||||
# "org/gnome/shell" = {
|
||||
# disable-user-extensions = false;
|
||||
# enabled-extensions = with pkgs.gnomeExtensions; [
|
||||
# gsconnect.extensionUuid
|
||||
# pop-shell.extensionUuid
|
||||
# docker.extensionUuid
|
||||
# krypto.extensionUuid
|
||||
# ];
|
||||
# };
|
||||
"org/gnome/shell" = {
|
||||
disable-user-extensions = false;
|
||||
enabled-extensions = with pkgs.gnomeExtensions; [
|
||||
gsconnect.extensionUuid
|
||||
pop-shell.extensionUuid
|
||||
docker.extensionUuid
|
||||
krypto.extensionUuid
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user