palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade to unstable (cherry)

Browse source
This commit is contained in:
Ingolf Wagner 2024-05-24 21:08:34 +02:00
parent eeedd5b850
commit 2bedf3a3ec
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
14 changed files with 244 additions and 731 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

812
flake.lock
View file

File diff suppressed because it is too large Load diff

82
flake.nix
View file

@ -5,7 +5,6 @@
url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main"; url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main";
flake = false; flake = false;
}; };
#nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-legacy_2105.url = "github:nixos/nixpkgs/nixos-21.05"; nixpkgs-legacy_2105.url = "github:nixos/nixpkgs/nixos-21.05";
nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05";
@ -17,17 +16,14 @@
nixos-anywhere.url = "github:nix-community/nixos-anywhere"; nixos-anywhere.url = "github:nix-community/nixos-anywhere";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; #url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/home-manager";
#inputs.nixpkgs.follows = "nixpkgs";
}; };
polygon-art = { polygon-art = {
url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git"; url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
}; };
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
doom-emacs-nix = {
url = "github:nix-community/nix-doom-emacs";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager-utils = { home-manager-utils = {
url = "github:mrvandalo/home-manager-utils"; url = "github:mrvandalo/home-manager-utils";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
@ -75,7 +71,8 @@
nixinate.url = "github:matthewcroughan/nixinate"; nixinate.url = "github:matthewcroughan/nixinate";
stylix = { stylix = {
#url = "github:danth/stylix?ref=35cab8eb76c1d3672b2b290a64f357847c30d090"; #url = "github:danth/stylix?ref=35cab8eb76c1d3672b2b290a64f357847c30d090";
url = "github:danth/stylix/release-23.11"; #url = "github:danth/stylix/release-23.11";
url = "github:danth/stylix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
@ -94,7 +91,7 @@
{ self { self
, disko , disko
, dns , dns
, doom-emacs-nix #, doom-emacs-nix
, grocy-scanner , grocy-scanner
, home-manager , home-manager
, home-manager-utils , home-manager-utils
@ -135,14 +132,15 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
config.permittedInsecurePackages = [ config.permittedInsecurePackages = [
"electron-24.8.6" # for bitwarden
"python-2.7.18.6" "python-2.7.18.6"
"python-2.7.18.7" "python-2.7.18.7"
"electron-24.8.6" # for bitwarden "python-2.7.18.8"
]; ];
overlays = [ overlays = [
(_self: _super: { (_self: _super: {
# todo : remove this, we are on unstable in the future # todo : remove this, we are on unstable in the future
unstable = import nixpkgs { unstable = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
@ -217,20 +215,25 @@
_module.args.self = self; _module.args.self = self;
_module.args.inputs = self.inputs; _module.args.inputs = self.inputs;
} }
({ pkgs, lib, ... }: #({ pkgs, lib, ... }:
{ # {
# todo : check if this is still needed # # todo : check if this is still needed
nix = { # nix = {
# no channesl needed this way # # no channesl needed this way
nixPath = [ "nixpkgs=${pkgs.path}" ]; # nixPath = [ "nixpkgs=${pkgs.path}" ];
# make flakes available # # make flakes available
package = pkgs.nixUnstable; # package = pkgs.nixUnstable;
extraOptions = '' # extraOptions = ''
experimental-features = nix-command flakes # experimental-features = nix-command flakes
''; # '';
}; # };
}) # })
{ nix.settings.substituters = [ "https://cache.nixos.org/" ]; } {
nix.settings.substituters = [ "https://cache.nixos.org/" ];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
# no channesl needed this way
nix.nixPath = [ "nixpkgs=${pkgs.path}" ];
}
{ {
boot.tmp.useTmpfs = lib.mkDefault true; boot.tmp.useTmpfs = lib.mkDefault true;
environment.systemPackages = [ nixpkgs-fmt.defaultPackage.${system} ]; environment.systemPackages = [ nixpkgs-fmt.defaultPackage.${system} ];
@ -248,7 +251,6 @@
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
stylix.nixosModules.stylix stylix.nixosModules.stylix
]; ];
# todo : put this in `/homes`
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml"; stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
stylix.image = ./nixos/assets/wallpaper.png; stylix.image = ./nixos/assets/wallpaper.png;
stylix.fonts = { stylix.fonts = {
@ -277,8 +279,9 @@
}; };
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup";
home-manager.sharedModules = [ home-manager.sharedModules = [
doom-emacs-nix.hmModule #doom-emacs-nix.hmModule
home-manager-utils.hmModule home-manager-utils.hmModule
{ stylix.targets.bemenu.enable = false; } { stylix.targets.bemenu.enable = false; }
]; ];
@ -303,27 +306,6 @@
apps = nixinate.nixinate.x86_64-linux self; apps = nixinate.nixinate.x86_64-linux self;
packages = with nixpkgs.lib; {
${system} =
let
vms = mapAttrs'
(host: sys: {
name = "vm-${host}";
value = sys.config.system.build.vm;
})
self.nixosConfigurations;
sds = mapAttrs'
(host: sys: {
name = "sd-${host}";
value = sys.config.system.build.sdImage;
})
(filterAttrs
(n: hasAttrByPath [ "config" "system" "build" "sdImage" ])
self.nixosConfigurations);
in
vms // sds;
};
nixosConfigurations = nixosConfigurations =
{ {
sternchen = nixosConfigurationSetup { sternchen = nixosConfigurationSetup {
@ -403,7 +385,7 @@
srvos.nixosModules.hardware-hetzner-online-intel srvos.nixosModules.hardware-hetzner-online-intel
srvos.nixosModules.server srvos.nixosModules.server
srvos.nixosModules.mixins-terminfo srvos.nixosModules.mixins-terminfo
{ home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; } #{ home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; }
{ {
home-manager.users.mainUser = import ./nixos/homes/palo; home-manager.users.mainUser = import ./nixos/homes/palo;
home-manager.users.root = import ./nixos/homes/root; home-manager.users.root = import ./nixos/homes/root;
@ -415,7 +397,7 @@
name = "robi"; name = "robi";
modules = [ modules = [
homeManagerModules homeManagerModules
{ home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; } #{ home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; }
{ {
home-manager.users.mainUser = import ./nixos/homes/palo; home-manager.users.mainUser = import ./nixos/homes/palo;
home-manager.users.root = import ./nixos/homes/root; home-manager.users.root = import ./nixos/homes/root;

4
nixos/components/gui/kmonad.nix
View file

@ -14,8 +14,8 @@
users.users.mainUser.extraGroups = [ "input" ]; users.users.mainUser.extraGroups = [ "input" ];
services.xserver = { services.xserver = {
layout = "us"; xkb.layout = "us";
xkbOptions = "compose:ralt"; xkb.options = "compose:ralt";
}; };
services.kmonad = { services.kmonad = {

32
nixos/components/gui/xorg/default.nix
View file

@ -9,19 +9,20 @@ with lib;
default = config.components.gui.enable; default = config.components.gui.enable;
}; };
config = mkIf config.components.gui.xorg.enable { config = mkIf config.components.gui.xorg.enable {
# system.custom.fonts.enable = true; # system.custom.fonts.enable = true;
services.displayManager = {
defaultSession = lib.mkDefault "none+i3";
autoLogin.enable = lib.mkDefault true;
autoLogin.user = config.users.users.mainUser.name;
};
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager = { displayManager = {
defaultSession = lib.mkDefault "none+i3";
autoLogin.enable = lib.mkDefault true;
autoLogin.user = config.users.users.mainUser.name;
lightdm.enable = lib.mkDefault true; lightdm.enable = lib.mkDefault true;
}; };
@ -30,20 +31,21 @@ with lib;
# mouse/touchpad # mouse/touchpad
# -------------- # --------------
libinput = {
enable = true;
touchpad = {
disableWhileTyping = true;
tapping = true;
scrollMethod = "twofinger";
accelSpeed = "1.3";
naturalScrolling = true;
horizontalScrolling = true;
};
};
}; };
services.libinput = {
enable = true;
touchpad = {
disableWhileTyping = true;
tapping = true;
scrollMethod = "twofinger";
accelSpeed = "1.3";
naturalScrolling = true;
horizontalScrolling = true;
};
};
# Packages # Packages
# -------- # --------
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

15
nixos/components/network/wifi.nix
View file

@ -14,14 +14,13 @@ with types;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.networkmanager.wifi.powersave = lib.mkDefault true; networking.networkmanager.wifi.powersave = lib.mkDefault true;
networking.networkmanager.extraConfig = ''
# The number of times a connection activation should be automatically tried # The number of times a connection activation should be automatically tried
# before switching to another one. This value applies only to connections # before switching to another one. This value applies only to connections
# that can auto-connect and have a connection. autoconnect-retries property set to -1. # that can auto-connect and have a connection. autoconnect-retries property set to -1.
# If not specified, connections will be tried 4 times. # If not specified, connections will be tried 4 times.
# Setting this value to 1 means to try activation once, without retry. # Setting this value to 1 means to try activation once, without retry.
autoconnect-retries-default=999 networking.networkmanager.settings.main.autoconnect-retries-default = 999;
'';
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;

2
nixos/homes/common/terminal.nix
View file

@ -18,7 +18,7 @@
# a better cat # a better cat
programs.bat = { programs.bat = {
enable = true; enable = true;
config.theme = "gruvbox-light"; #config.theme = "gruvbox-light";
}; };
home.shellAliases.cat = "${pkgs.bat}/bin/bat --theme='gruvbox-light'"; home.shellAliases.cat = "${pkgs.bat}/bin/bat --theme='gruvbox-light'";

2
nixos/homes/palo/default.nix
View file

@ -2,7 +2,7 @@
imports = [ imports = [
../common ../common
./doom-emacs.nix #./doom-emacs.nix
./editor.nix ./editor.nix
./git.nix ./git.nix
./gpg.nix ./gpg.nix

4
nixos/homes/palo/packages/nextcloud.nix
View file

@ -46,10 +46,6 @@ in
borrow borrow
(pkgs.writeShellScriptBin "nixFlakes" ''
exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
'')
nextcloud-client nextcloud-client
]; ];

8
nixos/homes/palo/packages/social.nix
View file

@ -7,14 +7,6 @@ with lib;
programs.obs-studio.enable = true; programs.obs-studio.enable = true;
home.packages = [ home.packages = [
#(pkgs.makeDesktopItem {
# name = "streamdeck-ui";
# desktopName = "Streamdeck";
# exec = "${streamdeck-ui}/bin/streamdeck-ui";
# terminal = false;
#})
streamdeck-ui
emoji-picker emoji-picker
signal-desktop signal-desktop

1
nixos/machines/cherry/configuration.nix
View file

@ -116,7 +116,6 @@
podman.enable = true; podman.enable = true;
virtualbox = { virtualbox = {
host.enable = false; host.enable = false;
guest.x11 = false;
guest.enable = false; guest.enable = false;
}; };
}; };

1
nixos/machines/cream/configuration.nix
View file

@ -127,7 +127,6 @@
podman.enable = true; podman.enable = true;
virtualbox = { virtualbox = {
host.enable = false; host.enable = false;
guest.x11 = false;
guest.enable = false; guest.enable = false;
}; };
}; };

5
nixos/machines/sternchen/configuration.nix
View file

@ -57,7 +57,7 @@
# keyboard fiddling # keyboard fiddling
i18n.defaultLocale = "de_DE.UTF-8"; i18n.defaultLocale = "de_DE.UTF-8";
console.keyMap = "de"; console.keyMap = "de";
services.xserver.layout = "de,us"; services.xserver.xkb.layout = "de,us";
#system.custom.suspend.enable = false; #system.custom.suspend.enable = false;
services.printing.enable = false; services.printing.enable = false;
@ -70,7 +70,7 @@
driSupport32Bit = true; driSupport32Bit = true;
}; };
services.xserver.displayManager.defaultSession = "plasma"; services.displayManager.defaultSession = "plasma";
services.xserver.desktopManager.pantheon.enable = false; services.xserver.desktopManager.pantheon.enable = false;
services.xserver.desktopManager.xfce.enable = false; services.xserver.desktopManager.xfce.enable = false;
@ -96,7 +96,6 @@
docker.enable = false; docker.enable = false;
virtualbox = { virtualbox = {
host.enable = false; host.enable = false;
guest.x11 = false;
guest.enable = false; guest.enable = false;
}; };
}; };

1
nixos/machines/sterni/configuration.nix
View file

@ -52,7 +52,6 @@
virtualbox = { virtualbox = {
host.enable = false; host.enable = false;
guest.x11 = false;
guest.enable = false; guest.enable = false;
}; };
}; };

6
nixos/machines/sterni/packages.nix
View file

@ -37,9 +37,9 @@ in
(nextcloudSync "Kunstbuch") (nextcloudSync "Kunstbuch")
(nextcloudSync "AWS-SolutionArchitect-Professional") (nextcloudSync "AWS-SolutionArchitect-Professional")
(pkgs.writeShellScriptBin "nixFlakes" '' #(pkgs.writeShellScriptBin "nixFlakes" ''
exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@" # exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
'') #'')
valentina valentina