Compare commits
No commits in common. "9d5cb1e98c2227417775fd1fa704777dec79e7f1" and "1b9e61f630fe2eb449c6debfc9b5249df728a983" have entirely different histories.
9d5cb1e98c
...
1b9e61f630
34 changed files with 74 additions and 75 deletions
72
flake.lock
generated
72
flake.lock
generated
|
|
@ -284,11 +284,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769580047,
|
||||
"narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
|
||||
"lastModified": 1768949235,
|
||||
"narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
|
||||
"rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -332,11 +332,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769799857,
|
||||
"narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=",
|
||||
"lastModified": 1768908532,
|
||||
"narHash": "sha256-HIdLXEFaUVE8FiaCPJbCfBMsnF+mVtDub8Jwj2BD+mk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "naersk",
|
||||
"rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339",
|
||||
"rev": "8d97452673640eb7fabe428e8b6a425bc355008b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -359,11 +359,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769948416,
|
||||
"narHash": "sha256-auvybZw7/95ln7J01VUqg6i7zvCpspgR1miG7WwiQBg=",
|
||||
"lastModified": 1769170609,
|
||||
"narHash": "sha256-LiyaKNga2z/iG4pNr86iQLySEDoOytEzTCblxzRjnCk=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "0ddfba5c5475a415c56123d700f3ceb5744c32fd",
|
||||
"rev": "08d6e6adf34b0af12be7eaeacc0b4c1a8580b3da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -392,11 +392,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1769577126,
|
||||
"narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=",
|
||||
"lastModified": 1768678265,
|
||||
"narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "f30db163b5748e8cf95c05aba77d0d3736f40543",
|
||||
"rev": "d7184a04b904e07113f4623610775ae78d32394c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -427,11 +427,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769914816,
|
||||
"narHash": "sha256-GXK/ub/LfBFEEBO2M+HhqWu3VW042pWw145Y+jYEMT0=",
|
||||
"lastModified": 1769134548,
|
||||
"narHash": "sha256-16UWbfkIEaG728vwCdXM5C/8f1NLqBwZc039p8Yj9CA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "8eebcb40d2658badb78b4162868ffcc1006b59f3",
|
||||
"rev": "969bb9a90fa1365e8b5028d1b67dbd439b268675",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -463,11 +463,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769813415,
|
||||
"narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
|
||||
"lastModified": 1764234087,
|
||||
"narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-generators",
|
||||
"rev": "8946737ff703382fda7623b9fab071d037e897d5",
|
||||
"rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -478,11 +478,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1769741972,
|
||||
"narHash": "sha256-RxSg1EioTWNpoLaykiT1UQKTo/K0PPdLqCyQgNjNqWs=",
|
||||
"lastModified": 1769089682,
|
||||
"narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "63590ac958a8af30ebd52c7a0309d8c52a94dd77",
|
||||
"rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -509,11 +509,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1769740369,
|
||||
"narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=",
|
||||
"lastModified": 1768875095,
|
||||
"narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6308c3b21396534d8aaeac46179c14c439a89b8a",
|
||||
"rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -549,11 +549,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769947836,
|
||||
"narHash": "sha256-CYSecY7oPzVkQmorHjI5lTWdwGpwqP62z+YJmObxYQ4=",
|
||||
"lastModified": 1769190062,
|
||||
"narHash": "sha256-HXy1M80RWBW7cIIMQ/bBV/pMa3NmK6MYOOz/kA4bHIw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "0d28d95d7bf9e852b4e6b514955dceef2e4921a5",
|
||||
"rev": "82023efed13ef3c1bfe99f0cd669139b4a2d2694",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -747,11 +747,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769885983,
|
||||
"narHash": "sha256-jLS7410B58f+3WfZ4PQ28aaaTONnmxlfAbDPdNuciLc=",
|
||||
"lastModified": 1768493544,
|
||||
"narHash": "sha256-9qk2W/6GJWLAFXNruK/zdJ0bm3bfP50vJFbtuAjQpa4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "stylix",
|
||||
"rev": "fe06391a1e1905fc7e6c13443ea439a89695ca69",
|
||||
"rev": "362306faaa7459bebf8eabf135879785f3da9bd2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -864,11 +864,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769691507,
|
||||
"narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=",
|
||||
"lastModified": 1768158989,
|
||||
"narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b",
|
||||
"rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -897,11 +897,11 @@
|
|||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1769713942,
|
||||
"narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=",
|
||||
"lastModified": 1768765571,
|
||||
"narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0",
|
||||
"rev": "ed1cef792b4def3321ff9ab5479df09609f17a69",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
10
flake.nix
10
flake.nix
|
|
@ -105,16 +105,16 @@
|
|||
}:
|
||||
let
|
||||
devices = {
|
||||
muede-lpt2 = {
|
||||
vinzenz-lpt2 = {
|
||||
system = "x86_64-linux";
|
||||
home-manager-users = {
|
||||
inherit (self.homeConfigurations) muede;
|
||||
inherit (self.homeConfigurations) vinzenz;
|
||||
};
|
||||
};
|
||||
muede-pc2 = {
|
||||
vinzenz-pc2 = {
|
||||
system = "x86_64-linux";
|
||||
home-manager-users = {
|
||||
inherit (self.homeConfigurations) muede;
|
||||
inherit (self.homeConfigurations) vinzenz;
|
||||
};
|
||||
};
|
||||
ronja-pc = {
|
||||
|
|
@ -197,7 +197,7 @@
|
|||
|
||||
homeModules = importModuleDir ./homeModules;
|
||||
homeConfigurations = {
|
||||
muede = ./homeConfigurations/muede;
|
||||
vinzenz = ./homeConfigurations/vinzenz;
|
||||
ronja = ./homeConfigurations/ronja;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,9 @@
|
|||
style_user = "bg:color_r fg:text_r";
|
||||
style_root = "bold bg:color_r fg:text_r";
|
||||
show_always = true;
|
||||
aliases = {
|
||||
"vinzenz" = "müde";
|
||||
};
|
||||
};
|
||||
os = {
|
||||
disabled = false;
|
||||
|
|
@ -44,8 +47,8 @@
|
|||
format = "$hostname";
|
||||
ssh_symbol = "";
|
||||
aliases = {
|
||||
"muede-lpt2" = "lpt";
|
||||
"muede-pc2" = "pc";
|
||||
"vinzenz-lpt2" = "lpt";
|
||||
"vinzenz-pc2" = "pc";
|
||||
};
|
||||
};
|
||||
container = {
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
config.programs.zsh = {
|
||||
initContent = ''
|
||||
export PATH=$PATH:$HOME/.cargo/bin
|
||||
export PATH=$PATH:/home/vinzenz/.cargo/bin
|
||||
|
||||
bindkey "^[[1;5C" forward-word
|
||||
bindkey "^[[1;5D" backward-word
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.muede.gnome-extensions =
|
||||
options.vinzenz.gnome-extensions =
|
||||
let
|
||||
mkDefaultEnabledOption =
|
||||
name:
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
config =
|
||||
let
|
||||
cfg = config.muede.gnome-extensions;
|
||||
cfg = config.vinzenz.gnome-extensions;
|
||||
in
|
||||
lib.mkIf cfg.enable (
|
||||
lib.mkMerge [
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
|
||||
users.users = {
|
||||
root.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY pixel-JuiceSSH"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC lpt2-roaming"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
|
||||
users.users.root.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICdYqY3Y1/f1bsAi5Qfyr/UWuX9ixu96IeAlhoQaJkbf"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY pixel-JuiceSSH"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC lpt2-roaming"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming"
|
||||
];
|
||||
|
||||
system.autoUpgrade.allowReboot = true;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
self.nixosModules.gnome
|
||||
self.nixosModules.steam
|
||||
self.nixosModules.wine-gaming
|
||||
self.nixosModules.muede-desktop-settings
|
||||
self.nixosModules.vinzenz-desktop-settings
|
||||
];
|
||||
|
||||
config = {
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
{
|
||||
imports = [
|
||||
./hardware.nix
|
||||
self.nixosModules.user-muede
|
||||
self.nixosModules.user-vinzenz
|
||||
self.nixosModules.gnome
|
||||
self.nixosModules.wine-gaming
|
||||
self.nixosModules.steam
|
||||
self.nixosModules.podman
|
||||
self.nixosModules.muede-desktop-settings
|
||||
self.nixosModules.vinzenz-desktop-settings
|
||||
self.nixosModules.intel-graphics
|
||||
self.nixosModules.secure-boot
|
||||
];
|
||||
|
|
@ -27,9 +27,9 @@
|
|||
# Configure console keymap
|
||||
console.keyMap = "de";
|
||||
|
||||
users.users.muede.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY pixel-JuiceSSH"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming"
|
||||
users.users.vinzenz.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming"
|
||||
];
|
||||
|
||||
programs = {
|
||||
|
|
@ -60,7 +60,5 @@
|
|||
];
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
|
||||
users.users.muede.home = "/home/vinzenz";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,15 +2,15 @@
|
|||
{
|
||||
imports = [
|
||||
./hardware.nix
|
||||
# ./vscode-server.nix
|
||||
# ./hass.nix
|
||||
./vscode-server.nix
|
||||
./hass.nix
|
||||
|
||||
self.nixosModules.user-muede
|
||||
self.nixosModules.user-vinzenz
|
||||
self.nixosModules.gnome
|
||||
self.nixosModules.wine-gaming
|
||||
self.nixosModules.steam
|
||||
self.nixosModules.podman
|
||||
self.nixosModules.muede-desktop-settings
|
||||
self.nixosModules.vinzenz-desktop-settings
|
||||
self.nixosModules.amd-graphics
|
||||
self.nixosModules.secure-boot
|
||||
];
|
||||
|
|
@ -30,10 +30,10 @@
|
|||
# Configure console keymap
|
||||
console.keyMap = "de";
|
||||
|
||||
users.users.muede.openssh.authorizedKeys.keys = [
|
||||
users.users.vinzenz.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY pixel-JuiceSSH"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC lpt2-roaming"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming"
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [ lact ];
|
||||
|
|
@ -42,7 +42,5 @@
|
|||
# Factorio
|
||||
34197
|
||||
];
|
||||
|
||||
users.users.muede.home = "/home/vinzenz";
|
||||
};
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.muede = {
|
||||
options.vinzenz = {
|
||||
keep-gnome-default-apps = lib.mkEnableOption "keep gnome default apps";
|
||||
};
|
||||
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
gpaste.enable = true;
|
||||
};
|
||||
}
|
||||
(lib.mkIf (!config.muede.keep-gnome-default-apps) {
|
||||
(lib.mkIf (!config.vinzenz.keep-gnome-default-apps) {
|
||||
environment.gnome.excludePackages = with pkgs; [
|
||||
cheese # photo booth
|
||||
epiphany # web browser
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
users.users.muede = {
|
||||
users.users.vinzenz = {
|
||||
isNormalUser = true;
|
||||
uid = 1000;
|
||||
name = "muede";
|
||||
name = "vinzenz";
|
||||
description = "müde";
|
||||
home = "/home/vinzenz";
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
autoSubUidGidRange = true;
|
||||
};
|
||||
|
||||
nix.settings.trusted-users = [ "muede" ];
|
||||
nix.settings.trusted-users = [ "vinzenz" ];
|
||||
|
||||
allowedUnfreePackages = [
|
||||
"rider"
|
||||
Loading…
Add table
Add a link
Reference in a new issue