steph/os
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: steph:91b17f861ab48ebc2d029706a433d2dc24c0f26a
Branches Tags
steph:master
...
compare: steph:8d8bb26d7f1581c36380ede871282178a0dc1290
Branches Tags
steph:master

3 Commits
91b17f861a ... 8d8bb26d7f

Author SHA1 Message Date
Steph
8d8bb26d7f update 2024-12-10 15:03:39 +01:00
Steph
bdc6978952 flake.lock: Update 
Flake lock file updates:

• Updated input 'firefox-addons':
    'gitlab:rycee/nur-expressions/51d5446f359b67d5b6fdf45a145391c4d8679b3e?dir=pkgs/firefox-addons&narHash=sha256-7n66bpxbXkwBow1VSVHQe%2BrEW%2B8zPyawmDJ7Rd0uHNI%3D' (2024-12-03)
  → 'gitlab:rycee/nur-expressions/c263b58f0bc149e2f3648bb07afe4aa96267a9d6?dir=pkgs/firefox-addons&narHash=sha256-xODinzazQwJnw1W7517zQeGlRno9LaM6bj3ROXVvwfQ%3D' (2024-12-10)
• Updated input 'home':
    'github:nix-community/home-manager/bf23fe41082aa0289c209169302afd3397092f22?narHash=sha256-zFOtOaqjzZfPMsm1mwu98syv3y%2BjziAq5DfWygaMtLg%3D' (2024-12-02)
  → 'github:nix-community/home-manager/e952e94955dcc6fa2120c1430789fc41363f5237?narHash=sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0%3D' (2024-12-09)
• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/c6b65d946097baf3915dd51373251de98199280d?narHash=sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s%2BvG6ENM%3D' (2024-12-02)
  → 'github:LnL7/nix-darwin/a35b08d09efda83625bef267eb24347b446c80b8?narHash=sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk%3D' (2024-12-07)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776?narHash=sha256-M1%2BuCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo%3D' (2024-12-03)
  → 'github:nixos/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56?narHash=sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU%3D' (2024-12-09)
• Updated input 'nixpkgs-2405':
    'github:nixos/nixpkgs/7e1ca67996afd8233d9033edd26e442836cc2ad6?narHash=sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4%3D' (2024-12-01)
  → 'github:nixos/nixpkgs/7109b680d161993918b0a126f38bc39763e5a709?narHash=sha256-dlK7n82FEyZlHH7BFHQAM5tua%2BlQO1Iv7aAtglc1O5s%3D' (2024-12-09)
• Updated input 'nur':
    'github:nix-community/NUR/f2a6ddadaf2743b6a09af9a0da86072b78f2bc81?narHash=sha256-v/RqmNC14lzyxcy87nXLDoXZ9dzMVmYqcWOkgheSfN8%3D' (2024-12-03)
  → 'github:nix-community/NUR/7a6f816d46e34b05efb80e2e12378b6199882da5?narHash=sha256-EfWbtK0v%2BavWV6NlX4uXCTy/MUvWQfPpLfC5UPLgdsM%3D' (2024-12-10)
• Added input 'nur/flake-parts':
    'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9?narHash=sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c%3D' (2024-12-04)
• Added input 'nur/flake-parts/nixpkgs-lib':
    follows 'nur/nixpkgs'
• Added input 'nur/nixpkgs':
    'github:nixos/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56?narHash=sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU%3D' (2024-12-09)
• Added input 'nur/treefmt-nix':
    'github:numtide/treefmt-nix/49717b5af6f80172275d47a418c9719a31a78b53?narHash=sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM%3D' (2024-12-03)
• Added input 'nur/treefmt-nix/nixpkgs':
    follows 'nur/nixpkgs'
 2024-12-10 14:51:03 +01:00
Steph
3ac676d0de flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ac35b104800bff9028425fec3b6e8a41de2bbfff?narHash=sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE%2Bcrk%3D' (2024-12-01)
  → 'github:nixos/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776?narHash=sha256-M1%2BuCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo%3D' (2024-12-03)
