schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Compare commits

base: schmittlauch:daa39f6d5ee2b9b102583873bdc7b5f7f602a29a
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion
...
compare: schmittlauch:e879420bd7f354f5139f7534051e0b47bfdaf5c7
Branches Tags
schmittlauch:darwin-patch-nodejs_20
schmittlauch:mainline
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion

5 commits
daa39f6d5e ... e879420bd7

Author SHA1 Message Date
Trolli Schmittlauch e879420bd7 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d' (2024-07-28)
  → 'github:NixOS/nixpkgs/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58' (2024-07-31)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/12bf09802d77264e441f48e25459c10c93eada2e' (2024-07-29)
  → 'github:NixOS/nixpkgs/05405724efa137a0b899cce5ab4dde463b4fd30b' (2024-08-01)
• Updated input 'nur':
    'github:nix-community/NUR/6f645601159190be1c1ecddf14e738d2de45f6b6' (2024-07-31)
  → 'github:nix-community/NUR/ac1226f223779364c73f1a450654383768dab1b7' (2024-08-03)
 2024-08-03 21:33:59 +02:00
Trolli Schmittlauch 05ed1a8f0d kmail/ kde-pim: install via NixOS option instead 
Installing the kde-pim sutie is quite complex. Thus, there's a
`programs.kde-pim` in NixOS now to keep track of all necessarry
packages.

Removing the attempted list of necessary packages from explicit NixOS
and home packages instead.
 2024-07-31 21:38:08 +02:00
Trolli Schmittlauch df2f955ed2 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/0b4d40f95a68ef0a6785f6b938ac8c1383321dbf' (2024-07-26)
  → 'github:NixOS/nixos-hardware/14c333162ba53c02853add87a0000cbd7aa230c2' (2024-07-30)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/5ad6a14c6bf098e98800b091668718c336effc95' (2024-07-25)
  → 'github:NixOS/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d' (2024-07-28)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a1cc729dcbc31d9b0d11d86dc7436163548a9665' (2024-07-25)
  → 'github:NixOS/nixpkgs/12bf09802d77264e441f48e25459c10c93eada2e' (2024-07-29)
• Updated input 'nur':
    'github:nix-community/NUR/5a048a702c733a917b6cdb760b3db8c20f705557' (2024-07-27)
  → 'github:nix-community/NUR/6f645601159190be1c1ecddf14e738d2de45f6b6' (2024-07-31)
 2024-07-31 21:30:40 +02:00
Trolli Schmittlauch ed281272e7 kmail: explicitly install some needed dependencies for mail account creation 
merely a workaround
 2024-07-31 21:30:40 +02:00
Trolli Schmittlauch 7d9194b45a git config contacts: bump submodule, adapt to restructuring 2024-07-31 21:30:40 +02:00
7 changed files with 38 additions and 40 deletions
Show stats Expand all files Collapse all files

7
common/default.nix
View file

@ -158,6 +158,13 @@ in
wayland.enable = true; wayland.enable = true;
}; };
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
# TODO: move out into a plasma.nix module
programs.kde-pim = {
enable = true;
kmail = true;
kontact = true;
merkuro = true;
};
# enable wayland for Chromium and Electron # enable wayland for Chromium and Electron
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";

2
common/packages.nix
View file

@ -48,8 +48,6 @@
networkmanager-openconnect networkmanager-openconnect
networkmanager-vpnc networkmanager-vpnc
networkmanager-openvpn networkmanager-openvpn
# TODO: is this still necessary?
kdePackages.akonadi-mime # for KOrganizer
# for some Flatpak packkages # for some Flatpak packkages
accountsservice accountsservice
]; ];

32
flake.lock
View file

