Compare commits
No commits in common. "238024c25a250f6c9af5ea9e1bfcd8f71f73af10" and "a58e359c1c28de96d6eac7d608d4a77a0187b6b6" have entirely different histories.
238024c25a
...
a58e359c1c
5 changed files with 108 additions and 202 deletions
66
flake.lock
66
flake.lock
|
|
@ -72,11 +72,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713543876,
|
"lastModified": 1711763326,
|
||||||
"narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=",
|
"narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed",
|
"rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -93,11 +93,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713406758,
|
"lastModified": 1712947906,
|
||||||
"narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=",
|
"narHash": "sha256-T0eT2lMbcK7RLelkx0qx4SiFpOS/0dt0aSfLB+WsGV8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "1efd500e9805a9efbce401ed5999006d397b9f11",
|
"rev": "8d4ae698eaac8bd717e23507da2ca8b345bec4b5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -225,11 +225,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713668430,
|
"lastModified": 1713054897,
|
||||||
"narHash": "sha256-HnM70sE7OryisMQ8GYOovO/zRXTcFGIDg4BKrGiFtWk=",
|
"narHash": "sha256-1RpjL4Erczw5Q1szSd543w+F1jsj5bXp2a74cpiyqIg=",
|
||||||
"owner": "helix-editor",
|
"owner": "helix-editor",
|
||||||
"repo": "helix",
|
"repo": "helix",
|
||||||
"rev": "26d9610e78b287c2316577af91adfd920baa7fa6",
|
"rev": "9df1266376323b3dae07e48bd1e64463d3aec1dd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -246,11 +246,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713707619,
|
"lastModified": 1713077896,
|
||||||
"narHash": "sha256-g73hSx1osp8G7pbFQbiz7OCosAogf0WrLSOWyEF+F9M=",
|
"narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "ad83c154bdfedad9807e86dd0633729ea3b116c5",
|
"rev": "630a0992b3627c64e34f179fab68e3d48c6991c0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -308,11 +308,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713521961,
|
"lastModified": 1712909959,
|
||||||
"narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=",
|
"narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2",
|
"rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -324,11 +324,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713709641,
|
"lastModified": 1713084354,
|
||||||
"narHash": "sha256-Q4bPpC8UNjiR7Gg4GEeIi5XrG8yQai9cxOjkXlRQmVc=",
|
"narHash": "sha256-QKtRsAcq/7CplQGXwTgJUgaI6E+E7fmZ7+r+n+E9p4E=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6e8bfab8324ef1aab71d47339ea5662e0249c4c0",
|
"rev": "32d9e07959a285ff73ffcd55a7be694649d585c0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -340,11 +340,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-nixos-unstable": {
|
"nixpkgs-nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713537308,
|
"lastModified": 1712791164,
|
||||||
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
|
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
|
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -356,11 +356,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-rust-analyzer": {
|
"nixpkgs-rust-analyzer": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713709641,
|
"lastModified": 1713084354,
|
||||||
"narHash": "sha256-Q4bPpC8UNjiR7Gg4GEeIi5XrG8yQai9cxOjkXlRQmVc=",
|
"narHash": "sha256-QKtRsAcq/7CplQGXwTgJUgaI6E+E7fmZ7+r+n+E9p4E=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6e8bfab8324ef1aab71d47339ea5662e0249c4c0",
|
"rev": "32d9e07959a285ff73ffcd55a7be694649d585c0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -372,11 +372,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713564160,
|
"lastModified": 1712867921,
|
||||||
"narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=",
|
"narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c",
|
"rev": "51651a540816273b67bc4dedea2d37d116c5f7fe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -388,11 +388,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713707886,
|
"lastModified": 1713081784,
|
||||||
"narHash": "sha256-eixmKYCzDqq0II8yOiuoQNmTE/lNCiIt71lh7V4PSvk=",
|
"narHash": "sha256-t0RoW0DTQQ8MaQ6DXbkOZtPapv9rNZa5UYwOan5Th/k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "e558232e47b407866c8e2974739fac7ccc17e452",
|
"rev": "34dd0b90d8075657d7816e31f3955fcc958e22f7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -501,11 +501,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713668495,
|
"lastModified": 1713066950,
|
||||||
"narHash": "sha256-4BvlfPfyUmB1U0r/oOF6jGEW/pG59c5yv6PJwgucTNM=",
|
"narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "09f1bc8ba3277c0f052f7887ec92721501541938",
|
"rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,4 @@
|
||||||
{
|
{ config, pkgs, inputs, lib, system, ... }: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
lib,
|
|
||||||
system,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
networking.hostName = "foryog";
|
networking.hostName = "foryog";
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -15,20 +8,20 @@
|
||||||
../../git
|
../../git
|
||||||
../../gnome
|
../../gnome
|
||||||
../../gui
|
../../gui
|
||||||
../../helix
|
|
||||||
../../mercurial
|
../../mercurial
|
||||||
../../vim
|
../../vim
|
||||||
../../zsh
|
../../zsh
|
||||||
];
|
];
|
||||||
|
|
||||||
fileSystems."/" = {options = ["compress=zstd"];};
|
fileSystems."/" = { options = [ "compress=zstd" ]; };
|
||||||
|
|
||||||
services.restic.backups.home-to-b2 = {
|
services.restic.backups.home-to-b2 = {
|
||||||
repository = lib.mkForce "b2:cyplo-restic-foureighty:/";
|
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.tmp.cleanOnBoot = true;
|
||||||
boot.binfmt.emulatedSystems = ["aarch64-linux"];
|
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||||
boot.plymouth = {
|
boot.plymouth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
logo = ./boot.png;
|
logo = ./boot.png;
|
||||||
|
|
@ -44,19 +37,17 @@
|
||||||
|
|
||||||
hardware.trackpoint.enable = true;
|
hardware.trackpoint.enable = true;
|
||||||
hardware.keyboard.qmk.enable = true;
|
hardware.keyboard.qmk.enable = true;
|
||||||
services.udev.packages = [pkgs.qmk-udev-rules];
|
services.udev.packages = [ pkgs.qmk-udev-rules ];
|
||||||
programs.ccache.enable = true;
|
programs.ccache.enable = true;
|
||||||
hardware.opengl.extraPackages = with pkgs; [libva];
|
hardware.opengl.extraPackages = with pkgs; [ libva ];
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
home-manager.users.cyryl = {...}: {
|
home-manager.users.cyryl = { ... }: {
|
||||||
imports = [
|
imports = [ ../../home-manager/programs/kitty.nix ];
|
||||||
../../home-manager/programs/kitty.nix
|
|
||||||
];
|
|
||||||
home.packages =
|
home.packages =
|
||||||
(with inputs.nixpkgs-master.legacyPackages."${system}"; [bisq-desktop])
|
(with inputs.nixpkgs-master.legacyPackages."${system}"; [ bisq-desktop ])
|
||||||
++ (with pkgs; [lutris])
|
++ (with pkgs; [ lutris ])
|
||||||
++ (with inputs.endless-sky.legacyPackages."${system}"; [endless-sky]);
|
++ (with inputs.endless-sky.legacyPackages."${system}"; [ endless-sky ]);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,8 @@
|
||||||
{
|
{ config, pkgs, discord, inputs, nixpkgs-nixos-unstable
|
||||||
config,
|
, nixpkgs-nixos-stable-and-unfree, nixpkgs-nixos-unstable-and-unfree, ... }: {
|
||||||
pkgs,
|
|
||||||
discord,
|
|
||||||
inputs,
|
|
||||||
nixpkgs-nixos-unstable,
|
|
||||||
nixpkgs-nixos-stable-and-unfree,
|
|
||||||
nixpkgs-nixos-unstable-and-unfree,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
security.chromiumSuidSandbox.enable = true;
|
security.chromiumSuidSandbox.enable = true;
|
||||||
|
|
||||||
home-manager.users.cyryl = {...}: {
|
home-manager.users.cyryl = { ... }: {
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
iconTheme = {
|
iconTheme = {
|
||||||
|
|
@ -18,72 +10,71 @@
|
||||||
package = pkgs.gnome3.adwaita-icon-theme;
|
package = pkgs.gnome3.adwaita-icon-theme;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
qt = {enable = true;};
|
qt = { enable = true; };
|
||||||
|
|
||||||
imports = [];
|
imports = [ ];
|
||||||
|
|
||||||
programs.chromium.enable = true;
|
programs.chromium.enable = true;
|
||||||
programs.firefox.enable = true;
|
programs.firefox.enable = true;
|
||||||
programs.sioyek.enable = true;
|
programs.sioyek.enable = true;
|
||||||
home.packages =
|
home.packages = (with pkgs;
|
||||||
(with pkgs;
|
with pkgs.gnome3;
|
||||||
with pkgs.gnome3;
|
with pkgs.python39Packages; [
|
||||||
with pkgs.python39Packages; [
|
anarchism
|
||||||
anarchism
|
calibre
|
||||||
cheese
|
cheese
|
||||||
digikam
|
digikam
|
||||||
electrum
|
electrum
|
||||||
element-desktop
|
element-desktop
|
||||||
eog
|
eog
|
||||||
evince
|
evince
|
||||||
fontconfig
|
fontconfig
|
||||||
ghidra-bin
|
ghidra-bin
|
||||||
gimp
|
gimp
|
||||||
glxinfo
|
glxinfo
|
||||||
gnome-screenshot
|
gnome-screenshot
|
||||||
gparted
|
gparted
|
||||||
inkscape
|
inkscape
|
||||||
kdenlive
|
kdenlive
|
||||||
koreader
|
koreader
|
||||||
krusader
|
krusader
|
||||||
libreoffice
|
libreoffice
|
||||||
logseq
|
logseq
|
||||||
mediainfo
|
mediainfo
|
||||||
mindforger
|
mindforger
|
||||||
modem-manager-gui
|
modem-manager-gui
|
||||||
nautilus
|
nautilus
|
||||||
nyxt
|
nyxt
|
||||||
obs-studio
|
obs-studio
|
||||||
openscad
|
openscad
|
||||||
organicmaps
|
organicmaps
|
||||||
passff-host
|
passff-host
|
||||||
pdfarranger
|
pdfarranger
|
||||||
pkgs.gsettings-desktop-schemas
|
pkgs.gsettings-desktop-schemas
|
||||||
pkgs.shotwell
|
pkgs.shotwell
|
||||||
qcad
|
qcad
|
||||||
qemu
|
qemu
|
||||||
remmina
|
remmina
|
||||||
signal-desktop
|
signal-desktop
|
||||||
simple-scan
|
simple-scan
|
||||||
spotify
|
spotify
|
||||||
ssb-patchwork
|
ssb-patchwork
|
||||||
tigervnc
|
tigervnc
|
||||||
tlaplusToolbox
|
tlaplusToolbox
|
||||||
tlaps
|
tlaps
|
||||||
uefitool
|
uefitool
|
||||||
vlc
|
vlc
|
||||||
winePackages.full
|
winePackages.full
|
||||||
wireshark
|
wireshark
|
||||||
wsjtx
|
wsjtx
|
||||||
xclip
|
xclip
|
||||||
xidlehook
|
xidlehook
|
||||||
yubico-piv-tool
|
yubico-piv-tool
|
||||||
yubikey-manager-qt
|
yubikey-manager-qt
|
||||||
yubikey-personalization
|
yubikey-personalization
|
||||||
yubikey-personalization-gui
|
yubikey-personalization-gui
|
||||||
])
|
]) ++ (with nixpkgs-nixos-unstable; [ thunderbird ])
|
||||||
++ (with nixpkgs-nixos-unstable; [thunderbird])
|
++ [ nixpkgs-nixos-stable-and-unfree.discord ]
|
||||||
++ [nixpkgs-nixos-stable-and-unfree.discord]
|
|
||||||
++ (with nixpkgs-nixos-unstable-and-unfree; [
|
++ (with nixpkgs-nixos-unstable-and-unfree; [
|
||||||
hopper
|
hopper
|
||||||
jetbrains.rust-rover
|
jetbrains.rust-rover
|
||||||
|
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
nix.settings = {
|
|
||||||
trusted-substituters = [
|
|
||||||
"https://helix.cachix.org"
|
|
||||||
];
|
|
||||||
trusted-public-keys = [
|
|
||||||
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
|
|
||||||
];
|
|
||||||
};
|
|
||||||
home-manager.users.cyryl = {...}: {imports = [./home.nix];};
|
|
||||||
}
|
|
||||||
|
|
@ -1,60 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
inputs,
|
|
||||||
system,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
alejandra = lib.getExe inputs.alejandra.packages.${system}.default;
|
|
||||||
nil = lib.getExe inputs.nil.packages.${system}.default;
|
|
||||||
helixPackage = inputs.helix.packages.${system}.default;
|
|
||||||
helix = lib.getExe helixPackage;
|
|
||||||
in {
|
|
||||||
home.sessionVariables = {
|
|
||||||
EDITOR = lib.mkForce helix;
|
|
||||||
VISUAL = lib.mkForce helix;
|
|
||||||
};
|
|
||||||
programs.zsh.sessionVariables = {
|
|
||||||
EDITOR = lib.mkForce helix;
|
|
||||||
VISUAL = lib.mkForce helix;
|
|
||||||
};
|
|
||||||
systemd.user.sessionVariables = {
|
|
||||||
EDITOR = lib.mkForce helix;
|
|
||||||
VISUAL = lib.mkForce helix;
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.helix = {
|
|
||||||
enable = true;
|
|
||||||
package = helixPackage;
|
|
||||||
languages = {
|
|
||||||
language = [
|
|
||||||
{
|
|
||||||
name = "nix";
|
|
||||||
auto-format = true;
|
|
||||||
language-servers = ["nil"];
|
|
||||||
formatter = {
|
|
||||||
command = alejandra;
|
|
||||||
args = ["-q"];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
language-server.nil = {
|
|
||||||
command = nil;
|
|
||||||
config.nil.nix = {
|
|
||||||
maxMemoryMB = 8192;
|
|
||||||
flake.autoEvalInputs = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
settings = {
|
|
||||||
theme = "solarized_dark";
|
|
||||||
editor = {
|
|
||||||
auto-save = true;
|
|
||||||
auto-pairs = false;
|
|
||||||
file-picker.hidden = false;
|
|
||||||
lsp.display-messages = true;
|
|
||||||
line-number = "relative";
|
|
||||||
soft-wrap.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue