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

Compare commits

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

3 commits
e6e6b3c162 ... 975deec63b

Author SHA1 Message Date
Trolli Schmittlauch
975deec63b plasma5 -> plasma6 
for both the NixOS desktop env as well as home-manager packages.

ktouch had to be disabled due to being marked as broken, let's fix this
later
 2024-07-02 23:43:46 +02:00
Trolli Schmittlauch
f992a50964 treefmt 2024-07-02 23:42:52 +02:00
Trolli Schmittlauch
5b21da30ba flake.lock: Update 
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/a1fddf0967c33754271761d91a3d921772b30d0e' (2024-06-16)
  → 'github:nix-community/home-manager/391ca6e950c2525b4f853cbe29922452c14eda82' (2024-07-01)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/a59f00f5ac65b19382617ba00f360f8bc07ed3ac' (2024-06-29)
  → 'github:NixOS/nixos-hardware/6e253f12b1009053eff5344be5e835f604bb64cd' (2024-07-02)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/b2852eb9365c6de48ffb0dc2c9562591f652242a' (2024-06-27)
  → 'github:NixOS/nixpkgs/00d80d13810dbfea8ab4ed1009b09100cca86ba8' (2024-07-01)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/89c49874fb15f4124bf71ca5f42a04f2ee5825fd' (2024-06-26)
  → 'github:NixOS/nixpkgs/d032c1a6dfad4eedec7e35e91986becc699d7d69' (2024-07-01)
• Updated input 'nur':
    'github:nix-community/NUR/2ef1c7312fd083f118fee1bfeef40f4de36b14ca' (2024-06-30)
  → 'github:nix-community/NUR/ef879b77a1fbbe7170ab555852e18fa531c23a60' (2024-07-02)
 2024-07-02 21:59:46 +02:00
5 changed files with 62 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/default.nix
View file

@ -153,7 +153,7 @@ in
# Enable the KDE Desktop Environment. # Enable the KDE Desktop Environment.
services.displayManager.sddm.enable = true; services.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.desktopManager.plasma6.enable = true;
# dconf required for several Gnome applications # dconf required for several Gnome applications
programs.dconf.enable = true; programs.dconf.enable = true;

126
common/packages.nix
View file

@ -9,90 +9,48 @@
# take overlays from flake # take overlays from flake
nixpkgs.overlays = lib.attrValues config.inputInjection.flake-inputs.self.overlays; nixpkgs.overlays = lib.attrValues config.inputInjection.flake-inputs.self.overlays;
# List packages installed in system profile. # List packages installed in system profile.
environment.systemPackages = environment.systemPackages = with pkgs; [
with pkgs; wget
[ vim
wget vimPlugins.vim-nix
vim vimPlugins.pathogen
vimPlugins.vim-nix tmux
vimPlugins.pathogen htop
tmux zsh
htop btrfs-progs
zsh git
btrfs-progs python3
git man-pages
python3 dnsutils
man-pages netcat-openbsd
dnsutils ntfs3g
netcat-openbsd file
ntfs3g multipath-tools
file strace
multipath-tools ltrace
strace valgrind
ltrace testdisk
valgrind rsync
testdisk pv
rsync exfat
pv iotop
exfat cifs-utils
iotop dstat
cifs-utils lsof
dstat macchanger
lsof borgbackup
macchanger
borgbackup
# for debugging WLAN failures: # for debugging WLAN failures:
ethtool ethtool
trace-cmd trace-cmd
# NetworkManager stuff # NetworkManager stuff
networkmanager-openconnect networkmanager-openconnect
networkmanager-vpnc networkmanager-vpnc
networkmanager-openvpn networkmanager-openvpn
plasma5Packages.kdeGear.akonadi-mime # for KOrganizer # TODO: is this still necessary?
] kdePackages.akonadi-mime # for KOrganizer
++ ( # for some Flatpak packkages
with plasma5Packages; accountsservice
with kdeGear; ];
[
#akonadi
#akonadi-calendar
#akonadi-contacts
#akonadi-import-wizard
#akonadi-mime
#akonadi-notes
#akonadi-search
#akonadiconsole
#akregator
#kaddressbook
#kalarm
#kalarmcal
#kcalutils
#kcontacts
#kdav
#kdepim-addons
#kdepim-runtime
#kidentitymanagement
#kldap
#kmail
#kmailtransport
#kmbox
#kmime
#kontact
#kontactinterface
#korganizer
#kpimtextedit
#libkdepim
#libksieve
#mailcommon
#messagelib
#pimcommon
#pim-sieve-editor
# for some Flatpak packkages
accountsservice
]
);
} }

30
flake.lock generated
View file

@ -117,11 +117,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718530513, "lastModified": 1719827385,
"narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +194,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719681865, "lastModified": 1719895800,
"narHash": "sha256-Lp+l1IsREVbz8WM35OJYZz8sAH0XOjrZWUXVB5bJ2qg=", "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac", "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1719506693, "lastModified": 1719848872,
"narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,11 +258,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1719426051, "lastModified": 1719838683,
"narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,11 +274,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1719771190, "lastModified": 1719949581,
"narHash": "sha256-W2EApTej3kQYP+nn8BbCoSOQs+5Kvn+0LJzlT+GkB2E=", "narHash": "sha256-5oTHaCzhztZL0we4NxD9ZbHoRtxxS+psl+8VVVDNN+A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "2ef1c7312fd083f118fee1bfeef40f4de36b14ca", "rev": "ef879b77a1fbbe7170ab555852e18fa531c23a60",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
home/modules/packages.nix
View file

@ -122,7 +122,7 @@ let
]; ];
pythonTools = with python3Packages; [ pythonTools = with python3Packages; [
python3 # to shadow old macOS python python3 # to shadow old macOS python
notebook notebook
ipython ipython
pip pip
@ -193,9 +193,8 @@ let
]; ];
kdeTools = kdeTools =
with plasma5Packages; [ okteta ]
with kdeGear; ++ (with kdePackages; [
[
okular okular
gwenview gwenview
yakuake yakuake
@ -212,16 +211,13 @@ let
qdirstat qdirstat
ark ark
kwalletmanager kwalletmanager
ktouch #ktouch # TODO: unbreak
kcharselect kcharselect
konversation konversation
okteta
krdc krdc
skanlite skanlite
akonadiconsole akonadiconsole
tokodon # mastodon client tokodon # mastodon client
]
++ (with kdeFrameworks; [
networkmanager-qt networkmanager-qt
kcrash kcrash
breeze-gtk breeze-gtk

1
hosts/framenix/default.nix
View file

@ -46,7 +46,6 @@ in
}; };
}; };
boot.loader = { boot.loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;