@ -159,11 +159,11 @@
"mysecrets": { "mysecrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1710686355, "lastModified": 1722419972,
"narHash": "sha256-YcSywZx6/IMYfNax1Yx0EDLQiKsCn7glYVz1eglhbcM=", "narHash": "sha256-7gKcSKTu7Z6sswIK4QuMHtDbpKMs09b6w7uFjJJyAIA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "72d2478b720fabf69971747641230387d0df7689", "rev": "c725f810bb9a43c213fcf964f036dd0c64b6ba04",
"revCount": 4, "revCount": 5,
"type": "git", "type": "git",
"url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git" "url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"
}, },
@ -194,11 +194,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1722017959, "lastModified": 1722332872,
"narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=", "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf", "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1721924956, "lastModified": 1722421184,
"narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ad6a14c6bf098e98800b091668718c336effc95", "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,11 +258,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1721949857, "lastModified": 1722519197,
"narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=", "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665", "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,11 +274,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1722069894, "lastModified": 1722709906,
"narHash": "sha256-ZA3OVFjy8o4uZlPMjollef+OUyVnoUmFdMLGr5RE8zE=", "narHash": "sha256-I27FkJ3qSsxc5aZSwpYHMqJwLpvQt6eV4MrwGfVjCvM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "5a048a702c733a917b6cdb760b3db8c20f705557", "rev": "ac1226f223779364c73f1a450654383768dab1b7",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
home/desktop.nix
View file

@ -3,6 +3,7 @@
inputs, inputs,
config, config,
system, system,
lib,
... ...
}: }:
{ {
@ -29,7 +30,7 @@
programs.git = programs.git =
let let
# TODO profile specific # TODO profile specific
contacts = import "${inputs.mysecrets}/contacts.nix"; contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
in in
{ {
includes = includes =
@ -37,15 +38,15 @@
{ {
condition = "gitdir:~/Seafile/Studium/"; condition = "gitdir:~/Seafile/Studium/";
contents = { contents = {
user.name = contacts.realName; user.name = contacts.personal.name;
user.email = contacts.uniMail; user.email = contacts.uni.email;
}; };
} }
{ {
condition = "gitdir:~/src/nixpkgs/"; condition = "gitdir:~/src/nixpkgs/";
contents = { contents = {
user.name = "Trolli Schmittlauch"; user.name = "Trolli Schmittlauch";
user.email = contacts.nixosMail; user.email = contacts.nixOs.email;
}; };
} }
] ]
@ -55,8 +56,9 @@
(dir: { (dir: {
condition = "gitdir:${dir}"; condition = "gitdir:${dir}";
contents = { contents = {
user.name = "Trolli Schmittlauch"; user = {
user.email = contacts.mainMail; inherit (contacts.schmittlauch) email name;
};
}; };
}) })
[ [

5
home/modules/packages.nix
View file

@ -198,11 +198,6 @@ let
okular okular
gwenview gwenview
yakuake yakuake
kmail
kontact
korganizer
akonadi-mime # for KOrganizer
kaddressbook
kdeconnect kdeconnect
dolphin dolphin
spectacle spectacle

2
home/secrets

@ -1 +1 @@
Subproject commit 72d2478b720fabf69971747641230387d0df7689 Subproject commit c725f810bb9a43c213fcf964f036dd0c64b6ba04

12
home/workmac.nix
View file

@ -47,15 +47,13 @@ in
hostname = "vpn-whq.services.fcio.net"; hostname = "vpn-whq.services.fcio.net";
extraOptions.LogLevel = "Verbose"; extraOptions.LogLevel = "Verbose";
}; };
"fcio-rzob-jump" = lib.hm.dag.entryAfter ["*"] { "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-rzob.services.fcio.net"; };
hostname = "vpn-rzob.services.fcio.net";
};
}; };
}; };
programs.git = programs.git =
let let
contacts = import "${inputs.mysecrets}/contacts.nix"; contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
in in
{ {
includes = includes =
@ -63,8 +61,7 @@ in
{ {
condition = "gitdir:~/src/schmittlauch/"; condition = "gitdir:~/src/schmittlauch/";
contents = { contents = {
user.name = "Trolli Schmittlauch"; inherit (contacts.schmittlauch) name email;
user.email = contacts.nixosMail;
}; };
} }
] ]
@ -72,8 +69,7 @@ in
++ map (dir: { ++ map (dir: {
condition = "gitdir:${dir}"; condition = "gitdir:${dir}";
contents = { contents = {
user.name = contacts.realName; inherit (contacts.work) name email;
user.email = contacts.fcioMail;
}; };
}) [ "~/" ]; }) [ "~/" ];
}; };