upgrade to unstable (cherry)
This commit is contained in:
Ingolf Wagner
parent
eeedd5b850
commit
2bedf3a3ec
14 changed files with 244 additions and 731 deletions
812
flake.lock
812
flake.lock
File diff suppressed because it is too large
Load diff
82
flake.nix
82
flake.nix
|
|
@ -5,7 +5,6 @@
|
|||
url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main";
|
||||
flake = false;
|
||||
};
|
||||
#nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs-legacy_2105.url = "github:nixos/nixpkgs/nixos-21.05";
|
||||
nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05";
|
||||
|
|
@ -17,17 +16,14 @@
|
|||
nixos-anywhere.url = "github:nix-community/nixos-anywhere";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-23.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
#url = "github:nix-community/home-manager/release-23.11";
|
||||
url = "github:nix-community/home-manager";
|
||||
#inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
polygon-art = {
|
||||
url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
|
||||
};
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
doom-emacs-nix = {
|
||||
url = "github:nix-community/nix-doom-emacs";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
home-manager-utils = {
|
||||
url = "github:mrvandalo/home-manager-utils";
|
||||
inputs.home-manager.follows = "home-manager";
|
||||
|
|
@ -75,7 +71,8 @@
|
|||
nixinate.url = "github:matthewcroughan/nixinate";
|
||||
stylix = {
|
||||
#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.home-manager.follows = "home-manager";
|
||||
};
|
||||
|
|
@ -94,7 +91,7 @@
|
|||
{ self
|
||||
, disko
|
||||
, dns
|
||||
, doom-emacs-nix
|
||||
#, doom-emacs-nix
|
||||
, grocy-scanner
|
||||
, home-manager
|
||||
, home-manager-utils
|
||||
|
|
@ -135,14 +132,15 @@
|
|||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
config.permittedInsecurePackages = [
|
||||
"electron-24.8.6" # for bitwarden
|
||||
"python-2.7.18.6"
|
||||
"python-2.7.18.7"
|
||||
"electron-24.8.6" # for bitwarden
|
||||
"python-2.7.18.8"
|
||||
];
|
||||
|
||||
overlays = [
|
||||
(_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 {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
|
|
@ -217,20 +215,25 @@
|
|||
_module.args.self = self;
|
||||
_module.args.inputs = self.inputs;
|
||||
}
|
||||
({ pkgs, lib, ... }:
|
||||
{
|
||||
# todo : check if this is still needed
|
||||
nix = {
|
||||
# no channesl needed this way
|
||||
nixPath = [ "nixpkgs=${pkgs.path}" ];
|
||||
# make flakes available
|
||||
package = pkgs.nixUnstable;
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
};
|
||||
})
|
||||
{ nix.settings.substituters = [ "https://cache.nixos.org/" ]; }
|
||||
#({ pkgs, lib, ... }:
|
||||
# {
|
||||
# # todo : check if this is still needed
|
||||
# nix = {
|
||||
# # no channesl needed this way
|
||||
# nixPath = [ "nixpkgs=${pkgs.path}" ];
|
||||
# # make flakes available
|
||||
# package = pkgs.nixUnstable;
|
||||
# extraOptions = ''
|
||||
# experimental-features = nix-command flakes
|
||||
# '';
|
||||
# };
|
||||
# })
|
||||
{
|
||||
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;
|
||||
environment.systemPackages = [ nixpkgs-fmt.defaultPackage.${system} ];
|
||||
|
|
@ -248,7 +251,6 @@
|
|||
home-manager.nixosModules.home-manager
|
||||
stylix.nixosModules.stylix
|
||||
];
|
||||
# todo : put this in `/homes`
|
||||
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
|
||||
stylix.image = ./nixos/assets/wallpaper.png;
|
||||
stylix.fonts = {
|
||||
|
|
@ -277,8 +279,9 @@
|
|||
};
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.backupFileExtension = "backup";
|
||||
home-manager.sharedModules = [
|
||||
doom-emacs-nix.hmModule
|
||||
#doom-emacs-nix.hmModule
|
||||
home-manager-utils.hmModule
|
||||
{ stylix.targets.bemenu.enable = false; }
|
||||
];
|
||||
|
|
@ -303,27 +306,6 @@
|
|||
|
||||
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 =
|
||||
{
|
||||
sternchen = nixosConfigurationSetup {
|
||||
|
|
@ -403,7 +385,7 @@
|
|||
srvos.nixosModules.hardware-hetzner-online-intel
|
||||
srvos.nixosModules.server
|
||||
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.root = import ./nixos/homes/root;
|
||||
|
|
@ -415,7 +397,7 @@
|
|||
name = "robi";
|
||||
modules = [
|
||||
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.root = import ./nixos/homes/root;
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
users.users.mainUser.extraGroups = [ "input" ];
|
||||
|
||||
services.xserver = {
|
||||
layout = "us";
|
||||
xkbOptions = "compose:ralt";
|
||||
xkb.layout = "us";
|
||||
xkb.options = "compose:ralt";
|
||||
};
|
||||
|
||||
services.kmonad = {
|
||||
|
|
|
|||
|
|
@ -9,19 +9,20 @@ with lib;
|
|||
default = config.components.gui.enable;
|
||||
};
|
||||
|
||||
|
||||
config = mkIf config.components.gui.xorg.enable {
|
||||
|
||||
# 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 = {
|
||||
|
||||
enable = true;
|
||||
|
||||
displayManager = {
|
||||
defaultSession = lib.mkDefault "none+i3";
|
||||
autoLogin.enable = lib.mkDefault true;
|
||||
autoLogin.user = config.users.users.mainUser.name;
|
||||
lightdm.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
|
|
@ -30,20 +31,21 @@ with lib;
|
|||
|
||||
# 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
|
||||
# --------
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,13 @@ with types;
|
|||
|
||||
networking.networkmanager.enable = true;
|
||||
networking.networkmanager.wifi.powersave = lib.mkDefault true;
|
||||
networking.networkmanager.extraConfig = ''
|
||||
# The number of times a connection activation should be automatically tried
|
||||
# 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.
|
||||
# If not specified, connections will be tried 4 times.
|
||||
# Setting this value to 1 means to try activation once, without retry.
|
||||
autoconnect-retries-default=999
|
||||
'';
|
||||
|
||||
# The number of times a connection activation should be automatically tried
|
||||
# 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.
|
||||
# If not specified, connections will be tried 4 times.
|
||||
# Setting this value to 1 means to try activation once, without retry.
|
||||
networking.networkmanager.settings.main.autoconnect-retries-default = 999;
|
||||
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
# a better cat
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
config.theme = "gruvbox-light";
|
||||
#config.theme = "gruvbox-light";
|
||||
};
|
||||
|
||||
home.shellAliases.cat = "${pkgs.bat}/bin/bat --theme='gruvbox-light'";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
imports = [
|
||||
../common
|
||||
./doom-emacs.nix
|
||||
#./doom-emacs.nix
|
||||
./editor.nix
|
||||
./git.nix
|
||||
./gpg.nix
|
||||
|
|
|
|||
|
|
@ -46,10 +46,6 @@ in
|
|||
|
||||
borrow
|
||||
|
||||
(pkgs.writeShellScriptBin "nixFlakes" ''
|
||||
exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
|
||||
'')
|
||||
|
||||
nextcloud-client
|
||||
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,14 +7,6 @@ with lib;
|
|||
programs.obs-studio.enable = true;
|
||||
home.packages = [
|
||||
|
||||
#(pkgs.makeDesktopItem {
|
||||
# name = "streamdeck-ui";
|
||||
# desktopName = "Streamdeck";
|
||||
# exec = "${streamdeck-ui}/bin/streamdeck-ui";
|
||||
# terminal = false;
|
||||
#})
|
||||
streamdeck-ui
|
||||
|
||||
emoji-picker
|
||||
|
||||
signal-desktop
|
||||
|
|
|
|||
|
|
@ -116,7 +116,6 @@
|
|||
podman.enable = true;
|
||||
virtualbox = {
|
||||
host.enable = false;
|
||||
guest.x11 = false;
|
||||
guest.enable = false;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -127,7 +127,6 @@
|
|||
podman.enable = true;
|
||||
virtualbox = {
|
||||
host.enable = false;
|
||||
guest.x11 = false;
|
||||
guest.enable = false;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
# keyboard fiddling
|
||||
i18n.defaultLocale = "de_DE.UTF-8";
|
||||
console.keyMap = "de";
|
||||
services.xserver.layout = "de,us";
|
||||
services.xserver.xkb.layout = "de,us";
|
||||
|
||||
#system.custom.suspend.enable = false;
|
||||
services.printing.enable = false;
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
driSupport32Bit = true;
|
||||
};
|
||||
|
||||
services.xserver.displayManager.defaultSession = "plasma";
|
||||
services.displayManager.defaultSession = "plasma";
|
||||
|
||||
services.xserver.desktopManager.pantheon.enable = false;
|
||||
services.xserver.desktopManager.xfce.enable = false;
|
||||
|
|
@ -96,7 +96,6 @@
|
|||
docker.enable = false;
|
||||
virtualbox = {
|
||||
host.enable = false;
|
||||
guest.x11 = false;
|
||||
guest.enable = false;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@
|
|||
|
||||
virtualbox = {
|
||||
host.enable = false;
|
||||
guest.x11 = false;
|
||||
guest.enable = false;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@ in
|
|||
(nextcloudSync "Kunstbuch")
|
||||
(nextcloudSync "AWS-SolutionArchitect-Professional")
|
||||
|
||||
(pkgs.writeShellScriptBin "nixFlakes" ''
|
||||
exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
|
||||
'')
|
||||
#(pkgs.writeShellScriptBin "nixFlakes" ''
|
||||
# exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
|
||||
#'')
|
||||
|
||||
valentina
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue