frero/nixos
1
1
Fork 0
mirror of https://github.com/fredrikr79/nixos.git synced 2026-04-21 06:00:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

upgrade to unstable

Browse Source
This commit is contained in:
Fredrik Robertsen
2025-01-10 12:34:28 +01:00
parent b48b783d8c
commit 838b217118
4 changed files with 154 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
configuration.nix
View File

@@ -135,6 +135,18 @@ in
};
# sessionCommands = '' '';
};
libinput = {
enable = true;
mouse = {
accelProfile = "flat";
};
touchpad = {
accelProfile = "flat";
};
};
};
@@ -143,15 +155,15 @@ in
# Enable sound.
sound = {
enable = true;
mediaKeys.enable = true;
# enable = true; deprecated
# mediaKeys.enable = true; deprecated
};
hardware.pulseaudio.enable = true;
# hardware.pulseaudio.enable = true; use pipewire
# OR
# services.pipewire = {
# enable = true;
# pulse.enable = true;
# };
services.pipewire = {
enable = true;
pulse.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
services.libinput.enable = true;
@@ -161,7 +173,7 @@ in
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
hsphfpd.enable = true;
# hsphfpd.enable = true; handled by pipewire
settings = {
General = {
Enable = "Source,Sink,Media,Socket";
@@ -178,8 +190,6 @@ in
# firefox
discord
#tree
powertop
gamemode
];
shell = pkgs.zsh;
};
@@ -205,6 +215,9 @@ in
libGL
# gtk3
zathura
libgcc
powertop
gamemode
]);
programs.steam.enable = true;
@@ -270,8 +283,8 @@ in
];
nix = {
package = pkgs.nixFlakes;
extraOptions = "experimental-features = nix-command flakes";
# package = pkgs.nixFlakes;
# extraOptions = "experimental-features = nix-command flakes";
};
services.picom = {
@@ -331,7 +344,9 @@ in
# enableDefaultFonts = true;
packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" "Monoid" ]; })
# (nerdfonts.override { fonts = [ "FiraCode" "Monoid" ]; })
nerd-fonts.fira-code
nerd-fonts.droid-sans-mono
];
fonts = with pkgs; [

153
flake.lock generated
View File

@@ -35,22 +35,6 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -72,18 +56,36 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "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"
}
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-compat": [
"nixvim",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
]
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1728092656,
@@ -128,16 +130,15 @@
]
},
"locked": {
"lastModified": 1726989464,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"lastModified": 1736421950,
"narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"rev": "d4aebb947a301b8da8654a804979a738c5c5da50",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@@ -150,20 +151,47 @@
]
},
"locked": {
"lastModified": 1726989464,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"lastModified": 1736421950,
"narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"rev": "d4aebb947a301b8da8654a804979a738c5c5da50",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
},
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729958008,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.6",
"repo": "ixx",
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
@@ -187,15 +215,30 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1728627514,
"narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
"lastModified": 1736496189,
"narHash": "sha256-gjw43Gld9sEEALfCRo8pFXPpNWR8Th6pgd7faZNO6LQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
"rev": "04a9216b7da6f69b5e9b039d40334e2a91469479",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1735563628,
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
@@ -212,23 +255,46 @@
"nixpkgs": [
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1728336862,
"narHash": "sha256-0rG55ZD1zvLLJ+WgiYdJBZGm1fkgRUlwpfx7aNUT5m4=",
"lastModified": 1736430661,
"narHash": "sha256-0dabFSGqcPo47WfgPRM5usnVXaGMdYvPlDJ5PeIqjr4=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "b041963c607d766c4b102b8b56244ad38731f549",
"rev": "67de84848e43ca6a5025e4f8eddc2f6684a51f2b",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "nixos-24.05",
"repo": "nixvim",
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1735854821,
"narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
"owner": "NuschtOS",
"repo": "search",
"rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
@@ -237,6 +303,21 @@
"vi-xournalpp": "vi-xournalpp"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [

6
flake.nix
View File

@@ -2,10 +2,10 @@
description = "A very basic flake";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs.url = "github:nixos/nixpkgs";
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
@@ -20,7 +20,7 @@
#};
nixvim = {
url = "github:nix-community/nixvim/nixos-24.05";
url = "github:nix-community/nixvim";
# If using a stable channel you can use `url = "github:nix-community/nixvim/nixos-<version>"`
inputs.nixpkgs.follows = "nixpkgs";
};

11
home.nix
View File

@@ -240,10 +240,11 @@ in
conform-nvim = {
enable = true;
formatOnSave = {
timeoutMs = 500;
lspFallback = true;
};
# deprecated
# formatOnSave = {
# timeoutMs = 500;
# lspFallback = true;
# };
formattersByFt = {
typst = ["typstfmt"];
@@ -391,7 +392,7 @@ in
nil-ls.enable = true;
lua-ls.enable = true;
hls.enable = true;
typst-lsp = {
tinymist = {
enable = true;
settings = {
exportPdf = "onType";