Compare commits

...

4 commits

3 changed files with 15 additions and 51 deletions

24
flake.lock generated
View file

@ -174,11 +174,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1697748412, "lastModified": 1698053470,
"narHash": "sha256-5VSB63UE/O191cuZiGHbCJ9ipc7cGKB8cHp0cfusuyo=", "narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "72d53d51704295f1645d20384cd13aecc182f624", "rev": "80d98a7d55c6e27954a166cb583a41325e9512d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -190,11 +190,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1697456312, "lastModified": 1698134075,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -238,11 +238,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1697655685, "lastModified": 1698288402,
"narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=", "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "80c1aab725151632ddc2a20caeb914e76dd0673c", "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,11 +254,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1697826327, "lastModified": 1698349907,
"narHash": "sha256-ZIn8FPKcCVQNgEDeIldXcbPUH5G4Mn8cQfD2/P8lDXE=", "narHash": "sha256-osw0ai9NkafXjqXIEB0j2TZqs28Yq0ZTSp1yXYv60nc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ec75f6875198259bfbb7ef78c178481c0e057ea3", "rev": "284459b884135bdff18e8142b7644c40ee21ec05",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -11,7 +11,7 @@ let
thunderbird thunderbird
calibre calibre
dino dino
zotero #zotero has open CVEs, wait for patch in Zotero7
keepassxc keepassxc
ding ding
aspell aspell

View file

@ -1,6 +1,6 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running `nixos-help`).
{ config, pkgs, lib, inputs, ... }: { config, pkgs, lib, inputs, ... }:
@ -61,7 +61,6 @@ in
boot.plymouth.enable = true; boot.plymouth.enable = true;
networking.hostName = "thinknix"; networking.hostName = "thinknix";
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# configure console # configure console
console = { console = {
@ -167,7 +166,7 @@ in
services.flatpak.enable = true; services.flatpak.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with `passwd`.
users.users.spiollinux = { users.users.spiollinux = {
isNormalUser = true; isNormalUser = true;
uid = 1000; uid = 1000;
@ -199,41 +198,6 @@ in
devices = [{ device = "/dev/sda"; } { device = "/dev/sdb"; }]; devices = [{ device = "/dev/sda"; } { device = "/dev/sdb"; }];
}; };
# block certain sites to prevent procrastination
systemd.services.procrastinationstop = {
serviceConfig.Type = "oneshot";
wantedBy = [ ];
script = ''
ln -sf ${pkgs.writeText "blockedHosts" ''
127.0.0.1 localhost
::1 localhost
127.0.0.2 ${config.networking.hostName}
::1 ${config.networking.hostName}
::1 twitter.com
127.0.0.1 twitter.com
::1 api.twitter.com
127.0.0.1 api.twitter.com
::1 toot.matereal.eu
127.0.0.1 toot.matereal.eu
::1 tagesschau.de
127.0.0.1 tagesschau.de
::1 dnn.de
127.0.0.1 www.dnn.de
::1 www.dnn.de
127.0.0.1 dnn.de
''} /etc/hosts
'';
};
systemd.services.procrastinationstart = {
serviceConfig.Type = "oneshot";
wantedBy = [ ];
script = ''
ln -sf /etc/static/hosts /etc/hosts
'';
};
fonts = { fonts = {
fontDir.enable = true; fontDir.enable = true;
fontconfig.enable = true; fontconfig.enable = true;