Compare commits
No commits in common. "72a01e99e38b11898021dfba792c0f8ec8a8e9a4" and "b007e5b232aa9df2c6852761c4e5cc5da25214d5" have entirely different histories.
72a01e99e3
...
b007e5b232
340
flake.lock
generated
340
flake.lock
generated
@ -33,89 +33,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"base16": {
|
|
||||||
"inputs": {
|
|
||||||
"fromYaml": "fromYaml"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1732200724,
|
|
||||||
"narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
|
|
||||||
"owner": "SenchoPens",
|
|
||||||
"repo": "base16.nix",
|
|
||||||
"rev": "153d52373b0fb2d343592871009a286ec8837aec",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "SenchoPens",
|
|
||||||
"repo": "base16.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"base16-fish": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1622559957,
|
|
||||||
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
|
|
||||||
"owner": "tomyun",
|
|
||||||
"repo": "base16-fish",
|
|
||||||
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tomyun",
|
|
||||||
"repo": "base16-fish",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"base16-helix": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1736852337,
|
|
||||||
"narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "base16-helix",
|
|
||||||
"rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "base16-helix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"base16-vim": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1732806396,
|
|
||||||
"narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "base16-vim",
|
|
||||||
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "base16-vim",
|
|
||||||
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"firefox-gnome-theme": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1741628778,
|
|
||||||
"narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=",
|
|
||||||
"owner": "rafaelmardojai",
|
|
||||||
"repo": "firefox-gnome-theme",
|
|
||||||
"rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "rafaelmardojai",
|
|
||||||
"repo": "firefox-gnome-theme",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -132,85 +49,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1733328505,
|
|
||||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": [
|
|
||||||
"stylix",
|
|
||||||
"systems"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731533236,
|
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"fromYaml": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731966426,
|
|
||||||
"narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
|
|
||||||
"owner": "SenchoPens",
|
|
||||||
"repo": "fromYaml",
|
|
||||||
"rev": "106af9e2f715e2d828df706c386a685698f3223b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "SenchoPens",
|
|
||||||
"repo": "fromYaml",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"git-hooks": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": [
|
|
||||||
"stylix",
|
|
||||||
"flake-compat"
|
|
||||||
],
|
|
||||||
"gitignore": "gitignore_2",
|
|
||||||
"nixpkgs": [
|
|
||||||
"stylix",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1741379162,
|
|
||||||
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "git-hooks.nix",
|
|
||||||
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "git-hooks.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"gitignore": {
|
"gitignore": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@ -233,45 +71,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gitignore_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"stylix",
|
|
||||||
"git-hooks",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1709087332,
|
|
||||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "gitignore.nix",
|
|
||||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "gitignore.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"gnome-shell": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1732369855,
|
|
||||||
"narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
|
|
||||||
"owner": "GNOME",
|
|
||||||
"repo": "gnome-shell",
|
|
||||||
"rev": "dadd58f630eeea41d645ee225a63f719390829dc",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "GNOME",
|
|
||||||
"ref": "47.2",
|
|
||||||
"repo": "gnome-shell",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@ -293,28 +92,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"stylix",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1739757849,
|
|
||||||
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"ref": "release-24.11",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hyprcursor": {
|
"hyprcursor": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprlang": [
|
"hyprlang": [
|
||||||
@ -599,22 +376,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1741600792,
|
|
||||||
"narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "ebe2788eafd539477f83775ef93c3c7e244421d3",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-24.11",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"pre-commit-hooks": {
|
"pre-commit-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
@ -644,41 +405,7 @@
|
|||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"nix-flatpak": "nix-flatpak",
|
"nix-flatpak": "nix-flatpak",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||||
"stylix": "stylix"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"stylix": {
|
|
||||||
"inputs": {
|
|
||||||
"base16": "base16",
|
|
||||||
"base16-fish": "base16-fish",
|
|
||||||
"base16-helix": "base16-helix",
|
|
||||||
"base16-vim": "base16-vim",
|
|
||||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
|
||||||
"flake-compat": "flake-compat_2",
|
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"git-hooks": "git-hooks",
|
|
||||||
"gnome-shell": "gnome-shell",
|
|
||||||
"home-manager": "home-manager_2",
|
|
||||||
"nixpkgs": "nixpkgs_3",
|
|
||||||
"systems": "systems_2",
|
|
||||||
"tinted-foot": "tinted-foot",
|
|
||||||
"tinted-kitty": "tinted-kitty",
|
|
||||||
"tinted-tmux": "tinted-tmux"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1741703235,
|
|
||||||
"narHash": "sha256-3efck7239JPh6IHnqhETaoQejfxh4RBU16bE8IHOkto=",
|
|
||||||
"owner": "danth",
|
|
||||||
"repo": "stylix",
|
|
||||||
"rev": "4a3ac9e30cd15b25a8b2e6cf0a7a047f454408bd",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "danth",
|
|
||||||
"ref": "release-24.11",
|
|
||||||
"repo": "stylix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
@ -696,71 +423,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tinted-foot": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1726913040,
|
|
||||||
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-foot",
|
|
||||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-foot",
|
|
||||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tinted-kitty": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1716423189,
|
|
||||||
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-kitty",
|
|
||||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-kitty",
|
|
||||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tinted-tmux": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1740877430,
|
|
||||||
"narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-tmux",
|
|
||||||
"rev": "d48ee86394cbe45b112ba23ab63e33656090edb4",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "tinted-tmux",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"xdph": {
|
"xdph": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprland-protocols": [
|
"hyprland-protocols": [
|
||||||
|
@ -11,14 +11,12 @@
|
|||||||
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
|
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
|
||||||
# hyprland, plugins and related utils
|
# hyprland, plugins and related utils
|
||||||
hyprland.url = "github:hyprwm/Hyprland";
|
hyprland.url = "github:hyprwm/Hyprland";
|
||||||
stylix.url = "github:danth/stylix/release-24.11";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
home-manager,
|
home-manager,
|
||||||
stylix,
|
|
||||||
...
|
...
|
||||||
} @ inputs:
|
} @ inputs:
|
||||||
let
|
let
|
||||||
@ -33,7 +31,6 @@
|
|||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/spectre-x360-2018
|
./hosts/spectre-x360-2018
|
||||||
stylix.nixosModules.stylix
|
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
../../modules/nixos/pipewire.nix
|
../../modules/nixos/pipewire.nix
|
||||||
../../modules/nixos/podman.nix
|
../../modules/nixos/podman.nix
|
||||||
../../modules/nixos/power.nix
|
../../modules/nixos/power.nix
|
||||||
../../modules/nixos/stylix.nix
|
|
||||||
../../utils/binary-cache.nix
|
../../utils/binary-cache.nix
|
||||||
../../utils/garbage-collection.nix
|
../../utils/garbage-collection.nix
|
||||||
];
|
];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{pkgs, ...}:
|
{pkgs, ...}:
|
||||||
{
|
{
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -32,11 +32,9 @@
|
|||||||
|
|
||||||
userSettings = {
|
userSettings = {
|
||||||
# visual
|
# visual
|
||||||
"window.menuBarVisibility" = "toggle";
|
"editor.fontFamily" = "'FiraCode Nerd Font Mono', 'monospace', monospace";
|
||||||
|
"terminal.integrated.fontFamily" = "FiraCode Nerd Font Mono";
|
||||||
# "editor.fontFamily" = "'FiraCode Nerd Font Mono', 'monospace', monospace";
|
"workbench.iconTheme" = "vs-seti";
|
||||||
# "terminal.integrated.fontFamily" = "FiraCode Nerd Font Mono";
|
|
||||||
# "workbench.iconTheme" = "vs-seti";
|
|
||||||
|
|
||||||
# telemetry
|
# telemetry
|
||||||
"telemetry.enableCrashReporter" = false;
|
"telemetry.enableCrashReporter" = false;
|
||||||
@ -47,45 +45,52 @@
|
|||||||
# editor QOL
|
# editor QOL
|
||||||
"security.workspace.trust.untrustedFiles" = "open";
|
"security.workspace.trust.untrustedFiles" = "open";
|
||||||
"editor.wordWrap" = "on";
|
"editor.wordWrap" = "on";
|
||||||
"editor.suggestSelection" = "first";
|
|
||||||
"editor.renderWhitespace" = "none";
|
|
||||||
"editor.acceptSuggestionOnEnter" = "off";
|
|
||||||
"editor.fontLigatures" = true;
|
|
||||||
"editor.inlineSuggest.enabled" = true;
|
|
||||||
"editor.bracketPairColorization.enabled" = true;
|
|
||||||
"editor.unicodeHighlight.nonBasicASCII" = false;
|
|
||||||
"editor.unicodeHighlight.invisibleCharacters" = false;
|
|
||||||
"editor.unicodeHighlight.ambiguousCharacters" = false;
|
|
||||||
|
|
||||||
"files.autoSave" = "onWindowChange";
|
"files.autoSave" = "onWindowChange";
|
||||||
"files.autoSaveDelay" = 1000;
|
"files.autoSaveDelay" = 1000;
|
||||||
"files.insertFinalNewline" = true;
|
"files.insertFinalNewline" = true;
|
||||||
"files.trimTrailingWhitespace" = true;
|
"files.trimTrailingWhitespace" = true;
|
||||||
|
|
||||||
"explorer.confirmDelete" = false;
|
|
||||||
"explorer.confirmDragAndDrop" = false;
|
|
||||||
"terminal.integrated.enableMultiLinePasteWarning" = false;
|
|
||||||
"update.showReleaseNotes" = false;
|
|
||||||
"terminal.external.linuxExec" = "kitty";
|
|
||||||
"workbench.startupEditor" = "newUntitledFile";
|
|
||||||
# "workbench.colorTheme" = "Default Light+";
|
|
||||||
"github.copilot.editor.enableAutoCompletions" = true;
|
|
||||||
"github.copilot.advanced" = {};
|
|
||||||
"github.copilot.enable" = {
|
|
||||||
"*" = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# git
|
|
||||||
"git.ignoreMissingGitWarning" = true;
|
"git.ignoreMissingGitWarning" = true;
|
||||||
|
"editor.suggestSelection" = "first";
|
||||||
|
"workbench.startupEditor" = "newUntitledFile";
|
||||||
|
"editor.renderWhitespace" = "none";
|
||||||
|
"editor.acceptSuggestionOnEnter" = "off";
|
||||||
|
"explorer.confirmDelete" = false;
|
||||||
"git.confirmSync" = false;
|
"git.confirmSync" = false;
|
||||||
"git.enableSmartCommit" = true;
|
"git.enableSmartCommit" = true;
|
||||||
"git.autofetch" = true;
|
"editor.fontLigatures" = true;
|
||||||
|
"explorer.confirmDragAndDrop" = false;
|
||||||
|
"editor.inlineSuggest.enabled" = true;
|
||||||
"diffEditor.renderSideBySide" = false;
|
"diffEditor.renderSideBySide" = false;
|
||||||
"diffEditor.hideUnchangedRegions.enabled" = true;
|
"github.copilot.enable" = {
|
||||||
|
"*" = true;
|
||||||
|
"plaintext" = true;
|
||||||
|
"markdown" = true;
|
||||||
|
"scminput" = false;
|
||||||
|
"yaml" = true;
|
||||||
|
};
|
||||||
|
"editor.bracketPairColorization.enabled" = true;
|
||||||
|
"git.autofetch" = true;
|
||||||
|
"terminal.integrated.enableMultiLinePasteWarning" = false;
|
||||||
|
"editor.unicodeHighlight.nonBasicASCII" = false;
|
||||||
|
"jupyter.disableJupyterAutoStart" = true;
|
||||||
|
"editor.unicodeHighlight.invisibleCharacters" = false;
|
||||||
|
"editor.unicodeHighlight.ambiguousCharacters" = false;
|
||||||
"diffEditor.ignoreTrimWhitespace" = false;
|
"diffEditor.ignoreTrimWhitespace" = false;
|
||||||
|
"update.showReleaseNotes" = false;
|
||||||
|
"terminal.external.linuxExec" = "kitty";
|
||||||
|
"window.dialogStyle" = "custom";
|
||||||
|
"window.titleBarStyle" = "custom";
|
||||||
|
"github.copilot.editor.enableAutoCompletions" = true;
|
||||||
|
"window.menuBarVisibility" = "compact";
|
||||||
|
"workbench.colorTheme" = "Default Light+";
|
||||||
|
"github.copilot.advanced" = {};
|
||||||
|
"git.openRepositoryInParentFolders" = "never";
|
||||||
|
"terminal.integrated.commandsToSkipShell" = [
|
||||||
|
"language-julia.interrupt"
|
||||||
|
];
|
||||||
|
"diffEditor.hideUnchangedRegions.enabled" = true;
|
||||||
|
|
||||||
# Python
|
# Python
|
||||||
"jupyter.disableJupyterAutoStart" = true;
|
|
||||||
"jupyter.askForKernelRestart" = false;
|
"jupyter.askForKernelRestart" = false;
|
||||||
"workbench.editorAssociations" = {
|
"workbench.editorAssociations" = {
|
||||||
"*.ipynb" = "jupyter-notebook";
|
"*.ipynb" = "jupyter-notebook";
|
||||||
@ -105,7 +110,6 @@
|
|||||||
"editor.wordSeparators" = "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?";
|
"editor.wordSeparators" = "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?";
|
||||||
};
|
};
|
||||||
"[typst-code]" = {
|
"[typst-code]" = {
|
||||||
"git.openRepositoryInParentFolders" = "never";
|
|
||||||
"editor.wordSeparators" = "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?";
|
"editor.wordSeparators" = "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?";
|
||||||
};
|
};
|
||||||
"tinymist.fontPaths" = [
|
"tinymist.fontPaths" = [
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
{pkgs, ...}:
|
{pkgs, ...}:
|
||||||
{
|
{
|
||||||
programs.direnv = {
|
programs.direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# enableFishIntegration = true; # see note on other shells below
|
enableFishIntegration = true; # see note on other shells below
|
||||||
nix-direnv.enable = true;
|
nix-direnv.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{inputs, pkgs, ...}:
|
{inputs, pkgs, ...}:
|
||||||
{
|
{
|
||||||
services.hypridle = {
|
services.hypridle = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -21,15 +21,16 @@
|
|||||||
{
|
{
|
||||||
# lock screen after 5 minutes
|
# lock screen after 5 minutes
|
||||||
timeout = 300;
|
timeout = 300;
|
||||||
on-timeout = "loginctl lock-session && hyprctl dispatch dpms off";
|
on-timeout = "loginctl lock-session";
|
||||||
on-resume = "hyprctl dispatch dpms on";
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
# suspend after 10 minutes
|
# turnoff screen after 10 minutes
|
||||||
timeout = 600;
|
timeout = 600;
|
||||||
on-timeout = "systemctl suspend";
|
on-timeout = "hyprctl dispatch dpms off";
|
||||||
on-resume = "hyprctl dispatch dpms on";
|
on-resume = "hyprctl dispatch dpms on";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# TODO - suspend after some time
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
"$mod, e, exec, nautilus"
|
"$mod, e, exec, nautilus"
|
||||||
|
|
||||||
# Lock screen
|
# Lock screen
|
||||||
"$mod, l, exec, hyprlock"
|
"$mod+Shift, l, exec, hyprlock"
|
||||||
|
|
||||||
# Clipboard management
|
# Clipboard management
|
||||||
"$mod, V, exec, cliphist list | wofi --dmenu | cliphist decode | wl-copy"
|
"$mod, V, exec, cliphist list | wofi --dmenu | cliphist decode | wl-copy"
|
||||||
@ -98,7 +98,7 @@
|
|||||||
# hyprpaper is handled as its own service
|
# hyprpaper is handled as its own service
|
||||||
"${pkgs.waybar}/bin/waybar"
|
"${pkgs.waybar}/bin/waybar"
|
||||||
# listen to clipboard events and send them to cliphist
|
# listen to clipboard events and send them to cliphist
|
||||||
"wl-paste --watch cliphist store"
|
"wl-paste --watch cliphist stores"
|
||||||
"${pkgs.waybar}/bin/hypridle"
|
"${pkgs.waybar}/bin/hypridle"
|
||||||
"hyprpaper"
|
"hyprpaper"
|
||||||
# # Fixes cursor themes in gnome apps under hyprland
|
# # Fixes cursor themes in gnome apps under hyprland
|
||||||
@ -168,9 +168,8 @@
|
|||||||
|
|
||||||
monitor = [
|
monitor = [
|
||||||
"eDP-1, 3840x2160, 0x0, 1.5" # the internal laptop monitor
|
"eDP-1, 3840x2160, 0x0, 1.5" # the internal laptop monitor
|
||||||
# Samsung monitor at irchel (matching the description)
|
"DP-2, 3840x2160, 0x-1440, 1.5"
|
||||||
# "desc:Samsung Electric Company LS27D80xU HK7X800803, 3840x2160, auto-up, 1.5"
|
", preferred, auto, 1" # automatically add any newly detected monitor
|
||||||
", preferred, auto-up, auto" # automatically add any newly detected monitor
|
|
||||||
];
|
];
|
||||||
|
|
||||||
xwayland = {
|
xwayland = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{inputs, pkgs, ...}:
|
{inputs, pkgs, ...}:
|
||||||
{
|
{
|
||||||
programs.hyprlock = {
|
programs.hyprlock = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -8,28 +8,39 @@
|
|||||||
no_fade_in = false;
|
no_fade_in = false;
|
||||||
disable_loading_bar = false;
|
disable_loading_bar = false;
|
||||||
};
|
};
|
||||||
|
auth = {
|
||||||
|
"pam:enabled" = true;
|
||||||
|
};
|
||||||
background = {
|
background = {
|
||||||
blur_passes = 3;
|
blur_passes = 3;
|
||||||
blur_size = 10;
|
blur_size = 10;
|
||||||
# image is set by stylix
|
|
||||||
};
|
};
|
||||||
|
|
||||||
input-field = {
|
input-field = {
|
||||||
monitor = "";
|
monitor = "";
|
||||||
size = "300, 60";
|
size = "300, 60";
|
||||||
# radius = 15;
|
outline_thickness = 3;
|
||||||
|
inner_color = "rgba(0, 0, 0, 0.0)";
|
||||||
|
|
||||||
|
outer_color = "rgba(33ccffee) rgba(00ff99ee) 45deg";
|
||||||
|
check_color = "rgba(00ff99ee) rgba(ff6633ee) 120deg";
|
||||||
|
fail_color = "rgba(ff6633ee) rgba(ff0066ee) 40deg";
|
||||||
|
|
||||||
|
font_color = "rgb(143, 143, 143)";
|
||||||
|
fade_on_empty = false;
|
||||||
|
rounding = 15;
|
||||||
|
|
||||||
position = "0, -250";
|
position = "0, -250";
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "center";
|
valign = "center";
|
||||||
};
|
};
|
||||||
|
|
||||||
label = [
|
label = [
|
||||||
{
|
{
|
||||||
# Day-Month-Date
|
# Day-Month-Date
|
||||||
monitor = "";
|
monitor = "";
|
||||||
text = ''cmd[update:1000] echo -e "$(date +"%A, %B %d")"'';
|
text = ''cmd[update:1000] echo -e "$(date +"%A, %B %d")"'';
|
||||||
|
# color = foreground;
|
||||||
font_size = 28;
|
font_size = 28;
|
||||||
|
# font_family = font + " Bold";
|
||||||
position = "0, 490";
|
position = "0, 490";
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "center";
|
valign = "center";
|
||||||
@ -38,13 +49,28 @@
|
|||||||
{
|
{
|
||||||
monitor = "";
|
monitor = "";
|
||||||
text = ''cmd[update:1000] echo "<span>$(date +"%I:%M")</span>"'';
|
text = ''cmd[update:1000] echo "<span>$(date +"%I:%M")</span>"'';
|
||||||
|
# color = foreground;
|
||||||
font_size = 160;
|
font_size = 160;
|
||||||
font_weight = "bold";
|
|
||||||
# font_family = "steelfish outline regular";
|
# font_family = "steelfish outline regular";
|
||||||
position = "0, 370";
|
position = "0, 370";
|
||||||
halign = "center";
|
halign = "center";
|
||||||
valign = "center";
|
valign = "center";
|
||||||
}
|
}
|
||||||
|
# USER
|
||||||
|
{
|
||||||
|
monitor = "";
|
||||||
|
text = " $USER";
|
||||||
|
# color = foreground;
|
||||||
|
outline_thickness = 2;
|
||||||
|
dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
|
||||||
|
dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0
|
||||||
|
dots_center = true;
|
||||||
|
font_size = 18;
|
||||||
|
# font_family = font + " Bold";
|
||||||
|
position = "0, -180";
|
||||||
|
halign = "center";
|
||||||
|
valign = "center";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -4,60 +4,60 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
# # load the wallpapers from the wallpapers directory - this gives a set with the folder content
|
# load the wallpapers from the wallpapers directory - this gives a set with the folder content
|
||||||
# dirContent = builtins.readDir ../../../wallpapers;
|
dirContent = builtins.readDir ../../../wallpapers;
|
||||||
|
wallpaperString = lib.strings.concatMapStrings (x: " " + x) wallpapers;
|
||||||
|
# # load each wallpaper and keep its path (now in the nix store) as an array
|
||||||
|
# wallpapers = map (x: builtins.readDir "${../../../wallpapers}/${x.value}") dirContent;
|
||||||
# wallpaperString = lib.strings.concatMapStrings (x: " " + x) wallpapers;
|
# wallpaperString = lib.strings.concatMapStrings (x: " " + x) wallpapers;
|
||||||
# # # load each wallpaper and keep its path (now in the nix store) as an array
|
|
||||||
# # wallpapers = map (x: builtins.readDir "${../../../wallpapers}/${x.value}") dirContent;
|
|
||||||
# # wallpaperString = lib.strings.concatMapStrings (x: " " + x) wallpapers;
|
|
||||||
|
|
||||||
# # script that picks a random wallpaper from the array and sets it as the desktop background
|
# script that picks a random wallpaper from the array and sets it as the desktop background
|
||||||
# monitor = ""; # leave empty to set the wallpaper on all monitors
|
monitor = ""; # leave empty to set the wallpaper on all monitors
|
||||||
|
|
||||||
# wallpaperRandomizer = pkgs.writeShellScriptBin "wallpaperRandomizer" ''
|
wallpaperRandomizer = pkgs.writeShellScriptBin "wallpaperRandomizer" ''
|
||||||
# wallpaper=$(shuf -n 1 -e ${wallpaperString})
|
wallpaper=$(shuf -n 1 -e ${wallpaperString})
|
||||||
# hyprctl hyprpaper unload all
|
hyprctl hyprpaper unload all
|
||||||
# hyprctl hyprpaper preload $wallpaper
|
hyprctl hyprpaper preload $wallpaper
|
||||||
# hyprctl hyprpaper wallpaper "${monitor},$wallpaper"
|
hyprctl hyprpaper wallpaper "${monitor},$wallpaper"
|
||||||
# '';
|
'';
|
||||||
|
|
||||||
in {
|
in {
|
||||||
# home.packages = [wallpaperRandomizer];
|
home.packages = [wallpaperRandomizer];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
services.hyprpaper = {
|
services.hyprpaper = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
ipc = "off";
|
||||||
|
splash = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
# settings = {
|
|
||||||
# ipc = "off";
|
|
||||||
# splash = false;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
# systemd.user = {
|
systemd.user = {
|
||||||
# services.wallpaperRandomizer = {
|
services.wallpaperRandomizer = {
|
||||||
# Install = {WantedBy = ["graphical-session.target"];};
|
Install = {WantedBy = ["graphical-session.target"];};
|
||||||
|
|
||||||
# Unit = {
|
Unit = {
|
||||||
# Description = "Set random desktop background using hyprpaper";
|
Description = "Set random desktop background using hyprpaper";
|
||||||
# After = ["graphical-session-pre.target"];
|
After = ["graphical-session-pre.target"];
|
||||||
# PartOf = ["graphical-session.target"];
|
PartOf = ["graphical-session.target"];
|
||||||
# };
|
};
|
||||||
|
|
||||||
# Service = {
|
Service = {
|
||||||
# Type = "oneshot";
|
Type = "oneshot";
|
||||||
# ExecStart = "${wallpaperRandomizer}/bin/wallpaperRandomizer";
|
ExecStart = "${wallpaperRandomizer}/bin/wallpaperRandomizer";
|
||||||
# IOSchedulingClass = "idle";
|
IOSchedulingClass = "idle";
|
||||||
# };
|
};
|
||||||
# };
|
};
|
||||||
|
|
||||||
# timers.wallpaperRandomizer = {
|
timers.wallpaperRandomizer = {
|
||||||
# Unit = {Description = "Set random desktop background using hyprpaper on an interval";};
|
Unit = {Description = "Set random desktop background using hyprpaper on an interval";};
|
||||||
|
|
||||||
# Timer = {OnUnitActiveSec = "6h";};
|
Timer = {OnUnitActiveSec = "6h";};
|
||||||
|
|
||||||
# Install = {WantedBy = ["timers.target"];};
|
Install = {WantedBy = ["timers.target"];};
|
||||||
# };
|
};
|
||||||
# };
|
};
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,12 @@
|
|||||||
# waybar requires font-awesome
|
# waybar requires font-awesome
|
||||||
home.packages = [
|
home.packages = [
|
||||||
pkgs.pavucontrol
|
pkgs.pavucontrol
|
||||||
|
# fira code now contains ligatures and font-awesome
|
||||||
|
# TODO - this only works after nixpkgs 25.05
|
||||||
|
# nerd-fonts.fira-code
|
||||||
|
(pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; })
|
||||||
|
pkgs.fira-code
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# enable waybar
|
# enable waybar
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
shellIntegration.enableFishIntegration = true;
|
shellIntegration.enableFishIntegration = true;
|
||||||
settings = {
|
settings = {
|
||||||
# background_opacity = 0.8;
|
background_opacity = 0.8;
|
||||||
confirm_os_window_close = 0;
|
confirm_os_window_close = 0;
|
||||||
enable_audio_bell = false;
|
enable_audio_bell = false;
|
||||||
cursor_trail = 3;
|
cursor_trail = 3;
|
||||||
|
@ -1,73 +0,0 @@
|
|||||||
{pkgs, ...}:
|
|
||||||
{
|
|
||||||
stylix = {
|
|
||||||
# Stylix is already enabled since the system is configured to use it
|
|
||||||
# enable = true;
|
|
||||||
# don't theme applications by default
|
|
||||||
autoEnable = false;
|
|
||||||
|
|
||||||
cursor = {
|
|
||||||
package = pkgs.apple-cursor;
|
|
||||||
name = "macOS";
|
|
||||||
size = 32;
|
|
||||||
};
|
|
||||||
|
|
||||||
# TODO
|
|
||||||
# fonts = {};
|
|
||||||
|
|
||||||
iconTheme = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.tela-icon-theme;
|
|
||||||
};
|
|
||||||
|
|
||||||
image = ./../../wallpapers/magicpattern-87PP9Zd7MNo-unsplash.jpg;
|
|
||||||
|
|
||||||
|
|
||||||
fonts = {
|
|
||||||
|
|
||||||
serif = {
|
|
||||||
package = pkgs.dejavu_fonts;
|
|
||||||
name = "DejaVu Serif";
|
|
||||||
};
|
|
||||||
|
|
||||||
sansSerif = {
|
|
||||||
package = pkgs.dejavu_fonts;
|
|
||||||
name = "DejaVu Sans";
|
|
||||||
};
|
|
||||||
|
|
||||||
monospace = {
|
|
||||||
package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; };
|
|
||||||
name = "FiraCode Nerd Font Mono";
|
|
||||||
};
|
|
||||||
|
|
||||||
emoji = {
|
|
||||||
package = pkgs.noto-fonts-emoji;
|
|
||||||
name = "Noto Color Emoji";
|
|
||||||
};
|
|
||||||
|
|
||||||
sizes = {
|
|
||||||
applications = 15;
|
|
||||||
desktop = 12;
|
|
||||||
popups = 12;
|
|
||||||
terminal = 15;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
opacity = {
|
|
||||||
applications = 1.0;
|
|
||||||
desktop = 1.0;
|
|
||||||
popups = 0.9;
|
|
||||||
terminal = 0.8;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
stylix.targets = {
|
|
||||||
vscode.enable = true;
|
|
||||||
hyprpaper.enable = true;
|
|
||||||
hyprlock.enable = true;
|
|
||||||
waybar.enable = true;
|
|
||||||
wofi.enable = true;
|
|
||||||
kitty.enable = true;
|
|
||||||
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
stylix.enable = true;
|
|
||||||
stylix.image = ./../../wallpapers/magicpattern-87PP9Zd7MNo-unsplash.jpg;
|
|
||||||
|
|
||||||
}
|
|
@ -13,7 +13,6 @@ with lib.hm.gvariant;
|
|||||||
../modules/home-manager/kubectl.nix
|
../modules/home-manager/kubectl.nix
|
||||||
../modules/home-manager/obsidian.nix
|
../modules/home-manager/obsidian.nix
|
||||||
../modules/home-manager/owncloud-client.nix
|
../modules/home-manager/owncloud-client.nix
|
||||||
../modules/home-manager/stylix.nix
|
|
||||||
../modules/home-manager/thunderbird.nix
|
../modules/home-manager/thunderbird.nix
|
||||||
../modules/home-manager/wofi.nix
|
../modules/home-manager/wofi.nix
|
||||||
../modules/home-manager/xdg-portals.nix
|
../modules/home-manager/xdg-portals.nix
|
||||||
|
Loading…
x
Reference in New Issue
Block a user