nevafel/myNixosFlake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnome switch

Browse Source
This commit is contained in:
Max Chaev 2025-01-15 22:31:14 +03:00
parent 04dea0166f
commit fdb7a3d1e4
10 changed files with 99 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
flake.lock generated
View File

@ -352,11 +352,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736354372, "lastModified": 1736785676,
"narHash": "sha256-etLMa2BWCXWhG8WKyjsylvu+uskpJ4dQ+K8N0wEr5vc=", "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "54b330ac067e74314f8ca6b38af6fcfbd17f3e9e", "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +373,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736089250, "lastModified": 1736508663,
"narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -443,11 +443,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736085891, "lastModified": 1736370755,
"narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -458,11 +458,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736241350, "lastModified": 1736881310,
"narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", "narHash": "sha256-5BlVeikKoJVrUXBdr1kSrcRQ8o20Kl+ZU2pEzpE5sUw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f", "rev": "733994ea06585b76621073160e87b0bfac7fc5ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -474,11 +474,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1736798957,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -519,11 +519,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1736292108, "lastModified": 1736961674,
"narHash": "sha256-0mGe0okcNDKp0A9lS/birSP0Z5oheqgrXzQeolHM9U8=", "narHash": "sha256-nuOFHtSUHYsb6PHueFF9KPLS8v+Wi+wGCXZCI+J54QI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "0ebc64a2328fc0a0532f9544eb6c6e297135962e", "rev": "54e6dbd8c83586d9553f61c21fa639b500e51f93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -584,11 +584,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1736300059, "lastModified": 1736955291,
"narHash": "sha256-z3mR+0gBN/iVM8UgfCSIxjgw4jm1bu1kjMKyQx9mGBc=", "narHash": "sha256-h5y11C4vMi8VoIVeHr/xFJO5N1nWKiKoAILPPUl7P/8=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "168306ce7f5d823ccee8b7d4e112ea20671c2b8f", "rev": "2985ee9b2836a725b04628d24f934212b96eacbe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -701,11 +701,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736115332, "lastModified": 1736154270,
"narHash": "sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko=", "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "1788ca5acd4b542b923d4757d4cfe4183cc6a92d", "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View File

@ -2,19 +2,23 @@
description = "Ficache's system flake"; description = "Ficache's system flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
envycontrol.url = "github:bayasdev/envycontrol"; envycontrol.url = "github:bayasdev/envycontrol";
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs, home-manager, ... }@inputs: outputs = { self, nixpkgs, home-manager, ... }@inputs:

15
home-manager/modules/desktop-managers/gnomeModule.nix Normal file
View File

@ -0,0 +1,15 @@
{pkgs, ...}:
{
dconf = {
enable = true;
settings."org/gnome/shell" = {
disable-user-extensions = false;
enabled-extensions = with pkgs.gnomeExtensions; [
appindicator.extensionUuid
vitals.extensionUuid
dash-to-dock.extensionUuid
media-controls.extensionUuid
];
};
};
}

6
home-manager/modules/stylix.nix
View File

@ -1,9 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = [ pkgs.dconf ]; stylix = {
stylix = {
enable = true; enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/eighties.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/eighties.yaml";
@ -21,5 +19,5 @@
terminal = 0.9; terminal = 0.9;
}; };
}; };
} }

1
home-manager/your-modules.nix
View File

@ -6,5 +6,6 @@
./modules/syncthing.nix ./modules/syncthing.nix
./modules/helix.nix ./modules/helix.nix
./modules/vscodium.nix ./modules/vscodium.nix
./modules/desktop-managers/gnomeModule.nix
]; ];
} }

3
home-manager/your-packages.nix
View File

@ -6,12 +6,13 @@
joplin-desktop joplin-desktop
alacritty alacritty
vlc vlc
gnome-tweaks
# Social stuff # Social stuff
telegram-desktop telegram-desktop
vesktop vesktop
firefox librewolf
qbittorrent qbittorrent
libreoffice libreoffice

44
nixos/modules/desktop-enviroments/gnome.nix
View File

@ -1,16 +1,56 @@
{ ... }: { pkgs, lib, ... }:
{ {
services = { services = {
libinput.enable = true; libinput.enable = true;
displayManager.defaultSession = "gnome"; displayManager.defaultSession = "gnome";
power-profiles-daemon.enable = false;
}; };
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
desktopManager = { desktopManager = {
gnome.enable = true; gnome.enable = true;
}; };
}; };
# Extensions are managed in gnomeModule.nix
services.gnome.gnome-settings-daemon.enable = true;
environment.gnome.excludePackages = (with pkgs; [
atomix # puzzle game
cheese # webcam tool
epiphany # web browser
evince # document viewer
geary # email reader
gedit # text editor
gnome-characters
gnome-music
gnome-photos
gnome-terminal
gnome-tour
hitori # sudoku game
iagno # go game
tali # poker game
totem # video player
]);
nixpkgs.overlays = [
# GNOME 46: triple-buffering-v4-46
(final: prev: {
gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: {
mutter = gnomePrev.mutter.overrideAttrs (old: {
src = pkgs.fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "vanvugt";
repo = "mutter";
rev = "triple-buffering-v4-46";
hash = "sha256-fkPjB/5DPBX06t7yj0Rb3UEuu5b9mu3aS+jhH18+lpI=";
};
});
});
})
];
} }

2
nixos/modules/pipewire.nix
View File

@ -1,5 +1,5 @@
{ {
hardware.pulseaudio.enable = false; services.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

1
nixos/system-packages.nix
View File

@ -6,7 +6,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inputs.envycontrol.packages.x86_64-linux.default inputs.envycontrol.packages.x86_64-linux.default
pciutils
home-manager home-manager
nh nh
]; ];

6
nixos/user_modules.nix
View File

@ -5,12 +5,12 @@
./modules/auto-cpufreq.nix ./modules/auto-cpufreq.nix
./modules/zapret.nix ./modules/zapret.nix
#./modules/virtualbox.nix #./modules/virtualbox.nix
./modules/postgresql.nix #./modules/postgresql.nix
./modules/nix-ld.nix #./modules/nix-ld.nix
./modules/zerotierone.nix ./modules/zerotierone.nix
./modules/hardware/nvidia.nix ./modules/hardware/nvidia.nix
./modules/hardware/battery-threshold.nix ./modules/hardware/battery-threshold.nix
./modules/desktop-enviroments/plasma6.nix ./modules/desktop-enviroments/gnome.nix
]; ];
} }