tasiaiso/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix misc config issues

Browse source
This commit is contained in:
Tasia Iso 2024-05-30 20:34:42 +02:00
parent d640002787
commit 4c9f67e388
Signed by: tasiaiso
SSH key fingerprint: SHA256:KiRjUay5C9i6objsEOIycygBHn54pDBB3Lj7fyJ0Elw
12 changed files with 35 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/components/de/plasma5.nix
View file

@ -1,22 +1,24 @@
{pkgs, ...}: {
{pkgs, lib, ...}: {
imports = [
./sddm.nix
./plasma-packages.nix
];
# Enable Xorg/Plasma5
services.xserver = {
enable = true;
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
};
services.displayManager = {
defaultSession = "plasma";
# Disable Wayland
sddm.wayland.enable = lib.mkForce false;
};
# Use ksshaskpass to access stored secrets
environment.sessionVariables = rec {
GIT_ASKPASS = "ksshaskpass";
};
programs.kdeconnect = {
enable = false;
};
}

15
common/components/de/plasma6.nix
View file

@ -1,25 +1,14 @@
{pkgs, ...}: {
imports = [
./sddm.nix
./plasma-packages.nix
];
services.displayManager = {
sddm = {
enable = true;
wayland.enable = true;
};
defaultSession = "plasma";
};
services.displayManager.defaultSession = "plasma";
services.desktopManager.plasma6.enable = true;
# Use ksshaskpass to access stored secrets
environment.sessionVariables = rec {
GIT_ASKPASS = "ksshaskpass";
};
programs.kdeconnect = {
enable = false;
};
}

2
common/components/de/sddm.nix
View file

@ -10,7 +10,5 @@
};
};
};
defaultSession = "plasma";
};
}

4
common/hardware/latest-kernel.nix
View file

@ -1,5 +1,5 @@
{pkgs, ...}: {
{pkgs, lib, ...}: {
boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
};
}

35
flake.lock
View file

@ -18,22 +18,23 @@
"type": "github"
}
},
"home-manager": {
"home-manager-stable": {
"inputs": {
"nixpkgs": [
"unstable"
"stable"
]
},
"locked": {
"lastModified": 1716930911,
"narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=",
"lastModified": 1716736833,
"narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086",
"rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@ -72,10 +73,9 @@
},
"root": {
"inputs": {
"home-manager": "home-manager",
"home-manager-stable": "home-manager-stable",
"nixpkgs": "nixpkgs",
"stable": "stable",
"stable-home-manager": "stable-home-manager",
"tildefriends": "tildefriends",
"unstable": "unstable"
}
@ -96,27 +96,6 @@
"type": "github"
}
},
"stable-home-manager": {
"inputs": {
"nixpkgs": [
"stable"
]
},
"locked": {
"lastModified": 1716736833,
"narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,

14
flake.nix
View file

@ -7,12 +7,12 @@
stable.url = "github:nixos/nixpkgs/nixos-24.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "unstable";
};
# home-manager = {
# url = "github:nix-community/home-manager";
# inputs.nixpkgs.follows = "unstable";
# };
stable-home-manager = {
home-manager-stable = {
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "stable";
};
@ -28,8 +28,8 @@
nixpkgs,
stable,
unstable,
home-manager,
stable-home-manager,
# home-manager,
home-manager-stable,
# nixos-conf-editor,
# nix-software-center,
tildefriends,

2
home/46d1/home.nix
View file

@ -4,7 +4,7 @@
...
}: {
imports = [
inputs.stable-home-manager.nixosModules.home-manager
inputs.home-manager-stable.nixosModules.home-manager
];
users.users.user = {
isNormalUser = true;

2
home/tasia-but-old-username/home.nix
View file

@ -4,7 +4,7 @@
...
}: {
imports = [
inputs.home-manager.nixosModules.home-manager
inputs.home-manager-stable.nixosModules.home-manager
];
users.users.user = {
isNormalUser = true;

2
home/tasia/home.nix
View file

@ -4,7 +4,7 @@
...
}: {
imports = [
inputs.stable-home-manager.nixosModules.home-manager
inputs.home-manager-stable.nixosModules.home-manager
];
users.users.tasia = {
isNormalUser = true;

2
home/user/home.nix
View file

@ -4,7 +4,7 @@
...
}: {
imports = [
inputs.home-manager.nixosModules.home-manager
inputs.home-manager-stable.nixosModules.home-manager
];
users.users.user = {
isNormalUser = true;

2
hosts/new-phoenix/configuration.nix
View file

@ -45,7 +45,7 @@ in {
services.syncthing = {
dataDir = lib.mkForce "/home/user";
configDir = lib.mkForce "/data/sync/configuration/";
guiAddess = "0.0.0.0:8384";
guiAddress = "0.0.0.0:8384";
};
environment.systemPackages = with pkgs; [

6
hosts/theseus/configuration.nix
View file

@ -20,8 +20,8 @@ in {
../../common/hardware/btrfs.nix
../../common/hardware/latest-kernel.nix
../../common/de/plasma6.nix
# ../../common/de/hyprland.nix
../../common/components/de/plasma6.nix
# ../../common/components/de/hyprland.nix
../../common/services/syncthing.nix
../../common/services/adguardhome.nix
@ -38,7 +38,7 @@ in {
sshKeys.tasia.yaseen
];
services.btrfs.autoScrub.fileSystems = lb.mkForce ["/" "/data"];
services.btrfs.autoScrub.fileSystems = lib.mkForce ["/" "/data"];
services.syncthing = {
dataDir = lib.mkForce "/home/user/Sync/Phone/";