• Updated input 'nur':
    'github:nix-community/NUR/251d756a74e67bda25d89327b01a3da19dddabae?narHash=sha256-RIlhnKlObJ1sEdzBP6Nuy4jLUiQnmWWXVsRHRbv6SzY%3D' (2024-12-03)
  → 'github:nix-community/NUR/f2a6ddadaf2743b6a09af9a0da86072b78f2bc81?narHash=sha256-v/RqmNC14lzyxcy87nXLDoXZ9dzMVmYqcWOkgheSfN8%3D' (2024-12-03)
 2024-12-03 21:05:16 +01:00
5 changed files with 98 additions and 22 deletions
Show Stats Expand all files Collapse all files

99
flake.lock generated
View File

@ -24,11 +24,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1733198595, "lastModified": 1733823637,
"narHash": "sha256-7n66bpxbXkwBow1VSVHQe+rEW+8zPyawmDJ7Rd0uHNI=", "narHash": "sha256-xODinzazQwJnw1W7517zQeGlRno9LaM6bj3ROXVvwfQ=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "51d5446f359b67d5b6fdf45a145391c4d8679b3e", "rev": "c263b58f0bc149e2f3648bb07afe4aa96267a9d6",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -88,6 +88,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1629284811, "lastModified": 1629284811,
@ -130,11 +151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733175814, "lastModified": 1733769654,
"narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "narHash": "sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bf23fe41082aa0289c209169302afd3397092f22", "rev": "e952e94955dcc6fa2120c1430789fc41363f5237",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -170,11 +191,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1733105089, "lastModified": 1733570843,
"narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "c6b65d946097baf3915dd51373251de98199280d", "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -200,11 +221,11 @@
}, },
"nixpkgs-2405": { "nixpkgs-2405": {
"locked": { "locked": {
"lastModified": 1733016324, "lastModified": 1733730953,
"narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", "rev": "7109b680d161993918b0a126f38bc39763e5a709",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,11 +251,27 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1733015953, "lastModified": 1733759999,
"narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1733759999,
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -245,12 +282,17 @@
} }
}, },
"nur": { "nur": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_4",
"treefmt-nix": "treefmt-nix"
},
"locked": { "locked": {
"lastModified": 1733215745, "lastModified": 1733838654,
"narHash": "sha256-RIlhnKlObJ1sEdzBP6Nuy4jLUiQnmWWXVsRHRbv6SzY=", "narHash": "sha256-EfWbtK0v+avWV6NlX4uXCTy/MUvWQfPpLfC5UPLgdsM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "251d756a74e67bda25d89327b01a3da19dddabae", "rev": "7a6f816d46e34b05efb80e2e12378b6199882da5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,6 +328,27 @@
"repo": "default-darwin", "repo": "default-darwin",
"type": "github" "type": "github"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

8
home.nix
View File

@ -13,10 +13,16 @@
config = { config = {
home.stateVersion = "22.05"; home.stateVersion = "22.05";
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.direnv = {
enable = true;
enableBashIntegration = true; # see note on other shells below
nix-direnv.enable = true;
};
nixpkgs = { nixpkgs = {
config.allowUnfree = true; config.allowUnfree = true;
overlays = [ inputs.nur.overlay ]; overlays = [ inputs.nur.overlays.default ];
}; };
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;

2
nixos.nix
View File

@ -61,7 +61,7 @@
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
}; };
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver # LIBVA_DRIVER_NAME=iHD intel-media-driver # LIBVA_DRIVER_NAME=iHD

1
platforms/linux/home.nix
View File

@ -33,6 +33,7 @@
zotero zotero
signal-desktop signal-desktop
freetube freetube
inputs.nixpkgs-2405.legacyPackages.${system}.cura
]; ];
dconf.settings = { dconf.settings = {

10
programs/bash.nix
View File

@ -46,13 +46,19 @@
tolower = "tr [:upper:] [:lower:]"; tolower = "tr [:upper:] [:lower:]";
rebuild = if (os == "linux") then '' rebuild = if (os == "linux") then ''
cd $HOME/.local/os && cd $HOME/.local/os &&
nix flake update --commit-lock-file nix flake update --commit-lock-file &&
nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo && nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo &&
git add . &&
git commit -m "update" &&
git push &&
cd - cd -
'' else '' '' else ''
cd $HOME/.local/os && cd $HOME/.local/os &&
nix flake update --commit-lock-file nix flake update --commit-lock-file &&
home-manager switch && home-manager switch &&
git add . &&
git commit -m "update" &&
git push &&
cd - cd -
''; '';
":r" = "!!"; ":r" = "!!";