Compare commits

...

10 commits

18 changed files with 298 additions and 387 deletions

View file

@ -31,11 +31,11 @@
]
},
"locked": {
"lastModified": 1701025348,
"narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
"lastModified": 1709610799,
"narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=",
"owner": "ipetkov",
"repo": "crane",
"rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
"rev": "81c393c776d5379c030607866afef6406ca1be57",
"type": "github"
},
"original": {
@ -52,11 +52,11 @@
]
},
"locked": {
"lastModified": 1703245373,
"narHash": "sha256-diJVcEb5RzMQqrXl2hXUUY1SvSSJEg4ttpzij6skyew=",
"lastModified": 1710073490,
"narHash": "sha256-4B3McqiXy8TaNp8G134BQMx+m/A/VidMYRGcD4bda0k=",
"owner": "michaelshmitty",
"repo": "cryptpad-flake",
"rev": "369a95c89e1448a1bc26ad8d0e57618fc0a5dc90",
"rev": "6657541cfcd18ca328c8d3a41b9bf18bc5f10099",
"type": "github"
},
"original": {
@ -72,11 +72,11 @@
]
},
"locked": {
"lastModified": 1708737761,
"narHash": "sha256-sR/1cYjpgr71ZSrt6Kp5Dg4Ul3mo6pZIG400tuzYks8=",
"lastModified": 1710281379,
"narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "bbde06bed1b72eddff063fa42f18644e90a0121e",
"rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670",
"type": "github"
},
"original": {
@ -93,11 +93,11 @@
]
},
"locked": {
"lastModified": 1708564520,
"narHash": "sha256-juduDTYBhGN6jNfQ5RMDpbQF+MkO0pj3k7XGDSTjAbs=",
"lastModified": 1710427903,
"narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=",
"owner": "nix-community",
"repo": "disko",
"rev": "23d308f0059955e3719efc81a34d1fc0369fbb74",
"rev": "21d89b333ca300bef82c928c856d48b94a9f997c",
"type": "github"
},
"original": {
@ -183,11 +183,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@ -225,11 +225,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1708745305,
"narHash": "sha256-AxBvMahNT310JVOSLT8MFjUXhpPzDXaSxNluNTod36A=",
"lastModified": 1710393236,
"narHash": "sha256-3XUAUU170gvD8FZ5VnAYKzYLeC6PQHG2aBVW2d4BmHk=",
"owner": "helix-editor",
"repo": "helix",
"rev": "ec9efdef3b2f613a86098058f5705e7863e375e2",
"rev": "6c4d986c1b1ac4e350dced513b6608ba4464cde3",
"type": "github"
},
"original": {
@ -242,20 +242,20 @@
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs-stable"
"nixpkgs-nixos-unstable"
]
},
"locked": {
"lastModified": 1706981411,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"lastModified": 1710532761,
"narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
@ -308,11 +308,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1708594753,
"narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=",
"lastModified": 1710123225,
"narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958",
"rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba",
"type": "github"
},
"original": {
@ -324,11 +324,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1708770680,
"narHash": "sha256-uS1Jji64SPBKu5/VdNYj3volc/xAmDgsBguq4zgBWDw=",
"lastModified": 1710494698,
"narHash": "sha256-oMilsMpnRFzG7kpoWLoZePt4lttZGkN36OAf8DGnE00=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d01044ecfa9c89a925bebb76cf60f2e3b9cea667",
"rev": "453b69da7a400af2c669793ee504b016b3fd3639",
"type": "github"
},
"original": {
@ -340,11 +340,11 @@
},
"nixpkgs-nixos-unstable": {
"locked": {
"lastModified": 1708655239,
"narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=",
"lastModified": 1710272261,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
"type": "github"
},
"original": {
@ -356,11 +356,11 @@
},
"nixpkgs-rust-analyzer": {
"locked": {
"lastModified": 1708770680,
"narHash": "sha256-uS1Jji64SPBKu5/VdNYj3volc/xAmDgsBguq4zgBWDw=",
"lastModified": 1710494698,
"narHash": "sha256-oMilsMpnRFzG7kpoWLoZePt4lttZGkN36OAf8DGnE00=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d01044ecfa9c89a925bebb76cf60f2e3b9cea667",
"rev": "453b69da7a400af2c669793ee504b016b3fd3639",
"type": "github"
},
"original": {
@ -372,11 +372,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1708566995,
"narHash": "sha256-e/THimsoxxMAHSbwMKov5f5Yg+utTj6XVGEo24Lhx+0=",
"lastModified": 1710420202,
"narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3cb4ae6689d2aa3f363516234572613b31212b78",
"rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da",
"type": "github"
},
"original": {
@ -388,11 +388,11 @@
},
"nur": {
"locked": {
"lastModified": 1708771490,
"narHash": "sha256-HYFlXYMWDHZmwazXGNu0DT5M/ZNkYTOMtUxh40onEGA=",
"lastModified": 1710494722,
"narHash": "sha256-rjYCRxjuNJYH8/YJ3G3fQsdq17pVIdyH5yMSNDQznBg=",
"owner": "nix-community",
"repo": "NUR",
"rev": "7f0cad37958f31e19255fcc50683c638caa3149e",
"rev": "e1d526df83b9ef104150b67d89afb4d4c20975d7",
"type": "github"
},
"original": {
@ -454,11 +454,11 @@
]
},
"locked": {
"lastModified": 1701137803,
"narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
"lastModified": 1709604635,
"narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9dd940c967502f844eacea52a61e9596268d4f70",
"rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d",
"type": "github"
},
"original": {
@ -502,11 +502,11 @@
]
},
"locked": {
"lastModified": 1708500294,
"narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=",
"lastModified": 1710433464,
"narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11",
"rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090",
"type": "github"
},
"original": {

View file

@ -159,7 +159,7 @@
};
nixosConfigurations = {
foryog = mkWorkstation nixpkgs-stable "x86_64-linux" "foryog";
foryog = mkWorkstation nixpkgs-nixos-unstable "x86_64-linux" "foryog";
thinky = mkWorkstation nixpkgs-stable "x86_64-linux" "thinky";
bolty = mkServer nixpkgs-stable "x86_64-linux" "bolty";
vpsfree1 = mkServer nixpkgs-stable "x86_64-linux" "vpsfree1";
@ -274,8 +274,8 @@
type = "github";
owner = "nix-community";
repo = "home-manager";
ref = "release-23.11";
inputs.nixpkgs.follows = "nixpkgs-stable";
ref = "master";
inputs.nixpkgs.follows = "nixpkgs-nixos-unstable";
};
flake-utils = {
type = "github";

View file

@ -15,7 +15,6 @@
];
timerConfig = {OnCalendar = "daily";};
pruneOpts = [
"--keep-hourly 25"
"--keep-daily 8"
"--keep-weekly 5"
"--keep-monthly 13"

View file

@ -1,10 +1,4 @@
{
config,
pkgs,
inputs,
lib,
...
}: {
{ config, pkgs, inputs, lib, ... }: {
imports = [
"${inputs.nixpkgs-stable}/nixos/modules/profiles/qemu-guest.nix"
../cli.nix
@ -13,7 +7,7 @@
./cryptpad.nix
./disks.nix
./foundryvtt.nix
./gitea.nix
./forgejo.nix
./mastodon.nix
./rss.nix
./ssh.nix

View file

@ -0,0 +1,103 @@
{ config, pkgs, inputs, lib, system, ... }:
let
unstable = inputs.nixpkgs-nixos-unstable;
package = unstable.legacyPackages."${system}".forgejo;
httpPort = 8083;
sshPort = 22;
domain = "git.cyplo.dev";
emailDomain = "peninsula.industries";
baseurl = "https://${domain}";
mailgunSmtpSecretName = "forgejo-mailgun-smtp-password";
mailgunSmtpPasswordPath = "/run/secrets/${mailgunSmtpSecretName}";
uid = 2051;
gid = 3051;
systemUserName = "forgejo";
systemGroupName = "forgejo";
users = {
users."${systemUserName}" = {
inherit uid;
isSystemUser = true;
isNormalUser = false;
group = systemGroupName;
};
groups."${systemGroupName}" = {
inherit gid;
members = [ "${systemUserName}" "nginx" ];
};
};
in {
imports =
[ ../nginx.nix "${unstable}/nixos/modules/services/misc/forgejo.nix" ];
disabledModules = [ "services/misc/forgejo.nix" ];
inherit users;
boot.kernel.sysctl = { "net.ipv4.ip_unprivileged_port_start" = 0; };
systemd.services.systemd-sysctl.enable = lib.mkForce true;
networking.firewall.allowedTCPPorts = [ sshPort ];
services.nginx = {
virtualHosts = {
"${domain}" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://127.0.0.1:" + toString httpPort;
};
};
};
};
sops.secrets."${mailgunSmtpSecretName}" = {
sopsFile = ./mailgun.sops.yaml;
path = mailgunSmtpPasswordPath;
owner = systemUserName;
group = systemGroupName;
};
services.forgejo = {
enable = true;
inherit package;
user = systemUserName;
mailerPasswordFile = mailgunSmtpPasswordPath;
lfs.enable = true;
database.type = "sqlite3";
settings = {
service.DISABLE_REGISTRATION = true;
security.INSTALL_LOCK = true;
oauth2.ENABLE = false;
log.LEVEL = "Info";
actions.ENABLED = true;
"git.timeout" = {
DEFAULT = 600;
MIGRATE = 3600;
MIRROR = 3600;
CLONE = 600;
PULL = 600;
GC = 600;
};
"cron".ENABLED = true;
"cron.git_gc_repos".ENABLED = true;
"cron.delete_old_actions".ENABLED = true;
"cron.delete_old_system_notices".ENABLED = true;
"cron.gc_lfs".ENABLED = true;
server = {
ROOT_URL = baseurl;
DOMAIN = domain;
START_SSH_SERVER = true;
SSH_PORT = sshPort;
HTTP_PORT = httpPort;
SSH_LISTEN_PORT = sshPort;
DISABLE_SSH = false;
};
mailer = {
ENABLED = true;
FROM = "git.cyplo.dev <forgejo@${emailDomain}>";
PROTOCOL = "smtps";
SMTP_ADDR = "smtp.eu.mailgun.org";
SMTP_PORT = 465;
USER = "postmaster@${emailDomain}";
};
};
};
}

View file

@ -1,148 +0,0 @@
{
config,
pkgs,
inputs,
lib,
system,
...
}: let
unstable = inputs.nixpkgs-nixos-unstable;
package = unstable.legacyPackages."${system}".forgejo;
httpPort = 8083;
sshPort = 22;
domain = "git.cyplo.dev";
emailDomain = "peninsula.industries";
baseurl = "https://${domain}";
path = "/var/lib/gitea";
mailgunSmtpSecretName = "gitea-mailgun-smtp-password";
mailgunSmtpPasswordPath = "/run/secrets/${mailgunSmtpSecretName}";
uid = 2051;
gid = 3051;
systemUserName = "gitea";
systemGroupName = "gitea";
users = {
users."${systemUserName}" = {
inherit uid;
isSystemUser = true;
isNormalUser = false;
group = systemGroupName;
};
groups."${systemGroupName}" = {
inherit gid;
members = ["${systemUserName}" "nginx"];
};
};
in {
imports = [../nginx.nix];
inherit users;
boot.kernel.sysctl = {"net.ipv4.ip_unprivileged_port_start" = 0;};
systemd.services.systemd-sysctl.enable = lib.mkForce true;
networking.firewall.allowedTCPPorts = [sshPort];
services.nginx = {
virtualHosts = {
"${domain}" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://127.0.0.1:" + toString httpPort;
};
};
};
};
sops.secrets."${mailgunSmtpSecretName}" = {
sopsFile = ./mailgun.sops.yaml;
path = mailgunSmtpPasswordPath;
owner = systemUserName;
group = systemGroupName;
};
containers.gitea = {
autoStart = true;
forwardPorts = [
{
inherit httpPort;
containerPort = httpPort;
}
{
containerPort = sshPort;
hostPort = sshPort;
}
];
bindMounts = {
"${path}" = {
hostPath = "${path}";
isReadOnly = false;
};
"${mailgunSmtpPasswordPath}" = {
hostPath = "${mailgunSmtpPasswordPath}";
isReadOnly = true;
};
};
config = {
config,
pkgs,
lib,
...
}: {
system.stateVersion = "23.11";
users =
users
// {
mutableUsers = false;
allowNoPasswordLogin = true;
};
disabledModules = ["services/misc/gitea.nix"];
imports = ["${unstable}/nixos/modules/services/misc/gitea.nix"];
services.gitea = {
enable = true;
inherit package;
stateDir = path;
user = systemUserName;
mailerPasswordFile = mailgunSmtpPasswordPath;
lfs.enable = true;
database.type = "sqlite3";
settings = {
service.DISABLE_REGISTRATION = true;
security.INSTALL_LOCK = true;
oauth2.ENABLE = false;
log.LEVEL = "Info";
actions.ENABLED = true;
"git.timeout" = {
DEFAULT = 600;
MIGRATE = 3600;
MIRROR = 3600;
CLONE = 600;
PULL = 600;
GC = 600;
};
"cron".ENABLED = true;
"cron.git_gc_repos".ENABLED = true;
"cron.delete_old_actions".ENABLED = true;
"cron.delete_old_system_notices".ENABLED = true;
"cron.gc_lfs".ENABLED = true;
server = {
ROOT_URL = baseurl;
DOMAIN = domain;
START_SSH_SERVER = true;
SSH_PORT = sshPort;
HTTP_PORT = httpPort;
SSH_LISTEN_PORT = sshPort;
DISABLE_SSH = false;
};
mailer = {
ENABLED = true;
FROM = "git.cyplo.dev <gitea@${emailDomain}>";
PROTOCOL = "smtps";
SMTP_ADDR = "smtp.eu.mailgun.org";
SMTP_PORT = 465;
USER = "postmaster@${emailDomain}";
};
};
};
};
};
}

