1 Commits

Author SHA1 Message Date
Armel van Ravels
de4ebde526 Use different resolution at work 2026-04-28 09:11:55 +02:00
14 changed files with 27 additions and 74 deletions

28
flake.lock generated
View File

@@ -7,27 +7,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781184346, "lastModified": 1775425411,
"narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=", "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ea6d221d7aa85652d014b6f719dddf036037515b", "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-26.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1780908363, "lastModified": 1776625032,
"narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=", "narHash": "sha256-edvwHiFhgOiwywt6/Iwe+sSn6ybhU3WZGnIoiGcKjfQ=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809", "rev": "479e19f1decb390aa5b75cae13ddf87d763c74cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -38,27 +38,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1780902259, "lastModified": 1776734388,
"narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-26.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1781141223, "lastModified": 1776949667,
"narHash": "sha256-Eye4UQJjC4TLobclolFCMl6MrjgiF6Bk1cOI5x8SH00=", "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b503dde361500433ca25a32e8f4d218bf58fb659", "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "github:nixos/nixpkgs/nixos-26.05"; url = "github:nixos/nixpkgs/nixos-25.11";
}; };
nixpkgs-unstable = { nixpkgs-unstable = {
@@ -11,7 +11,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-26.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View File

@@ -17,13 +17,8 @@
../modules/docker.nix ../modules/docker.nix
../modules/printing.nix ../modules/printing.nix
../modules/bambu-studio-flatpak.nix ../modules/bambu-studio-flatpak.nix
../modules/arduino-ide.nix
../modules/devenv.nix
../modules/bitwarden.nix
]; ];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.loader.systemd-boot.enable = false; boot.loader.systemd-boot.enable = false;
boot.loader = { boot.loader = {
efi = { efi = {

View File

@@ -24,19 +24,14 @@
../modules/gimp.nix ../modules/gimp.nix
../modules/openscad.nix ../modules/openscad.nix
../modules/bambu-studio-flatpak.nix ../modules/bambu-studio-flatpak.nix
../modules/arduino-ide.nix
../modules/bitwarden.nix
]; ];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "gandalf"; networking.hostName = "gandalf";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ]; networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
networking.firewall.enable = false;
home-manager.users.avravels.home.hyprland.execOnce = [ home-manager.users.avravels.home.hyprland.execOnce = [
"waybar" "waybar"

View File

@@ -1,8 +0,0 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
arduino-ide
];
}

View File

@@ -1,12 +0,0 @@
{ config, pkgs, ... }:
{
nixpkgs.config.permittedInsecurePackages = [
"electron-39.8.10"
];
environment.systemPackages = with pkgs; [
bitwarden-desktop
];
}

View File

@@ -1,10 +0,0 @@
{ config, pkgsUnstable, ... } :
{
environment.systemPackages = with pkgsUnstable; [
devenv
];
nix.settings.trusted-users = [ "root" "avravels" ];
}

View File

@@ -9,7 +9,7 @@
imports = [ imports = [
./other/fonts.nix ./other/fonts.nix
# ./programs/bitwarden.nix ./programs/bitwarden.nix
./programs/kitty.nix ./programs/kitty.nix
./programs/zsh.nix ./programs/zsh.nix
./programs/direnv.nix ./programs/direnv.nix

View File

@@ -1,8 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.tmux = { programs.tmux.enable = true;
enable = true;
mouse = true;
};
} }

View File

@@ -1,24 +1,22 @@
{ pkgs, pkgsUnstable, ... }: { pkgs, ... }:
{ {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgsUnstable.vscode.fhs; package = pkgs.vscode.fhs;
profiles.default.extensions = with pkgs.vscode-extensions; [ profiles.default.extensions = with pkgs.vscode-extensions; [
ms-dotnettools.csharp ms-dotnettools.csharp
ms-dotnettools.csdevkit ms-dotnettools.csdevkit
ms-dotnettools.vscode-dotnet-runtime ms-dotnettools.vscode-dotnet-runtime
mkhl.direnv # Direnv integration for VSCode mkhl.direnv # Direnv integration for VSCode
catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc
bmewburn.vscode-intelephense-client vscodevim.vim
continue.continue
]; ];
profiles.default.userSettings = { profiles.default.userSettings = {
"editor.lineNumbers" = "relative"; "editor.lineNumbers" = "relative";
"workbench.colorTheme" = "Catppuccin Mocha"; "workbench.colorTheme" = "Catppuccin Mocha";
"workbench.editor.enablePreview" = false;
"direnv.restart.automatic" = true; "direnv.restart.automatic" = true;
"terminal.integrated.defaultProfile.linux" = "zsh"; "terminal.integrated.defaultProfile.linux" = "zsh";
"terminal.integrated.profiles.linux" = { "terminal.integrated.profiles.linux" = {

View File

@@ -27,8 +27,7 @@ in
settings = { settings = {
### MONITOR ### MONITOR
monitor = [ monitor = [
"eDP-1,1920x1200,auto,1" "DP-3,1920x1080,auto,1"
"DP-3,2440x1440,auto,1"
",preferred,auto,1" ",preferred,auto,1"
]; ];
@@ -69,7 +68,7 @@ in
shadow = { shadow = {
enabled = true; enabled = true;
color = "rgba(00000055)"; color = "rgba(00000055)";
#ignore_window = true; ignore_window = true;
offset = "0 15"; offset = "0 15";
range = 100; range = 100;
render_power = 2; render_power = 2;

View File

@@ -5,4 +5,6 @@
enable = true; enable = true;
package = pkgsUnstable.ollama-cuda; package = pkgsUnstable.ollama-cuda;
}; };
services.open-webui.enable = true;
} }

View File

@@ -5,7 +5,7 @@
initialPassword = "welcome"; initialPassword = "welcome";
isNormalUser = true; isNormalUser = true;
description = "Armel van Ravels"; description = "Armel van Ravels";
extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"]; extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
packages = with pkgs; [ packages = with pkgs; [
home-manager home-manager
legcord legcord

View File

@@ -22,12 +22,8 @@
../modules/gimp.nix ../modules/gimp.nix
../modules/jq.nix ../modules/jq.nix
../modules/enova.nix ../modules/enova.nix
../modules/devenv.nix
../modules/bitwarden.nix
]; ];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@@ -36,6 +32,7 @@
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
networking.hostName = "laptop-armel"; networking.hostName = "laptop-armel";
home-manager.users.avravels.home.hyprland.execOnce = [ home-manager.users.avravels.home.hyprland.execOnce = [