Solid base for now

main
Felix Bruns 1 month ago
parent 01a8d23d90
commit 8d6aa6f064

@ -2,11 +2,9 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }: { config, pkgs, secrets, ... }:
{ {
# Enable OpenGL # Enable OpenGL
hardware.graphics.enable = true; hardware.graphics.enable = true;
@ -110,6 +108,7 @@
shell = pkgs.zsh; shell = pkgs.zsh;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIkbAVXWPpN7jAJrf/1h8QHNW3LMQ0LaMTl8gnVzufPV fheitmann@fheitmann-flip" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIkbAVXWPpN7jAJrf/1h8QHNW3LMQ0LaMTl8gnVzufPV fheitmann@fheitmann-flip"
# secrets.ssh-key-pub
]; ];
}; };

@ -1,23 +1,5 @@
{ {
"nodes": { "nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -55,22 +37,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1750365781,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"plasma-manager": { "plasma-manager": {
"inputs": { "inputs": {
"home-manager": [ "home-manager": [
@ -98,64 +64,7 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager"
"sopswarden": "sopswarden"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
"sopswarden",
"nixpkgs"
]
},
"locked": {
"lastModified": 1750119275,
"narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "sops-nix",
"type": "github"
}
},
"sopswarden": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix"
},
"locked": {
"lastModified": 1752774858,
"narHash": "sha256-hA4WtNFxYUovbV//vxZIGu6I4kXhhOxA6138y9gHee4=",
"owner": "pfassina",
"repo": "sopswarden",
"rev": "01ff4cbfb96e4aa1f2c70761e3254d0c853b6031",
"type": "github"
},
"original": {
"owner": "pfassina",
"repo": "sopswarden",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
} }
} }
}, },

@ -12,26 +12,34 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
sopswarden.url = "github:pfassina/sopswarden"; # sopswarden.url = "github:pfassina/sopswarden";
}; };
outputs = { self, nixpkgs, home-manager, plasma-manager, sopswarden, ... }@inputs: { outputs = { self, nixpkgs, home-manager, plasma-manager, ... }@inputs: {
nixosConfigurations = { nixosConfigurations = {
Felix-Desktop = nixpkgs.lib.nixosSystem { Felix-Desktop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
# sopswarden.nixosModules.default{
# services.sopswarden = {
# enable = true;
# secrets = {
# ssh-key-priv = "Personal SSH-Key (Priv)";
# ssh-key-pub = "Personal SSH-Key (Pub)";
# age-key = "AGE-Key";
# };
# ageKeyFile = "./key.txt";
# };
# }
./configuration.nix ./configuration.nix
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.felix = import ./home.nix; home-manager.users.felix = import ./home.nix;
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ]; home-manager.sharedModules = [
} plasma-manager.homeManagerModules.plasma-manager
sopswarden.nixosModules.default{ # sopswarden.homeManagerModules.sopswarden
services.sopswarden = { ];
enable = true;
secrets = {};
};
} }
]; ];
}; };

@ -1,11 +1,12 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
imports = [ ./plasma.nix ];
home.username = "felix"; home.username = "felix";
home.homeDirectory = "/home/felix"; home.homeDirectory = "/home/felix";
imports = [ ./plasma.nix ];
home.file.".config/ssh-find-agent.sh".source = ./.config/ssh-find-agent.sh; home.file.".config/ssh-find-agent.sh".source = ./.config/ssh-find-agent.sh;
home.file.".config/alacritty" = { home.file.".config/alacritty" = {
@ -36,11 +37,10 @@
krita krita
]); ]);
# basic configuration of git, please change to your own
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Ryan Yin"; userName = "Felix Bruns";
userEmail = "xiaoyin_c@qq.com"; userEmail = "felix@bruns.hamburg";
}; };
programs.vscode = { programs.vscode = {
@ -80,7 +80,7 @@
shellAliases = { shellAliases = {
ls = "exa -lh"; ls = "exa -lh";
ll = "ls -a"; ll = "ls -a";
update = "sudo nixos-rebuild switch"; update = "sudo nixos-rebuild switch --impure";
}; };
initContent = lib.mkOrder 1500 '' initContent = lib.mkOrder 1500 ''
# source "~/.config/ssh-find-agend.sh" # source "~/.config/ssh-find-agend.sh"

@ -115,10 +115,18 @@
battery = settings; battery = settings;
}; };
hotkeys.commands."alacritty-full" = { hotkeys.commands = {
name = "Launch Alacritty"; "alacritty-full" = {
key = "Meta+Enter"; name = "Launch Alacritty Fullscreen";
command = "alacritty --config-file ./.config/alacritty/alacritty-full.toml"; keys = ["Meta+Backspace"];
command = "alacritty --config-file /home/felix/.config/alacritty/alacritty_full.toml";
comment = "start alacritty in full screen borderless mode";
};
"launch-konsole" = {
name = "Konsole";
keys = ["Meta+K"];
command = "konsole";
};
}; };
}; };
@ -130,6 +138,6 @@
} }
]; ];
# programs.plasma.kscreenlocker.appearance.wallpaper = ""; programs.plasma.workspace.wallpaper = ./wallpaper.jpg;
} }
Loading…
Cancel
Save