View file

@ -1,4 +1,4 @@
gitea-mailgun-smtp-password: ENC[AES256_GCM,data:dIfcxK5ZQGNqnOfTdVI7FzR9RgP3Ao/bk7XDZULHby58MJumhESELRCkHgKhOSqTAQE=,iv:xjtVQEILVl+XFel+thoS8OvF/fpFYSNtt5MTRUhgyrI=,tag:TJPBQG4xsbHrcdXCbDdejg==,type:str]
forgejo-mailgun-smtp-password: ENC[AES256_GCM,data:bZfUTNOta/TuHpR1bsAHV8NFZSFgU1szzN9Ue/mzwMMGRqdh9ORUO8gIT+B3JMVEqNo=,iv:SVaMY2QK8lWGtLuUAXKWKxpfkRrvPBh3jhH9PFMFsuM=,tag:OwdGA0lieHTxe4GfDWqQXg==,type:str]
mastodon-mailgun-smtp-password: ENC[AES256_GCM,data:h2SSa/053BBIo3Y03TB+1SW6C9DFighMVgY1jzGcUZLhiZ/jd2YbTYlq83Nbb5GBZAY=,iv:9BJuVSfOC48K69kDLUjr1oK3g0xSKAxlzDI/py3STt8=,tag:DTE2OemwbZ0U59wF/9NQjA==,type:str]
sops:
kms: []
@ -96,8 +96,8 @@ sops:
cHhHRGJIRDlsMEp2RzgxTWkyaWovbkEKnEzQrhYmdxjwa8bDGgVnHBoNXrdb8JDy
EOkYPEiHlscMfsGnUhbujoLXEveIrLzukWgKcRNmS5fTyG4e2eP/cw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-01-01T16:13:02Z"
mac: ENC[AES256_GCM,data:YMQ2xiuiXoCAzuGGlm/KiEEjjZBHu7i+5Px2YibwSATBeEais9SZFqQx0qmIQw+VGdGAwVo8tQQ5Ikg5YJbHNEetanXbV1UJtMBBUb8m35lras+yXmeveOeKC/f46oa0DCPVuCDqkzEWOAk2NMZnfR5iuWBaZ6rvIhGnqlXodK8=,iv:UkTovxMi25Jfz8JzQE3W+Ar6w7ybBAJQG+9j6RWj/2M=,tag:RRSqNAv3OiMahG2oYZSJvA==,type:str]
lastmodified: "2024-03-16T11:03:13Z"
mac: ENC[AES256_GCM,data:XlpAHjvUnnz3NxZnNxlMGELsPjHL648fcs1mbP3KZQLthkLdERjT0BcuqKsY6X+s3CNEET18IKWGiBZPA+iFLAWAzHl+qNDm0WNZv05ECgz+BeNGH6e9FqqtSNIPmnSYfXqyHz/Psg1T5l+N6QK1dRl5PVeO8Bxs3G3H6iZgLOM=,iv:wswvHl6yK/BYW8zf53t18gYz5WNvULaRj2lyHVeuO2A=,tag:pJzh11seJQ64HCiIMhtzdQ==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3
version: 3.8.1

View file

@ -1,36 +1,26 @@
{
config,
pkgs,
inputs,
lib,
system,
...
}: {
{ config, pkgs, inputs, lib, system, ... }: {
networking.hostName = "foryog";
imports = [
./hardware-configuration.nix
../../backups.nix
../../boot.nix
../../emacs
../../git
../../gnome
../../gui
../../gui/vscode
../../libvirt.nix
../../mercurial
../../kde
../../vim
../../zsh
];
fileSystems."/" = {options = ["compress=zstd"];};
fileSystems."/" = { options = [ "compress=zstd" ]; };
services.restic.backups.home-to-b2 = {
repository = lib.mkForce "b2:cyplo-restic-foureighty:/";
};
boot.kernelParams = ["initcall_debug" ''dyndbg="file suspend.c +p"'' "no_console_suspend"];
boot.kernelParams =
[ "initcall_debug" ''dyndbg="file suspend.c +p"'' "no_console_suspend" ];
boot.tmp.cleanOnBoot = true;
boot.binfmt.emulatedSystems = ["aarch64-linux"];
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
boot.plymouth = {
enable = true;
logo = ./boot.png;
@ -46,21 +36,10 @@
hardware.trackpoint.enable = true;
hardware.keyboard.qmk.enable = true;
services.udev.packages = [pkgs.qmk-udev-rules];
services.xserver = {
libinput = {
enable = true;
touchpad = {
tapping = true;
naturalScrolling = false;
middleEmulation = false;
disableWhileTyping = true;
};
};
};
services.fprintd = {enable = true;};
services.udev.packages = [ pkgs.qmk-udev-rules ];
services.fprintd = { enable = true; };
programs.ccache.enable = true;
hardware.opengl.extraPackages = with pkgs; [libva];
hardware.opengl.extraPackages = with pkgs; [ libva ];
programs.steam.enable = true;
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
@ -74,14 +53,11 @@
"vscode"
];
home-manager.users.cyryl = {...}: {
imports = [
../../home-manager/programs/kitty.nix
../../home-manager/programs/helix.nix
];
home-manager.users.cyryl = { ... }: {
imports = [ ../../home-manager/programs/kitty.nix ];
home.packages =
(with inputs.nixpkgs-master.legacyPackages."${system}"; [bisq-desktop])
++ (with pkgs; [lutris])
++ (with inputs.endless-sky.legacyPackages."${system}"; [endless-sky]);
(with inputs.nixpkgs-master.legacyPackages."${system}"; [ bisq-desktop ])
++ (with pkgs; [ lutris ])
++ (with inputs.endless-sky.legacyPackages."${system}"; [ endless-sky ]);
};
}

View file

@ -1,12 +1,8 @@
{
config,
pkgs,
...
}: {
{ config, pkgs, ... }: {
console.keyMap = "pl2";
imports = [./tailscale];
imports = [ ./tailscale ];
services = {
udev.packages = [pkgs.android-udev-rules];
udev.packages = [ pkgs.android-udev-rules ];
ratbagd.enable = true;
gvfs.enable = true;
@ -25,23 +21,5 @@
};
geoclue2.enable = true;
xserver = {
enable = true;
layout = "pl";
xkbOptions = "caps:ctrl_modifier";
xkbVariant = "";
libinput = {
enable = true;
touchpad = {
naturalScrolling = false;
disableWhileTyping = true;
};
};
deviceSection = ''
Option "TearFree" "true"
Option "AccelMethod" "sna"
'';
};
};
}

View file

@ -1,16 +1,8 @@
{
config,
pkgs,
discord,
inputs,
nixpkgs-nixos-unstable,
nixpkgs-nixos-stable-and-unfree,
nixpkgs-nixos-unstable-and-unfree,
...
}: {
{ config, pkgs, discord, inputs, nixpkgs-nixos-unstable
, nixpkgs-nixos-stable-and-unfree, nixpkgs-nixos-unstable-and-unfree, ... }: {
security.chromiumSuidSandbox.enable = true;
home-manager.users.cyryl = {...}: {
home-manager.users.cyryl = { ... }: {
gtk = {
enable = true;
iconTheme = {
@ -18,21 +10,15 @@
package = pkgs.gnome3.adwaita-icon-theme;
};
};
qt = {
enable = true;
platformTheme = "gnome";
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
};
qt = { enable = true; };
imports = [];
imports = [ ];
programs.chromium.enable = true;
programs.firefox.enable = true;
home.packages =
(with pkgs;
home.packages = (with pkgs;
with pkgs.gnome3;
with pkgs.python38Packages; [
with pkgs.python39Packages; [
anarchism
calibre
cheese
@ -85,9 +71,12 @@
yubikey-manager-qt
yubikey-personalization
yubikey-personalization-gui
])
++ (with nixpkgs-nixos-unstable; [gnucash thunderbird])
++ [nixpkgs-nixos-stable-and-unfree.discord]
++ (with nixpkgs-nixos-unstable-and-unfree; [hopper jetbrains.rust-rover jetbrains.clion]);
]) ++ (with nixpkgs-nixos-unstable; [ gnucash thunderbird ])
++ [ nixpkgs-nixos-stable-and-unfree.discord ]
++ (with nixpkgs-nixos-unstable-and-unfree; [
hopper
jetbrains.rust-rover
jetbrains.clion
]);
};
}

View file

@ -31,7 +31,7 @@
url = "https://github.com/vadimcn/vscode-lldb/releases/download/v1.6.10/codelldb-${pkgs.system}.vsix";
sha256 = "sha256-QWbpe6ofacjrTCyWSKljwHDWWeHGmKNqi7cpw8Qy5Tw=";
};
buildInputs = with pkgs; [llvm lldb python38 autoPatchelfHook];
buildInputs = with pkgs; [llvm lldb python39 autoPatchelfHook];
})
]
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [

View file

@ -6,7 +6,6 @@
}: {
services.gpg-agent = {
enable = true;
pinentryFlavor = "curses";
};
home.packages = with pkgs; [
appimage-run

View file

@ -28,19 +28,16 @@
sync_address = "https://atuin.cyplo.dev";
search_mode = "fuzzy";
};
# flags = [ "--disable-up-arrow" ];
flags = ["--disable-up-arrow"];
};
go.enable = true;
bat.enable = true;
browserpass.enable = true;
lsd.enable = true;
lsd.enableAliases = true;
#eza = {
# enable = true;
# enableAliases = true;
# git = true;
# icons = true;
#};
eza = {
enable = true;
git = true;
icons = true;
};
};
}

