Compare commits

..

No commits in common. "dc4c07908c5d9326f4fea2b920682ced71d62b23" and "9b150da119f09a0647a716cbf19e77cf00b319e7" have entirely different histories.

6 changed files with 19 additions and 78 deletions

18
flake.lock generated
View file

@ -143,11 +143,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1737590910, "lastModified": 1736283893,
"narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", "narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9368027715d8dde4b84c79c374948b5306fdd2db", "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,11 +207,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1737469691, "lastModified": 1736012469,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,11 +239,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1737404927, "lastModified": 1736200483,
"narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=", "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ae584d90cbd0396a422289ee3efb1f1c9d141dc3", "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -35,7 +35,6 @@
(import ../../modules/programs/emacs.nix {}) (import ../../modules/programs/emacs.nix {})
../../modules/programs/fonts.nix ../../modules/programs/fonts.nix
../../modules/programs/desktop.nix ../../modules/programs/desktop.nix
../../modules/programs/media.nix
../../modules/programs/games.nix ../../modules/programs/games.nix
]; ];
home.username = "nathan"; home.username = "nathan";
@ -66,14 +65,8 @@
# Stylus note taking # Stylus note taking
xournalpp xournalpp
rnote rnote
# Drawing and image editing
krita
inkscape
gimp
# System monitoring # System monitoring
nvtopPackages.full nvtopPackages.full
# RSS reader for testing
kdePackages.akregator
]; ];
} }
) )

View file

@ -11,45 +11,18 @@
protonmail-desktop protonmail-desktop
signal-desktop signal-desktop
caprine caprine
# Media
spotify
inputs'.nixpkgs-unstable.legacyPackages.ente-web
calibre
# Utility # Utility
protonvpn-gui protonvpn-gui
# Browser
firefoxpwa
ungoogled-chromium
]; ];
programs.firefox = {
enable = true;
nativeMessagingHosts = with pkgs; [
kdePackages.plasma-browser-integration
];
};
services.syncthing = { services.syncthing = {
enable = true; enable = true;
tray = { tray = {
enable = true; enable = true;
}; };
}; };
# Setup foot as our terminal emulator
programs.foot = {
enable = true;
server.enable = true;
settings = {
main = {
font = "JetBrainsMono NF:size=8";
dpi-aware = "yes";
};
};
};
# Refresh the KDE applications cache, this really should be in upstream home
# manager, but its not for some reason
home.activation = {
kdeApplicationCache = lib.hm.dag.entryAfter ["installPackages"] ''
run rm ~/.cache/ksycoca6_* -rf
run kbuildsycoca6
'';
};
} }

View file

@ -9,7 +9,6 @@
# Git addons # Git addons
git-secret git-secret
delta delta
pre-commit
# nix utilities # nix utilities
comma comma
nix-du nix-du

View file

@ -1,26 +0,0 @@
{
config,
lib,
pkgs,
inputs',
...
}: {
home.packages = with pkgs; [
# Media
spotify
inputs'.nixpkgs-unstable.legacyPackages.ente-web
calibre
freetube
];
programs.mpv = {
enable = true;
scripts = with pkgs.mpvScripts; [
mpris
modernz
memo
mpv-cheatsheet
webtorrent-mpv-hook
];
};
}

View file

@ -148,6 +148,9 @@
extraGroups = ["networkmanager"]; extraGroups = ["networkmanager"];
}; };
# Install firefox.
programs.firefox.enable = true;
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -155,7 +158,6 @@
libinput libinput
maliit-keyboard maliit-keyboard
dconf-editor dconf-editor
iptsd
surface-control surface-control
]; ];
@ -163,7 +165,7 @@
services.iptsd = { services.iptsd = {
enable = true; enable = true;
config.Touchscreen = { config.Touchscreen = {
# DisableOnPalm = true; DisableOnPalm = true;
DisableOnStylus = true; DisableOnStylus = true;
}; };
}; };
@ -176,7 +178,7 @@
# Other power saving goodies # Other power saving goodies
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
services.tlp = { services.tlp = {
enable = false; enable = true;
settings = { settings = {
CPU_SCALING_GOVERNOR_ON_AC = "performance"; CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
@ -186,7 +188,7 @@
}; };
}; };
powerManagement.enable = true; powerManagement.enable = true;
services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = false;
services.cpupower-gui.enable = true; services.cpupower-gui.enable = true;
# Nvidia gpu setup # Nvidia gpu setup