View file

@ -1,16 +0,0 @@
{
config,
pkgs,
...
}: {
services.xserver = {
enable = true;
displayManager.sddm = {
enable = true;
enableHidpi = true;
};
desktopManager.default = "plasma5";
desktopManager.plasma5.enable = true;
};
users.users.cyryl.packages = with pkgs; [];
}

9
nixos/kde/default.nix Normal file
View file

@ -0,0 +1,9 @@
{
config,
pkgs,
...
}: {
imports = [./system.nix];
home-manager.users.cyryl = {...}: {imports = [./home.nix];};
}

11
nixos/kde/home.nix Normal file
View file

@ -0,0 +1,11 @@
{ config, pkgs, ... }: {
services = {
kdeconnect.enable = true;
kdeconnect.indicator = true;
};
home.packages = [ ];
dconf.settings = { };
}

24
nixos/kde/system.nix Normal file
View file

@ -0,0 +1,24 @@
{ config, pkgs, inputs, system, ... }:
let
master = inputs.nixpkgs-master;
pkgs = master.legacyPackages."${system}";
in {
disabledModules = [ ];
imports = [ ];
services.flatpak.enable = true;
services.desktopManager.plasma6.enable = true;
services.xserver = {
enable = true;
displayManager.sddm = {
enable = true;
enableHidpi = true;
wayland.enable = true;
};
};
users.users.cyryl.packages = with pkgs; [ ];
programs.kdeconnect.enable = true;
}

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{ config, pkgs, ... }: {
programs.atuin.enableZshIntegration = true;
programs.zsh = {
enable = true;
@ -14,12 +10,12 @@
share = true;
};
enableAutosuggestions = true;
autosuggestion.enable = true;
enableCompletion = true;
oh-my-zsh = {
enable = true;
plugins = ["vi-mode" "git" "python" "history-substring-search" "tmux"];
plugins = [ "vi-mode" "git" "python" "history-substring-search" "tmux" ];
};
initExtra = ''
@ -69,7 +65,7 @@
programs.direnv = {
enable = true;
enableZshIntegration = true;
nix-direnv = {enable = true;};
nix-direnv = { enable = true; };
};
home.file.".config/starship.toml".text = ''